Merge pull request #1 from community-network/multiple_servers

support multiple discord servers and use same data for the same user …

Author: zefanjajobse

.env.template

@@ -0,0 +1,5 @@
+DISCORD_BOT_TOKEN = ""
+POSTGRES_USER = kdrole_bot
+POSTGRES_PASSWORD = ""
+POSTGRES_DB = kdrole_bot
+DB_HOST = localhost

alembic/env.py

@@ -1,13 +1,14 @@
 from logging.config import fileConfig
 
-from sqlalchemy import engine_from_config
+from sqlalchemy import URL, engine_from_config
 from sqlalchemy import pool
 
 from alembic import context
 
 # add db items to autogenerate the migrations
+from config import load_config
 from database import connection
-from database.dto import users  # noqa: F401
+from database.dto import users, kd_roles  # noqa: F401
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
@@ -18,8 +19,17 @@
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
 
-url = "sqlite:///app.db"
-
+env_config = load_config()
+
+uri = URL.create(
+    drivername="postgresql",
+    username=env_config.db.postgres_user,
+    password=env_config.db.postgres_password,
+    host=env_config.db.db_host,
+    port=env_config.db.db_port,
+    database=env_config.db.postgres_db,
+)
+url = uri.render_as_string(hide_password=False).replace("%", "%%")
 config.set_main_option("sqlalchemy.url", url)
 
 # add your model's MetaData object here

…ns/0acc0de9083c_create_initial_tables.py …ns/3c93bb5d292f_create_initial_tables.pyalembic/versions/0acc0de9083c_create_initial_tables.py renamed to alembic/versions/3c93bb5d292f_create_initial_tables.py alembic/versions/0acc0de9083c_create_initial_tables.py renamed to alembic/versions/3c93bb5d292f_create_initial_tables.py

@@ -1,8 +1,8 @@
 """create initial tables
 
-Revision ID: 0acc0de9083c
+Revision ID: 3c93bb5d292f
 Revises: 
-Create Date: 2026-02-21 12:07:53.092683
+Create Date: 2026-02-21 19:24:26.563016
 
 """
 from typing import Sequence, Union
@@ -12,7 +12,7 @@
 
 
 # revision identifiers, used by Alembic.
-revision: str = '0acc0de9083c'
+revision: str = '3c93bb5d292f'
 down_revision: Union[str, Sequence[str], None] = None
 branch_labels: Union[str, Sequence[str], None] = None
 depends_on: Union[str, Sequence[str], None] = None
@@ -21,16 +21,26 @@
 def upgrade() -> None:
     """Upgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('kd_roles',
+    sa.Column('server_id', sa.BigInteger(), nullable=False),
+    sa.Column('role_id', sa.BigInteger(), nullable=False),
+    sa.Column('kd_amount', sa.Float(), nullable=False),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.PrimaryKeyConstraint('server_id', 'role_id'),
+    sa.UniqueConstraint('server_id', 'role_id', 'kd_amount')
+    )
     op.create_table('users',
+    sa.Column('server_id', sa.BigInteger(), nullable=False),
     sa.Column('discord_id', sa.BigInteger(), nullable=False),
     sa.Column('username', sa.String(), nullable=False),
     sa.Column('player_id', sa.BigInteger(), nullable=False),
     sa.Column('kdr_role_id', sa.BigInteger(), nullable=True),
     sa.Column('user_id', sa.BigInteger(), nullable=False),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
-    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
-    sa.PrimaryKeyConstraint('discord_id'),
-    sa.UniqueConstraint('discord_id', 'player_id', 'user_id')
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=False),
+    sa.PrimaryKeyConstraint('server_id', 'discord_id'),
+    sa.UniqueConstraint('server_id', 'discord_id', 'player_id', 'user_id')
     )
     # ### end Alembic commands ###
 
@@ -39,4 +49,5 @@ def downgrade() -> None:
     """Downgrade schema."""
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_table('users')
+    op.drop_table('kd_roles')
     # ### end Alembic commands ###

api/gametools.py

@@ -1,11 +1,12 @@
 import json
-from typing import TypedDict
+from typing import TypeVar, TypedDict, overload
 
 import aiohttp
 from discord import Interaction
 
 from database.dto.users import User
 from dto.kdr import KDR
+from dto.user_servers import UserServers
 
 ENDPOINT = "https://api.gametools.network/"
 NEEDED_FIELDS = ["human_kills_total", "deaths_total"]
@@ -15,6 +16,11 @@
 }
 
 
+class ServerResult(TypedDict):
+    user: UserServers
+    gamemodes: dict[str, KDR]
+
+
 class Result(TypedDict):
     user: User
     gamemodes: dict[str, KDR]
@@ -23,7 +29,14 @@ class Result(TypedDict):
 class GametoolsApi:
     session: aiohttp.ClientSession
 
-    async def read_stats(self, users: list[User], data: dict) -> list[Result]:
+    @overload
+    async def read_stats(
+        self, users: list[UserServers], data: dict
+    ) -> list[ServerResult]: ...
+    @overload
+    async def read_stats(self, users: list[User], data: dict) -> list[Result]: ...
+
+    async def read_stats(self, users, data):
         db_users = {str(user.player_id): user for user in users}
         results = []
         for player in data.get("playerStats", []):
@@ -90,6 +103,7 @@ async def find_player(self, interaction: Interaction, username: str) -> list[Use
                 players = res.get("results", [])
                 return [
                     User(
+                        server_id=interaction.guild_id,
                         discord_id=interaction.user.id,
                         username=username,
                         player_id=int(player.get("personaId", "")),
@@ -117,7 +131,7 @@ async def get_stats(self, user: User):
             result = await r.json()
             return await self.read_stats([user], result)
 
-    async def get_multiple_stats(self, multiple_users: list[User]):
+    async def get_multiple_stats(self, multiple_users: list[UserServers]):
         payload = [
             {"player_id": user.player_id, "user_id": user.user_id, "platform": "pc"}
             for user in multiple_users

bot.py

@@ -1,17 +1,20 @@
 """discord api connection"""
 
 import asyncio
+import collections
 import logging
 import os
 import discord
 from discord.ext import commands, tasks
-from sqlalchemy import select
 from api.gametools import GametoolsApi
 from config import load_config
 from database.connection import DatabaseSingleton
 from database.dto.users import User
 from logger import setup_logger
 
+from utils.kd_roles import get_all_kd_roles
+from utils.user_servers import fetch_user_servers
+
 env_config = load_config()
 
 logger = logging.getLogger("bot")
@@ -24,7 +27,7 @@ class KDRBot(commands.AutoShardedBot):
     def __init__(self, *args, **kwargs):
         self.logger = logger
         self.config = env_config
-        self.db = DatabaseSingleton(env_config.bot.db_url)
+        self.db = DatabaseSingleton(env_config.db)
         self.gametools_api = GametoolsApi()
         super().__init__(*args, **kwargs)
 
@@ -48,22 +51,27 @@ async def update_kdr(self):
         from utils.role_management import RoleManagement  # against circular import
 
         async with self.db.create_session() as session:
-            guild = await bot.fetch_guild(bot.config.bot.server_id)
-            if guild is None:
-                return
-
-            stmt = select(User)
-            res = await session.execute(stmt)
-            chunked_users = res.scalars().partitions(10)
-            for chunk in chunked_users:
-                stats = await self.gametools_api.get_multiple_stats(list(chunk))
+            server_kd_roles = await get_all_kd_roles(session)
+            user_servers = await fetch_user_servers(session)
+            for chunk in user_servers:
+                stats = await self.gametools_api.get_multiple_stats(chunk)
                 for stat in stats:
-                    kdr_role_id = await RoleManagement().update_kdr_role(
-                        self, stat, guild
-                    )
-                    user = stat["user"]
-                    if user.kdr_role_id != kdr_role_id:
-                        await user.update_kdr(session, kdr_role_id)
+                    if isinstance(stat["user"], User):
+                        continue
+                    for server in stat["user"].servers:
+                        user = stat["user"]
+                        kdr_role_id = await RoleManagement().update_kdr_role(
+                            self,
+                            user.to_user(server),
+                            stat["gamemodes"],
+                            server_kd_roles.get(
+                                server.server_id, collections.OrderedDict({})
+                            ),
+                        )
+                        if server.kdr_role_id != kdr_role_id:
+                            await User(discord_id=server.discord_id).update_kdr(
+                                session, kdr_role_id
+                            )
         logger.info("Done updating KDR roles!")
 
 
@@ -72,6 +80,30 @@ async def update_kdr(self):
 bot = KDRBot(command_prefix="!", intents=intents)
 
 
+@bot.event
+async def on_command_error(ctx, error):
+    """dont give a error if a command doesn't exist"""
+    if isinstance(error, commands.CommandNotFound):
+        return
+    elif isinstance(error, commands.MissingRequiredArgument):
+        return
+    elif isinstance(error, commands.MissingRole):
+        return
+    elif isinstance(error, commands.MissingPermissions):
+        embed = discord.Embed(
+            color=0xE74C3C, description="Your not allowed to use this command"
+        )
+        await ctx.send(embed=embed)
+    elif isinstance(error, commands.NoPrivateMessage):
+        embed = discord.Embed(
+            color=0xE74C3C,
+            description="This command can only be used within a community, not in DM",
+        )
+        await ctx.send(embed=embed)
+    else:
+        raise error
+
+
 @bot.event
 async def on_ready():
     """After bot is logged into discord"""