i18n: translate all French comments, docstrings and logs to English

discord.py's built-in !help command exposes cog docstrings directly to
Discord members — leaving them in French made the output partially French.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.forgejo/workflows/deploy.yml

@@ -8,8 +8,13 @@ jobs:
   deploy:
     runs-on: self-hosted
     steps:
+      - name: Install dependencies
+        run: apk add --no-cache rsync openssh-client
+
       - name: Checkout
-        uses: actions/checkout@v4
+        run: |
+          git clone --depth 1 --branch ${{ github.ref_name }} \
+            ${{ github.server_url }}/${{ github.repository }}.git .
 
       - name: Set deployment path
         run: |
@@ -23,29 +28,29 @@ jobs:
 
       - name: Configure SSH
         run: |
-          mkdir -p ~/.ssh
-          echo "${{ secrets.NAS_SSH_KEY }}" > ~/.ssh/id_deploy
-          chmod 600 ~/.ssh/id_deploy
-          cat >> ~/.ssh/config << 'EOF'
-          Host nas
-            HostName 192.168.1.208
-            User Elewyn
-            IdentityFile ~/.ssh/id_deploy
-            StrictHostKeyChecking no
-          EOF
+          mkdir -p /root/.ssh
+          echo "${{ secrets.NAS_SSH_KEY }}" > /root/.ssh/id_deploy
+          chmod 600 /root/.ssh/id_deploy
 
       - name: Sync files to NAS
         run: |
+          # StrictHostKeyChecking=no : runner Alpine stateless, pas de known_hosts persistant.
+          # Cible fixe sur LAN interne (192.168.1.208) — risque MITM inexistant.
           rsync -av --delete \
+            -e "ssh -i /root/.ssh/id_deploy -o StrictHostKeyChecking=no" \
             --exclude='.git' \
+            --exclude='.github' \
             --exclude='.env' \
             --exclude='data/' \
             --exclude='screenshots/' \
             --exclude='logs/' \
-            ./ nas:${{ env.DEPLOY_PATH }}/
+            --exclude='__pycache__/' \
+            ./ Elewyn@192.168.1.208:${{ env.DEPLOY_PATH }}/
 
       - name: Restart bot on NAS
         run: |
-          ssh nas "cd ${{ env.DEPLOY_PATH }} && \
-            docker compose down || true && \
-            docker compose up --build -d"
+          # StrictHostKeyChecking=no : runner Alpine stateless, pas de known_hosts persistant.
+          # Cible fixe sur LAN interne (192.168.1.208) — risque MITM inexistant.
+          ssh -i /root/.ssh/id_deploy -o StrictHostKeyChecking=no \
+            Elewyn@192.168.1.208 \
+            "cd ${{ env.DEPLOY_PATH }} && /share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker compose down || true && /share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker compose up -d"

.github/workflows/deploy.yml

@@ -1,45 +0,0 @@
-name: Deploy Bot on NAS
-
-on:
-  push:
-    branches: [ main, dev ]
-
-jobs:
-  deploy:
-    runs-on: self-hosted
-    steps:
-      - name: Set deployment path
-        id: set-path
-        run: |
-          if [ "${GITHUB_REF_NAME}" = "main" ]; then
-            echo "DEPLOY_PATH=/share/CACHEDEV1_DATA/discord-bot-prod" >> $GITHUB_ENV
-          elif [ "${GITHUB_REF_NAME}" = "dev" ]; then
-            echo "DEPLOY_PATH=/share/CACHEDEV1_DATA/discord-bot-dev" >> $GITHUB_ENV
-          else
-            echo "Unsupported branch"
-            exit 1
-          fi
-
-      - name: Update bot files
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          cd $DEPLOY_PATH
-          git config --global --add safe.directory $DEPLOY_PATH
-          
-          if [ ! -d ".git" ]; then
-            git init
-            git remote add origin https://x-access-token:$GITHUB_TOKEN@github.com/ArcElewyn/Discord.git
-          else
-            git remote remove origin || true
-            git remote add origin https://x-access-token:$GITHUB_TOKEN@github.com/ArcElewyn/Discord.git
-          fi
-
-          git fetch origin $GITHUB_REF_NAME
-          git reset --hard origin/$GITHUB_REF_NAME
-
-      - name: Restart bot
-        run: |
-          cd $DEPLOY_PATH
-          docker compose -f $DEPLOY_PATH/docker-compose.yml down || true
-          docker compose -f $DEPLOY_PATH/docker-compose.yml up --build -d

.gitignore

@@ -0,0 +1,8 @@
+.env
+data/
+screenshots/
+logs/
+__pycache__/
+*.pyc
+*.pyo
+*.db

CLAUDE.md

@@ -3,7 +3,7 @@
 ## Contexte
 
 Bot Discord de tracking de Personal Best (PB) pour les clan bosses du jeu Raid Shadow Legends.
-Communauté RTF (3 clans : RTF, RTFC, RTFR).
+Communauté TEA — The Ember Accord (4 clans : TEAI, TEAF, TEAC, TEACO).
 
 ## Branches
 
@@ -12,13 +12,19 @@ Communauté RTF (3 clans : RTF, RTFC, RTFR).
 | `main` | Production | `/share/CACHEDEV1_DATA/discord-bot-prod` |
 | `dev` | Développement | `/share/CACHEDEV1_DATA/discord-bot-dev` |
 
+`dev` est une branche permanente — ne jamais merger dans `main`.
+
 ## Déploiement
 
-CI/CD via Forgejo Actions → runner `vm-runner` (192.168.1.53) → rsync vers NAS QNAP (192.168.1.208).
+CI/CD via Forgejo Actions → runner `vm-runner` (192.168.1.53, Alpine) → rsync vers NAS QNAP (192.168.1.208).
 
 Push sur `main` ou `dev` déclenche le déploiement automatique.
 
-Secret requis dans Forgejo : `NAS_SSH_KEY` (clé privée ed25519 pour SSH Elewyn@NAS).
+Secret requis dans Forgejo : `NAS_SSH_KEY` — **doit être encodé en base64** :
+```bash
+base64 -w 0 ~/.ssh/runner-nas
+```
+Coller le résultat dans le secret (pas le contenu brut du fichier).
 
 ## Persistance des données (NE PAS écraser)
 
@@ -50,14 +56,28 @@ Dockerfile          # Image Python 3.9-slim
 docker-compose.yml  # Déploiement container
 ```
 
+## Langue du code
+
+Tout le code source doit être **exclusivement en anglais** :
+- Docstrings et commentaires
+- Messages Discord affichés aux utilisateurs
+- Logs (`print`, `logging`)
+
+Le `!help` de discord.py affiche les docstrings des cogs directement — les laisser en français les rend visibles aux membres.
+
 ## Boss supportés
 
 - **Hydra** : normal, hard, brutal, nightmare
 - **Chimera** : easy, normal, hard, brutal, nightmare, ultra
 - **CvC** : Clan vs Clan
 
-## Pièges connus
+## Pièges connus — CI/CD
 
-- Le `.env` ne doit jamais être commité — il contient le token Discord
-- `data/`, `screenshots/`, `logs/` sont gitignorés — données persistantes sur le NAS
-- Le rsync exclut ces dossiers pour ne pas écraser les données en prod
+- **NAS_SSH_KEY doit être en base64** — `echo "..." > fichier` dans Alpine sh casse les sauts de ligne de la clé brute
+- **Runner tourne dans Alpine** — `actions/checkout@v4` ne fonctionne pas (pas de Node.js) → utiliser `git clone`; `rsync` et `openssh-client` doivent être installés via `apk add`
+- **Chemin Docker sur QNAP** : `/share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker` — `docker` n'est pas dans le `$PATH` SSH
+- **Pas de `--build`** — le code est monté en volume (`./:/app`), un simple redémarrage suffit
+- **Pas de `container_name`** — les envs prod et dev partagent le même NAS, un nom hardcodé crée un conflit ; Docker Compose dérive le nom depuis le dossier
+- **rsync exclut `__pycache__/`** — créés par Docker (root), l'user Elewyn ne peut pas les supprimer via rsync `--delete`
+- **rsync exclut `.github/`** — vestige de l'ancien CI GitHub Actions, ne pas envoyer sur le NAS
+- **Clé SSH workstation** : `~/.ssh/runner-nas` (ed25519, autorisée dans `~/.ssh/authorized_keys` sur le NAS pour l'user Elewyn)

README.md

@@ -107,8 +107,6 @@ CMD ["python", "bot.py"]
 
 ### 4. Create `docker-compose.yml`
 ```yaml
-version: '3.8'
-
 services:
   discord-bot:
     build: .
@@ -116,14 +114,12 @@ services:
     env_file:
       - .env
     volumes:
+      - ./:/app
       - ./screenshots:/app/screenshots
-      - ./bot_data.db:/app/bot_data.db
+      - ./data:/app/data
       - ./logs:/app/logs
     environment:
       - TZ=Europe/Paris
-    container_name: rtf-discord-bot
-    
-    # Optional: Resource limits
     deploy:
       resources:
         limits:
@@ -163,36 +159,31 @@ Add Reactions
 
 URL : `https://discord.com/api/oauth2/authorize?client_id=YOUR_BOT_ID&permissions=378944&scope=bot`
 
-## 🚀 Déploiement sur QNAP
+## 🚀 Déploiement
 
-### Via Container Station (Recommandé)
+Le déploiement est automatisé via Forgejo Actions.
 
-1. Install Container Station via App Center
-2. Create /share/Container/discord-bot/
-3. Copy all files into this folder
-4. Edit .env with your tokens
-5. Container Station → "Create" → "Create Application via docker-compose"
-6. Select your docker-compose.yml
-7. Start the container
+Un push sur `main` déploie en production, un push sur `dev` déploie en développement.
 
-### Via SSH (Alternative)
+### Prérequis (une seule fois)
+
+1. Créer le `.env` sur le NAS dans chaque `DEPLOY_PATH` :
+```env
+DISCORD_TOKEN=your_bot_token_here
+AUTHORIZED_CHANNEL_ID=your_channel_id_here
+```
+
+2. Ajouter le secret `NAS_SSH_KEY` dans Forgejo (clé ed25519 encodée en base64) :
+```bash
+base64 -w 0 ~/.ssh/runner-nas
+```
+
+### Démarrage initial (première fois sur le NAS)
 
 ```bash
-# Connect to QNAP
-ssh admin@YOUR_QNAP_IP
-
-# Navigate to folder
-cd /share/Container/discord-bot/
-
-# Install dependencies (if Python is installed)
-pip3 install -r requirements.txt
-
-# Test run
-python3 bot.py
-
-# Create auto-start service via QNAP interface
-# Control Panel → Applications → Autorun
-# Add: cd /share/Container/discord-bot && python3 bot.py &
+ssh Elewyn@192.168.1.208
+cd /share/CACHEDEV1_DATA/discord-bot-prod  # ou discord-bot-dev
+/share/CACHEDEV1_DATA/.qpkg/container-station/usr/bin/docker compose up -d
 ```
 
 ## 📊 SQLite Database

bot.py

@@ -16,20 +16,20 @@ from utils.leaderboard_handler import set_db_manager
 os.environ["PYTHONIOENCODING"] = "utf-8"
 sys.stdout.reconfigure(encoding='utf-8')
 
-# Définir les intents
+# Define intents
 intents = discord.Intents.default()
 intents.message_content = True
 
-# Initialisation des managers
+# Initialize managers
 db_manager = DatabaseManager()
 screenshot_manager = ScreenshotManager()
 mercy_manager = MercyManager()
 
-# Injection des managers dans les handlers
+# Inject managers into handlers
 set_managers(db_manager, screenshot_manager)  # pb_handler
 set_db_manager(db_manager)                    # leaderboard_handler
 
-# Liste des cogs
+# Cog list
 initial_cogs = [
     "cogs.guide",
     "cogs.pbhydra",
@@ -40,7 +40,7 @@ initial_cogs = [
     "cogs.mercy",
 ]
 
-# Liste des dossiers
+# Directory list
 folders = [
     "screenshots/hydra/normal",
     "screenshots/hydra/hard",
@@ -55,7 +55,7 @@ folders = [
     "screenshots/cvc",
 ]
 
-# Création des dossiers si nécessaire (exist_ok=True évite d'écraser)
+# Create directories if needed (exist_ok=True avoids overwriting)
 for f in folders:
     os.makedirs(f, exist_ok=True)
 
@@ -70,12 +70,12 @@ class MyBot(commands.Bot):
         for cog in initial_cogs:
             try:
                 await self.load_extension(cog)
-                print(f"[OK] Cog {cog} chargé")
+                print(f"[OK] Cog {cog} loaded")
             except Exception as e:
-                print(f"[ERREUR] Impossible de charger {cog}: {e}")
+                print(f"[ERROR] Failed to load {cog}: {e}")
 
     async def on_ready(self):
-        print(f"{self.user.name} est connecté !")
+        print(f"{self.user.name} connected!")
 
 bot = MyBot()
 bot.run(DISCORD_TOKEN)

cogs/guide.py

@@ -4,24 +4,24 @@ from discord.ext import commands
 from config import AUTHORIZED_CHANNEL_ID
 
 class Guide(commands.Cog):
-    """Affiche la liste des commandes disponibles"""
+    """Shows the list of available commands"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="guide")
     async def guide(self, ctx):
-        """Affiche toutes les commandes disponibles avec les difficultés"""
+        """Shows all available commands with difficulties"""
         if ctx.channel.id != AUTHORIZED_CHANNEL_ID:
             return
 
         embed = discord.Embed(
-            title="🧐 RTF Bot - Commands Guide",
+            title="🧐 TEA Bot - Commands Guide",
             description="Here are all available commands for tracking your Personal Bests!",
             color=0x00bfff
         )
 
-        # Info sur les formats de dégâts
+        # Damage format info
         embed.add_field(
             name="💠 Damage Formats",
             value="**Accepted formats:** `1500000`, `1.5M`, `500K`, `2B`\n"
@@ -30,7 +30,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Commandes PB Hydra
+        # Hydra PB commands
         embed.add_field(
             name="🐍 Hydra Commands",
             value="**Difficulties:** Normal | Hard | Brutal | Nightmare (nm)\n"
@@ -40,7 +40,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Commandes PB Chimera
+        # Chimera PB commands
         embed.add_field(
             name="🦁 Chimera Commands",
             value="**Difficulties:** Easy | Normal | Hard | Brutal | Nightmare (nm) | Ultra (unm)\n"
@@ -50,7 +50,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Commandes PB CvC
+        # CvC PB commands
         embed.add_field(
             name="⚔️ CvC Commands",
             value="`!pbcvc <damage>` - Submit PB + screenshot\n"
@@ -59,7 +59,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Commandes Mercy
+        # Mercy commands
         embed.add_field(
             name="🎲 Mercy Commands",
             value="`!mercy show` - Show your current mercy pulls\n"
@@ -69,7 +69,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Classements globaux
+        # Global leaderboards
         embed.add_field(
             name="🌍 Global Leaderboards",
             value="`!top10hydra <difficulty>` - Global Hydra rankings\n"
@@ -78,16 +78,17 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Classements par clan
+        # Clan leaderboards
         embed.add_field(
             name="🏆 Clan Leaderboards",
-            value="**RTF:** `!rtfhydra <diff>` `!rtfchimera <diff>` `!rtfcvc`\n"
-                  "**RTFC:** `!rtfchydra <diff>` `!rtfcchimera <diff>` `!rtfccvc`\n"
-                  "**RTFR:** `!rtfrhydra <diff>` `!rtfrchimera <diff>` `!rtfrcvc`",
+            value="**🔥 TEAI (Inferno):** `!teaihydra <diff>` `!teaichimera <diff>` `!teaicvc`\n"
+                  "**🛡️ TEAF (Flame):** `!teafhydra <diff>` `!teafchimera <diff>` `!teafcvc`\n"
+                  "**⚔️ TEAC (Cinder):** `!teachydra <diff>` `!teachimera <diff>` `!teaccvc`\n"
+                  "**👑 TEACO (Corrupted Olympians):** `!teacohydra <diff>` `!teacochimera <diff>` `!teacocvc`",
             inline=False
         )
 
-        # Stats et aide
+        # Stats and help
         embed.add_field(
             name="📈 Stats & Info",
             value="`!mystats` - View all your PBs\n"
@@ -96,7 +97,7 @@ class Guide(commands.Cog):
             inline=False
         )
 
-        # Instructions
+        # Examples
         embed.add_field(
             name="⚡ Examples",
             value="`!pbhydra brutal 1.5M` - Submit Brutal Hydra PB\n"
@@ -104,7 +105,7 @@ class Guide(commands.Cog):
                   "`!pbcvc 2.3M` - Submit CvC PB\n"
                   "`!mercy add 50 primal` - Add 50 pulls to Primal shard\n"
                   "`!mercy show` - Show your mercy pulls\n"
-                  "`!rtfhydra nm` - RTF clan Nightmare rankings\n"
+                  "`!teaihydra nm` - TEAI clan Nightmare rankings\n"
                   "**Always attach screenshot when submitting PBs!**",
             inline=False
         )

cogs/mercy.py

@@ -8,7 +8,7 @@ from utils.helpers import calc_chance_and_guarantee
 VALID_SHARDS = ["ancient", "void", "sacred", "primal", "remnant"]
 
 class Mercy(commands.Cog):
-    """Cog pour gérer les pulls de Mercy"""
+    """Cog for managing Mercy pulls"""
 
     def __init__(self, bot):
         self.bot = bot

cogs/mystats.py

@@ -3,34 +3,46 @@ import discord
 from discord.ext import commands
 from config import AUTHORIZED_CHANNEL_ID, BOSS_CONFIG
 from utils.helpers import format_damage_display, format_date_only
-from utils.pb_handler import db_manager  # Assurez-vous que db_manager est initialisé correctement
+from utils.pb_handler import db_manager  # Make sure db_manager is initialized correctly
 
 class MyStats(commands.Cog):
-    """Cog pour afficher tous les PB d'un utilisateur"""
+    """Cog for displaying all PBs for a user"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="mystats")
-    async def mystats(self, ctx, target_user: str = None):
-        """Affiche tous les PB d'un utilisateur avec les nouvelles difficultés"""
+    async def mystats(self, ctx, *, target_user: str = None):
+        """Shows all PBs for a user across all difficulties"""
         if ctx.channel.id != AUTHORIZED_CHANNEL_ID:
             return
 
         try:
-            username = target_user if target_user else ctx.author.id
-            user_data = db_manager.get_user_all_pbs(username)
+            if target_user:
+                matches = db_manager.find_user_by_name(target_user)
+                if not matches:
+                    await ctx.send(f"❌ No data found for **{target_user}**.")
+                    return
+                if len(matches) > 1:
+                    await ctx.send(f"⚠️ Multiple users found for **{target_user}**. Please be more specific.")
+                    return
+                user_id, display_name = matches[0]
+            else:
+                user_id = ctx.author.id
+                display_name = ctx.author.display_name
+
+            user_data = db_manager.get_user_all_pbs(user_id)
 
             if not user_data:
-                await ctx.send(f"❌ No data found for **{ctx.author.display_name}**.")
+                await ctx.send(f"❌ No data found for **{display_name}**.")
                 return
 
             embed = discord.Embed(
-                title=f"📊 {ctx.author.display_name}'s Complete Stats",
+                title=f"📊 {display_name}'s Complete Stats",
                 color=0x00bfff
             )
 
-            # Hydra - toutes les difficultés
+            # Hydra - all difficulties
             hydra_stats = []
             for difficulty in BOSS_CONFIG['hydra']['difficulties']:
                 pb_key = f'pb_hydra_{difficulty}'
@@ -45,7 +57,7 @@ class MyStats(commands.Cog):
             hydra_text = "\n".join(hydra_stats) if hydra_stats else "No records"
             embed.add_field(name="⚔️ Hydra PBs", value=hydra_text, inline=False)
 
-            # Chimera - toutes les difficultés
+            # Chimera - all difficulties
             chimera_stats = []
             for difficulty in BOSS_CONFIG['chimera']['difficulties']:
                 pb_key = f'pb_chimera_{difficulty}'
@@ -71,7 +83,7 @@ class MyStats(commands.Cog):
                     cvc_text += f" • {formatted_date}"
             embed.add_field(name="🗡️ CvC PB", value=cvc_text, inline=False)
 
-            # Total combiné
+            # Combined total
             total_damage = sum(user_data.get(f'pb_hydra_{d}', 0) for d in BOSS_CONFIG['hydra']['difficulties'])
             total_damage += sum(user_data.get(f'pb_chimera_{d}', 0) for d in BOSS_CONFIG['chimera']['difficulties'])
             total_damage += user_data.get('pb_cvc', 0)

cogs/pbchimera.py

@@ -4,14 +4,14 @@ from discord.ext import commands
 from utils.pb_handler import handle_pb_command
 
 class Pbchimera(commands.Cog):
-    """Cog pour gérer les Personal Bests Chimera"""
+    """Cog for managing Chimera Personal Bests"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="pbchimera")
-    async def pbchimera(self, ctx, arg1: str = None, arg2: str = None):
-        """Commande !pbchimera avec gestion des difficultés"""
+    async def pbchimera(self, ctx, arg1: str = None, *, arg2: str = None):
+        """!pbchimera command with difficulty handling"""
         await handle_pb_command(ctx, 'chimera', arg1, arg2)
 
 async def setup(bot):

cogs/pbcvc.py

@@ -4,14 +4,14 @@ from discord.ext import commands
 from utils.pb_handler import handle_pb_command
 
 class Pbcvc(commands.Cog):
-    """Cog pour gérer les Personal Bests CvC (sans difficultés)"""
+    """Cog for managing CvC Personal Bests (no difficulties)"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="pbcvc")
-    async def pbcvc(self, ctx, target_user: str = None):
-        """Commande !pbcvc"""
+    async def pbcvc(self, ctx, *, target_user: str = None):
+        """!pbcvc command"""
         await handle_pb_command(ctx, 'cvc', target_user)
 
 async def setup(bot):

cogs/pbhydra.py

@@ -4,14 +4,14 @@ from discord.ext import commands
 from utils.pb_handler import handle_pb_command
 
 class Pbhydra(commands.Cog):
-    """Cog pour gérer les Personal Bests Hydra"""
+    """Cog for managing Hydra Personal Bests"""
 
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command(name="pbhydra")
-    async def pbhydra(self, ctx, arg1: str = None, arg2: str = None):
-        """Commande !pbhydra avec gestion des difficultés"""
+    async def pbhydra(self, ctx, arg1: str = None, *, arg2: str = None):
+        """!pbhydra command with difficulty handling"""
         await handle_pb_command(ctx, 'hydra', arg1, arg2)
 
 async def setup(bot):

cogs/top10.py

@@ -6,12 +6,12 @@ from utils.helpers import normalize_difficulty
 from config import BOSS_CONFIG
 
 class Top10(commands.Cog):
-    """Cog regroupant toutes les commandes de leaderboard globales et par clan"""
+    """Cog grouping all global and per-clan leaderboard commands"""
 
     def __init__(self, bot):
         self.bot = bot
 
-    # --- Commandes globales ---
+    # --- Global commands ---
     @commands.command()
     async def top10hydra(self, ctx, difficulty: str = None):
         if difficulty and normalize_difficulty(difficulty) in BOSS_CONFIG['hydra']['difficulties']:
@@ -32,51 +32,64 @@ class Top10(commands.Cog):
     async def top10cvc(self, ctx):
         await show_leaderboard(ctx, 'cvc')
 
-    # --- Commandes par clan RTF ---
+    # --- TEAI clan commands (Inferno) ---
     @commands.command()
-    async def rtfhydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTF')
+    async def teaihydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAI')
 
     @commands.command()
-    async def rtfchimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTF')
+    async def teaichimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAI')
 
     @commands.command()
-    async def rtfcvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='RTF')
+    async def teaicvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='TEAI')
 
-    # --- Commandes par clan RTFC ---
+    # --- TEAF clan commands (Flame) ---
     @commands.command()
-    async def rtfchydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTFC')
+    async def teafhydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAF')
 
     @commands.command()
-    async def rtfcchimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTFC')
+    async def teafchimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAF')
 
     @commands.command()
-    async def rtfccvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='RTFC')
+    async def teafcvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='TEAF')
 
-    # --- Commandes par clan RTFR ---
+    # --- TEAC clan commands (Cinder) ---
     @commands.command()
-    async def rtfrhydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTFR')
+    async def teachydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAC')
 
     @commands.command()
-    async def rtfrchimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTFR')
+    async def teachimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAC')
 
     @commands.command()
-    async def rtfrcvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='RTFR')
+    async def teaccvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='TEAC')
 
-    # --- Méthode interne pour éviter la répétition ---
+    # --- TEACO clan commands (Corrupted Olympians) ---
+    @commands.command()
+    async def teacohydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEACO')
+
+    @commands.command()
+    async def teacochimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEACO')
+
+    @commands.command()
+    async def teacocvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='TEACO')
+
+    # --- Internal helper method ---
     async def _show_clan_leaderboard(self, ctx, boss_type, difficulty, clan):
-        """Affiche le leaderboard pour un boss et un clan spécifique"""
+        """Shows the leaderboard for a specific boss and clan"""
         if difficulty and normalize_difficulty(difficulty) in BOSS_CONFIG[boss_type]['difficulties']:
             await show_leaderboard(ctx, boss_type, difficulty, clan)
-        elif boss_type != 'cvc':  # CvC n’a pas de difficultés
+        elif boss_type != 'cvc':  # CvC has no difficulties
             difficulties = " | ".join(BOSS_CONFIG[boss_type]['difficulties'])
             await ctx.send(
                 f"❌ Please specify difficulty: `!{ctx.command.name} <difficulty>`\n"

config.py

@@ -4,22 +4,38 @@ from dotenv import load_dotenv
 
 load_dotenv()
 
-# Token et channel autorisé
+# Token and authorized channel
 DISCORD_TOKEN = os.getenv("DISCORD_TOKEN")
 AUTHORIZED_CHANNEL_ID = int(os.getenv("AUTHORIZED_CHANNEL_ID"))
 
-# Chemins
+# Paths
 SCREENSHOTS_BASE_PATH = "/app/screenshots"
 DATABASE_PATH = "/app/data/bot_data.db"
 
-# Configuration des clans
+# TEA clan configuration - The Ember Accord
 CLAN_CONFIG = {
-    'RTF':  {'name': 'RTF',  'emoji': '🛡️', 'color': 0x00ff00},
-    'RTFC': {'name': 'RTFC', 'emoji': '🔥', 'color': 0xff4500},
-    'RTFR': {'name': 'RTFR', 'emoji': '⚔️', 'color': 0x1e90ff}
+    'TEAI':  {'name': 'TEAI',  'full_name': 'Inferno',             'emoji': '🔥', 'color': 0xff4500},
+    'TEAF':  {'name': 'TEAF',  'full_name': 'Flame',               'emoji': '🛡️', 'color': 0x00ff00},
+    'TEAC':  {'name': 'TEAC',  'full_name': 'Cinder',              'emoji': '⚔️', 'color': 0x1e90ff},
+    'TEACO': {'name': 'TEACO', 'full_name': 'Corrupted Olympians', 'emoji': '👑', 'color': 0x9932cc},
 }
 
-# Configuration des boss avec difficultés
+# Discord role ID to clan key mapping
+CLAN_ROLE_IDS = {
+    1190674529731747901: 'TEAI',
+    1197646966599983185: 'TEAF',
+    1220014404809261076: 'TEAC',
+    1496965820868198550: 'TEACO',
+}
+
+# Old clan to new clan mapping (existing database migration)
+CLAN_MIGRATION = {
+    'RTF':  'TEAI',
+    'RTFC': 'TEAF',
+    'RTFR': 'TEAC',
+}
+
+# Boss configuration with difficulties
 BOSS_CONFIG = {
     'hydra':   {'name': 'Hydra',   'emoji': '📍', 'color': 0xff6b35,
                 'difficulties': ['normal', 'hard', 'brutal', 'nightmare']},
@@ -28,7 +44,7 @@ BOSS_CONFIG = {
     'cvc':     {'name': 'Clan vs Clan', 'emoji': '✔️', 'color': 0xff0000, 'difficulties': []}
 }
 
-# Mappings pour diminutifs de difficultés
+# Difficulty shortcut mappings
 DIFFICULTY_SHORTCUTS = {
     'nm': 'nightmare',
     'unm': 'ultra'

docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   discord-bot:
     build: .
@@ -15,7 +13,6 @@ services:
       - ./logs:/app/logs
     environment:
       - TZ=Europe/Paris
-    container_name: rtf-discord-bot
     deploy:
       resources:
         limits:

utils/DatabaseManager_class.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from config import DATABASE_PATH
+from config import DATABASE_PATH, CLAN_MIGRATION
 import sqlite3, os
 
 class DatabaseManager:
@@ -8,12 +8,12 @@ class DatabaseManager:
         self.init_database()
 
     def init_database(self):
-        """Initialise la base de données avec les nouvelles colonnes pour les difficultés"""
+        """Initializes the database with all columns for difficulties"""
         os.makedirs(os.path.dirname(self.db_path), exist_ok=True)
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
-        # Table principale avec toutes les difficultés
+        # Main table with all difficulties
         cursor.execute('''
         CREATE TABLE IF NOT EXISTS users (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -54,7 +54,7 @@ class DatabaseManager:
             pb_chimera_ultra_screenshot TEXT,
             pb_chimera_ultra_date TIMESTAMP,
 
-            -- CvC (inchangé)
+            -- CvC (unchanged)
             pb_cvc INTEGER DEFAULT 0,
             pb_cvc_screenshot TEXT,
             pb_cvc_date TIMESTAMP,
@@ -64,15 +64,24 @@ class DatabaseManager:
         )
         ''')
 
-        # Migration des données existantes (si nécessaire)
+        # Existing data migration (if needed)
         cursor.execute("PRAGMA table_info(users)")
         columns = [row[1] for row in cursor.fetchall()]
 
         if 'discord_id' not in columns:
             cursor.execute('ALTER TABLE users ADD COLUMN discord_id TEXT')
-            # Note: Vous devrez peut-être faire une migration manuelle pour les données existantes
 
-        # Table pour l'historique global
+        if 'clan' not in columns:
+            cursor.execute('ALTER TABLE users ADD COLUMN clan TEXT')
+            # Auto-migration: derive clan from old username prefix
+            for old_tag, new_clan in CLAN_MIGRATION.items():
+                cursor.execute(
+                    "UPDATE users SET clan = ? WHERE clan IS NULL AND ("
+                    "discord_username LIKE ? OR discord_username LIKE ?)",
+                    (new_clan, f'[{old_tag}] %', f'[{old_tag}]%')
+                )
+
+        # Global history table
         cursor.execute('''
         CREATE TABLE IF NOT EXISTS pb_history (
             id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -90,7 +99,7 @@ class DatabaseManager:
         conn.close()
 
     def get_user_pb(self, user_id, boss_type, difficulty=None):
-        """Récupère le PB d'un utilisateur pour un boss et difficulté spécifique"""
+        """Returns PB for a user on a specific boss and difficulty"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
@@ -108,12 +117,12 @@ class DatabaseManager:
 
         return result if result else (0, None, None)
 
-    def update_user_pb(self, user_id, username, boss_type, damage, screenshot_filename, difficulty=None):
-        """Met à jour le PB d'un utilisateur et supprime l'ancien screenshot"""
+    def update_user_pb(self, user_id, username, boss_type, damage, screenshot_filename, difficulty=None, clan=None):
+        """Updates a user's PB and deletes the previous screenshot"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
-        # Récupérer l'ancien screenshot pour le supprimer
+        # Get old screenshot for deletion
         old_data = self.get_user_pb(user_id, boss_type, difficulty)
         old_screenshot = old_data[1] if old_data else None
 
@@ -122,20 +131,21 @@ class DatabaseManager:
         else:
             column_prefix = f"pb_{boss_type}"
 
-        # Créer l'utilisateur s'il n'existe pas, sinon mettre à jour
+        # COALESCE(?, clan): keeps existing clan if detection returns None
         cursor.execute(f'''
-        INSERT INTO users (discord_id, discord_username, {column_prefix}, {column_prefix}_screenshot, {column_prefix}_date, total_attempts)
-        VALUES (?, ?, ?, ?, CURRENT_TIMESTAMP, 1)
+        INSERT INTO users (discord_id, discord_username, clan, {column_prefix}, {column_prefix}_screenshot, {column_prefix}_date, total_attempts)
+        VALUES (?, ?, ?, ?, ?, CURRENT_TIMESTAMP, 1)
         ON CONFLICT(discord_id)
         DO UPDATE SET
             discord_username = ?,
+            clan = COALESCE(?, clan),
             {column_prefix} = ?,
             {column_prefix}_screenshot = ?,
             {column_prefix}_date = CURRENT_TIMESTAMP,
             total_attempts = total_attempts + 1
-        ''', (str(user_id), username, damage, screenshot_filename, username, damage, screenshot_filename))
+        ''', (str(user_id), username, clan, damage, screenshot_filename, username, clan, damage, screenshot_filename))
 
-        # Ajouter à l'historique
+        # Add to history
         cursor.execute('''
         INSERT INTO pb_history (discord_id, username, boss_type, difficulty, damage, screenshot_filename)
         VALUES (?, ?, ?, ?, ?, ?)
@@ -147,7 +157,7 @@ class DatabaseManager:
         return old_screenshot
 
     def get_leaderboard(self, boss_type, difficulty=None, limit=10, clan=None):
-        """Récupère le classement pour un boss et difficulté spécifique"""
+        """Returns the leaderboard for a specific boss and difficulty"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
@@ -157,30 +167,30 @@ class DatabaseManager:
             column_prefix = f"pb_{boss_type}"
 
         base_query = f'''
-        SELECT discord_username, {column_prefix}, {column_prefix}_date 
+        SELECT discord_username, {column_prefix}, {column_prefix}_date, clan
         FROM users
         WHERE {column_prefix} > 0
         '''
 
+        params = []
         if clan:
-            base_query += ''' AND (
-                discord_username LIKE '[''' + clan + '''] %' OR
-                discord_username LIKE '[''' + clan + ''']%'
-            )'''
+            base_query += ' AND clan = ?'
+            params.append(clan)
 
         base_query += f' ORDER BY {column_prefix} DESC LIMIT ?'
+        params.append(limit)
 
-        cursor.execute(base_query, (limit,))
+        cursor.execute(base_query, params)
         results = cursor.fetchall()
         conn.close()
         return results
 
     def get_user_all_pbs(self, user_id):
-        """Récupère tous les PB d'un utilisateur"""
+        """Returns all PBs for a user"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
-        # Récupérer toutes les colonnes de PB
+        # Retrieve all PB columns
         cursor.execute('SELECT * FROM users WHERE discord_id = ?', (str(user_id),))
         result = cursor.fetchone()
         columns = [desc[0] for desc in cursor.description]
@@ -192,7 +202,7 @@ class DatabaseManager:
         return dict(zip(columns, result))
 
     def find_user_by_name(self, username):
-        """Trouve un utilisateur par son nom (pour rétrocompatibilité)"""
+        """Finds a user by name (for backwards compatibility)"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 

utils/MercyManager_class.py

@@ -3,7 +3,7 @@ import sqlite3
 from datetime import datetime
 from config import DATABASE_PATH
 
-# Règles de mercy pour stockage
+# Mercy rules for storage
 MERCY_RULES = {
     "ancient": {"threshold": 200, "increment": 0.5, "base": 0},
     "void": {"threshold": 200, "increment": 0.5, "base": 0},
@@ -19,7 +19,7 @@ class MercyManager:
         self.init_table()
 
     def init_table(self):
-        """Initialise la table des compteurs de mercy"""
+        """Initializes the mercy counters table"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         cursor.execute("""
@@ -35,7 +35,7 @@ class MercyManager:
         conn.close()
 
     def get_pulls(self, user_id, shard_type):
-        """Retourne le nombre de pulls actuels pour un utilisateur et un type de shard"""
+        """Returns current pull count for a user and shard type"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         cursor.execute(
@@ -47,11 +47,11 @@ class MercyManager:
         return row[0] if row else 0
 
     def add_pulls(self, user_id, shard_type, pulls):
-        """Ajoute des pulls pour un utilisateur en gérant correctement l'INSERT/UPDATE"""
+        """Adds pulls for a user, handling INSERT/UPDATE correctly"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
 
-        # Vérifie si l'enregistrement existe
+        # Check if record exists
         cursor.execute(
             "SELECT pulls FROM mercy_counters WHERE user_id = ? AND shard_type = ?",
             (user_id, shard_type)
@@ -76,7 +76,7 @@ class MercyManager:
         return new_pulls
 
     def reset_pulls(self, user_id, shard_type):
-        """Réinitialise les pulls d'un utilisateur pour un shard"""
+        """Resets pull count for a user on a shard"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         cursor.execute(
@@ -87,7 +87,7 @@ class MercyManager:
         conn.close()
 
     def get_all_pulls(self, user_id):
-        """Retourne tous les pulls d'un utilisateur pour tous les shards"""
+        """Returns all pull counts for a user across all shards"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
         cursor.execute(
@@ -99,14 +99,14 @@ class MercyManager:
         return {shard_type: pulls for shard_type, pulls in rows}
 
     def get_mercy_chance(self, shard_type, pulls):
-        """Calcule la probabilité de mercy selon le nombre de pulls"""
+        """Calculates mercy probability based on pull count"""
         rule = MERCY_RULES[shard_type]
         if pulls <= rule["threshold"]:
             return rule["base"]
         return rule["base"] + (pulls - rule["threshold"]) * rule["increment"]
 
     def pulls_until_guaranteed(self, shard_type, pulls):
-        """Retourne combien de pulls restent avant un loot garanti"""
+        """Returns pulls remaining until guaranteed loot"""
         rules = {
             "ancient": {"start": 200, "increment": 5, "base": 0.5},
             "void": {"start": 200, "increment": 5, "base": 0.5},

utils/ScreenshotManager_class.py

@@ -7,18 +7,18 @@ from config import SCREENSHOTS_BASE_PATH, BOSS_CONFIG
 class ScreenshotManager:
     def __init__(self, base_path=SCREENSHOTS_BASE_PATH):
         self.base_path = base_path
-        # Créer les dossiers pour chaque boss et difficulté
+        # Create directories for each boss and difficulty
         for boss_type in BOSS_CONFIG.keys():
             boss_path = os.path.join(base_path, boss_type)
             os.makedirs(boss_path, exist_ok=True)
 
-            # Créer sous-dossiers pour les difficultés
+            # Create subdirectories for difficulties
             for difficulty in BOSS_CONFIG[boss_type]['difficulties']:
                 difficulty_path = os.path.join(boss_path, difficulty)
                 os.makedirs(difficulty_path, exist_ok=True)
 
     async def save_screenshot(self, attachment, username, damage, boss_type, difficulty=None):
-        """Sauvegarde le screenshot localement"""
+        """Saves the screenshot locally"""
         try:
             timestamp = int(datetime.now().timestamp())
             file_extension = attachment.filename.split('.')[-1].lower()
@@ -34,18 +34,18 @@ class ScreenshotManager:
             async with aiohttp.ClientSession() as session:
                 async with session.get(attachment.url) as resp:
                     if resp.status == 200:
-                        # Ouverture en binaire, pas de problème d'encodage
+                        # Binary mode, no encoding issues
                         with open(filepath, 'wb') as f:
                             f.write(await resp.read())
                         return filename
             return None
 
         except Exception as e:
-            print(f"Erreur sauvegarde screenshot: {str(e)}")
+            print(f"Screenshot save error: {str(e)}")
             return None
 
     def get_screenshot_path(self, filename, boss_type, difficulty=None):
-        """Retourne le chemin complet du screenshot"""
+        """Returns the full path to the screenshot"""
         if filename:
             if difficulty:
                 return os.path.join(self.base_path, boss_type, difficulty, filename)
@@ -54,12 +54,12 @@ class ScreenshotManager:
         return None
 
     def delete_old_screenshot(self, filename, boss_type, difficulty=None):
-        """Supprime l'ancien screenshot"""
+        """Deletes the old screenshot"""
         if filename:
             old_path = self.get_screenshot_path(filename, boss_type, difficulty)
             if old_path and os.path.exists(old_path):
                 try:
                     os.remove(old_path)
-                    print(f"Ancien screenshot supprimé: {filename}")
+                    print(f"Old screenshot deleted: {filename}")
                 except Exception as e:
-                    print(f"Erreur suppression screenshot: {str(e)}")
+                    print(f"Screenshot deletion error: {str(e)}")

utils/helpers.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 import re
 from datetime import datetime
-from config import AUTHORIZED_CHANNEL_ID, DIFFICULTY_SHORTCUTS 
+from typing import Optional
+from config import AUTHORIZED_CHANNEL_ID, DIFFICULTY_SHORTCUTS, CLAN_ROLE_IDS
 
 def parse_damage_amount(damage_str):
-    """Convertit les montants avec suffixes (K, M, B) en nombres entiers"""
+    """Converts amounts with suffixes (K, M, B) to integers"""
     if not damage_str:
         return None
     damage_str = damage_str.strip().upper()
@@ -22,7 +23,7 @@ def parse_damage_amount(damage_str):
     return int(number * multipliers[suffix])
 
 def format_damage_display(damage):
-    """Formate un montant de dégâts avec le suffixe approprié"""
+    """Formats a damage amount with the appropriate suffix"""
     if damage >= 1_000_000_000:
         billions = damage / 1_000_000_000
         return f"{int(billions)}B" if billions == int(billions) else f"{billions:.1f}B"
@@ -35,7 +36,7 @@ def format_damage_display(damage):
     return str(damage)
 
 def normalize_difficulty(difficulty):
-    """Normalise une difficulté en gérant les diminutifs"""
+    """Normalizes a difficulty string, handling shortcuts"""
     if not difficulty:
         return None
     difficulty_lower = difficulty.lower()
@@ -43,27 +44,15 @@ def normalize_difficulty(difficulty):
         return DIFFICULTY_SHORTCUTS[difficulty_lower]
     return difficulty_lower
 
-def get_user_clan(username):
-    """Détermine le clan d'un utilisateur basé sur son pseudo"""
-    if not username:
+def get_clan_from_member(member) -> Optional[str]:
+    """Detects a member's clan via their Discord roles"""
+    for role in member.roles:
+        if role.id in CLAN_ROLE_IDS:
+            return CLAN_ROLE_IDS[role.id]
     return None
-    username_upper = username.upper()
-    # Tags avec crochets et espace
-    for clan_tag in ['[RTF] ', '[RTFC] ', '[RTFR] ']:
-        if username_upper.startswith(clan_tag):
-            return clan_tag.replace('[', '').replace(']', '').strip()
-    # Tags avec crochets sans espace
-    for clan_tag in ['[RTF]', '[RTFC]', '[RTFR]']:
-        if username_upper.startswith(clan_tag):
-            return clan_tag.replace('[', '').replace(']', '')
-    return None
-
-def get_user_clan_from_ctx(ctx):
-    """Détermine le clan d'un utilisateur depuis le contexte Discord"""
-    return get_user_clan(ctx.author.display_name)
 
 def format_datetime(date_str):
-    """Formate une date en format AM/PM"""
+    """Formats a date in AM/PM format"""
     if not date_str:
         return None
     try:
@@ -73,7 +62,7 @@ def format_datetime(date_str):
         return None
 
 def format_date_only(date_str):
-    """Formate une date sans l'heure"""
+    """Formats a date without the time component"""
     if not date_str:
         return None
     try:
@@ -83,7 +72,7 @@ def format_date_only(date_str):
         return None
 
 def get_difficulty_display_name(difficulty):
-    """Convertit le nom de difficulté en nom d'affichage"""
+    """Converts an internal difficulty name to display name"""
     difficulty_names = {
         'ultra': 'Ultra Nightmare',
         'nightmare': 'Nightmare',
@@ -107,7 +96,7 @@ MERCY_RULES = {
 }
 
 def calc_chance_and_guarantee(shard_type, pulls):
-    """Retourne chance, pull garanti et pulls restants"""
+    """Returns chance, guaranteed pull count, and remaining pulls"""
     if shard_type not in MERCY_RULES:
         return 0, None, None
     rule = MERCY_RULES[shard_type]

utils/leaderboard_handler.py

@@ -3,7 +3,7 @@ import os
 import discord
 from discord.ext import commands
 from config import AUTHORIZED_CHANNEL_ID, BOSS_CONFIG, CLAN_CONFIG
-from utils.helpers import normalize_difficulty, get_difficulty_display_name, format_damage_display, format_date_only, get_user_clan
+from utils.helpers import normalize_difficulty, get_difficulty_display_name, format_damage_display, format_date_only
 
 db_manager = None
 
@@ -12,12 +12,12 @@ def set_db_manager(db):
     db_manager = db
 
 async def show_leaderboard(ctx, boss_type, difficulty=None, clan=None):
-    """Fonction générique pour afficher les classements"""
+    """Generic function to display leaderboards"""
     if ctx.channel.id != AUTHORIZED_CHANNEL_ID:
         return
 
     try:
-        # Normaliser la difficulté si spécifiée
+        # Normalize difficulty if specified
         if difficulty:
             difficulty = normalize_difficulty(difficulty)
             if difficulty not in BOSS_CONFIG[boss_type]['difficulties']:
@@ -34,7 +34,7 @@ async def show_leaderboard(ctx, boss_type, difficulty=None, clan=None):
             await ctx.send(f"⚠️ No{difficulty_text} {boss_info['name']} records found{clan_text} yet!")
             return
 
-        # Titre avec clan et difficulté si spécifiés
+        # Title with clan and difficulty if specified
         difficulty_name = get_difficulty_display_name(difficulty) if difficulty else ""
         title = f"🏆 {difficulty_name} {boss_info['name']} Leaderboard - Top 10"
 
@@ -49,19 +49,17 @@ async def show_leaderboard(ctx, boss_type, difficulty=None, clan=None):
 
         medals = ["🥇", "🥈", "🥉"] + ["🏅"] * 7
 
-        for i, (username, damage, date) in enumerate(leaderboard):
+        for i, (username, damage, date, row_clan) in enumerate(leaderboard):
             date_text = ""
             if date:
                 formatted_date = format_date_only(date)
                 if formatted_date:
                     date_text = f" • {formatted_date}"
 
-            # Afficher le clan dans le nom si pas de filtre par clan
+            # Show clan emoji if leaderboard is global (not filtered by clan)
             display_name = username
-            if not clan:
-                user_clan = get_user_clan(username)
-                if user_clan:
-                    clan_emoji = CLAN_CONFIG.get(user_clan, {'emoji': '🏛️'})['emoji']
+            if not clan and row_clan:
+                clan_emoji = CLAN_CONFIG.get(row_clan, {'emoji': '🏛️'})['emoji']
                 display_name = f"{clan_emoji} {username}"
 
             embed.add_field(

utils/pb_handler.py

@@ -8,19 +8,20 @@ from utils.helpers import (
     get_difficulty_display_name,
     format_damage_display,
     format_datetime,
+    get_clan_from_member,
 )
 
 db_manager = None
 screenshot_manager = None
 
 def set_managers(db, ss):
-    """Injection des managers (appelée une seule fois depuis bot.py)"""
+    """Injects managers (called once from bot.py)"""
     global db_manager, screenshot_manager
     db_manager = db
     screenshot_manager = ss
 
 async def handle_pb_command(ctx, boss_type, arg1=None, arg2=None):
-    """Fonction générique pour gérer toutes les commandes PB avec difficultés"""
+    """Generic handler for all PB commands"""
     if ctx.channel.id != AUTHORIZED_CHANNEL_ID:
         return
 
@@ -28,7 +29,7 @@ async def handle_pb_command(ctx, boss_type, arg1=None, arg2=None):
     difficulties = boss_info['difficulties']
 
     try:
-        # Pour CvC (pas de difficultés)
+        # For CvC (no difficulties)
         if not difficulties:
             if arg1:
                 damage = parse_damage_amount(arg1)
@@ -40,7 +41,7 @@ async def handle_pb_command(ctx, boss_type, arg1=None, arg2=None):
                 await show_user_pb(ctx, boss_type, None, ctx.author.display_name)
             return
 
-        # Pour Hydra et Chimera (avec difficultés)
+        # For Hydra and Chimera (with difficulties)
         if not arg1:
             difficulty_list = " | ".join([d.title() for d in difficulties])
             await ctx.send(
@@ -80,7 +81,7 @@ async def handle_pb_command(ctx, boss_type, arg1=None, arg2=None):
         await ctx.send(f"⚠️ Error: {str(e)}")
 
 async def handle_pb_submission(ctx, boss_type, difficulty, damage):
-    """Gère la soumission d'un nouveau PB"""
+    """Handles submission of a new PB"""
     if not ctx.message.attachments:
         await ctx.send("⚠️ Please attach a screenshot to validate your PB!")
         return
@@ -92,6 +93,7 @@ async def handle_pb_submission(ctx, boss_type, difficulty, damage):
 
     user_id = ctx.author.id
     username = ctx.author.display_name
+    clan = get_clan_from_member(ctx.author)
     current_pb, _, _ = db_manager.get_user_pb(user_id, boss_type, difficulty)
 
     if damage > current_pb:
@@ -101,7 +103,7 @@ async def handle_pb_submission(ctx, boss_type, difficulty, damage):
 
         if screenshot_filename:
             old_screenshot = db_manager.update_user_pb(
-                user_id, username, boss_type, damage, screenshot_filename, difficulty
+                user_id, username, boss_type, damage, screenshot_filename, difficulty, clan
             )
 
             if old_screenshot:
@@ -118,7 +120,7 @@ async def handle_pb_submission(ctx, boss_type, difficulty, damage):
             )
             embed.add_field(name="📈 Improvement", value=f"+{format_damage_display(improvement)} damage", inline=True)
 
-            # Envoi du screenshot correctement pour Discord
+            # Send screenshot to Discord
             screenshot_path = screenshot_manager.get_screenshot_path(screenshot_filename, boss_type, difficulty)
             if screenshot_path and os.path.exists(screenshot_path):
                 file = discord.File(screenshot_path, filename=screenshot_filename)
@@ -129,19 +131,19 @@ async def handle_pb_submission(ctx, boss_type, difficulty, damage):
         else:
             await ctx.send("⚠️ Failed to save screenshot. Please try again.")
     else:
-        # Si le PB n'est pas battu, on montre le PB existant
+        # PB not beaten, show current PB
         await show_user_pb(ctx, boss_type, difficulty, username)
 
 async def show_user_pb(ctx, boss_type, difficulty, target_user):
-    """Affiche le PB actuel d'un utilisateur"""
-    # Si target_user est un nom d'utilisateur, on essaie de le trouver
+    """Displays the current PB for a user"""
+    # If target_user is a username, try to find them
     if isinstance(target_user, str) and not target_user.isdigit():
-        # D'abord, vérifier si c'est l'utilisateur actuel
+        # First check if it's the current user
         if target_user.lower() == ctx.author.display_name.lower():
             user_id = ctx.author.id
             display_name = ctx.author.display_name
         else:
-            # Chercher dans la base de données
+            # Search in database
             matches = db_manager.find_user_by_name(target_user)
             if not matches:
                 await ctx.send(f"⚠️ User **{target_user}** not found in database.")
@@ -152,7 +154,7 @@ async def show_user_pb(ctx, boss_type, difficulty, target_user):
             else:
                 user_id, display_name = matches[0]
     else:
-        # Si c'est l'utilisateur actuel
+        # Current user
         user_id = ctx.author.id
         display_name = ctx.author.display_name
 
@@ -169,7 +171,7 @@ async def show_user_pb(ctx, boss_type, difficulty, target_user):
         if date:
             embed.add_field(name="📅 Date", value=format_datetime(date), inline=True)
 
-        # Envoi du screenshot local correctement
+        # Send local screenshot to Discord
         if screenshot:
             screenshot_path = screenshot_manager.get_screenshot_path(screenshot, boss_type, difficulty)
             if screenshot_path and os.path.exists(screenshot_path):