cogs/guide.py

@@ -16,7 +16,7 @@ class Guide(commands.Cog):
             return
 
         embed = discord.Embed(
-            title="🧐 TEA Bot - Commands Guide",
+            title="🧐 RTF Bot - Commands Guide",
             description="Here are all available commands for tracking your Personal Bests!",
             color=0x00bfff
         )
@@ -81,10 +81,9 @@ class Guide(commands.Cog):
         # Classements par clan
         embed.add_field(
             name="🏆 Clan Leaderboards",
-            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`",
+            value="**RTF:** `!rtfhydra <diff>` `!rtfchimera <diff>` `!rtfcvc`\n"
+                  "**RTFC:** `!rtfchydra <diff>` `!rtfcchimera <diff>` `!rtfccvc`\n"
+                  "**RTFR:** `!rtfrhydra <diff>` `!rtfrchimera <diff>` `!rtfrcvc`",
             inline=False
         )
 
@@ -105,7 +104,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"
-                  "`!teaihydra nm` - TEAI clan Nightmare rankings\n"
+                  "`!rtfhydra nm` - RTF clan Nightmare rankings\n"
                   "**Always attach screenshot when submitting PBs!**",
             inline=False
         )

cogs/top10.py

@@ -32,57 +32,44 @@ class Top10(commands.Cog):
     async def top10cvc(self, ctx):
         await show_leaderboard(ctx, 'cvc')
 
-    # --- Commandes par clan TEAI (Inferno) ---
+    # --- Commandes par clan RTF ---
     @commands.command()
-    async def teaihydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAI')
+    async def rtfhydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTF')
 
     @commands.command()
-    async def teaichimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAI')
+    async def rtfchimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTF')
 
     @commands.command()
-    async def teaicvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='TEAI')
+    async def rtfcvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='RTF')
 
-    # --- Commandes par clan TEAF (Flame) ---
+    # --- Commandes par clan RTFC ---
     @commands.command()
-    async def teafhydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAF')
+    async def rtfchydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTFC')
 
     @commands.command()
-    async def teafchimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAF')
+    async def rtfcchimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTFC')
 
     @commands.command()
-    async def teafcvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='TEAF')
+    async def rtfccvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='RTFC')
 
-    # --- Commandes par clan TEAC (Cinder) ---
+    # --- Commandes par clan RTFR ---
     @commands.command()
-    async def teachydra(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'TEAC')
+    async def rtfrhydra(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'hydra', difficulty, 'RTFR')
 
     @commands.command()
-    async def teachimera(self, ctx, difficulty: str = None):
-        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'TEAC')
+    async def rtfrchimera(self, ctx, difficulty: str = None):
+        await self._show_clan_leaderboard(ctx, 'chimera', difficulty, 'RTFR')
 
     @commands.command()
-    async def teaccvc(self, ctx):
-        await show_leaderboard(ctx, 'cvc', clan='TEAC')
-
-    # --- Commandes par clan TEACO (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')
+    async def rtfrcvc(self, ctx):
+        await show_leaderboard(ctx, 'cvc', clan='RTFR')
 
     # --- Méthode interne pour éviter la répétition ---
     async def _show_clan_leaderboard(self, ctx, boss_type, difficulty, clan):

config.py

@@ -12,27 +12,11 @@ AUTHORIZED_CHANNEL_ID = int(os.getenv("AUTHORIZED_CHANNEL_ID"))
 SCREENSHOTS_BASE_PATH = "/app/screenshots"
 DATABASE_PATH = "/app/data/bot_data.db"
 
-# Configuration des clans TEA - The Ember Accord
+# Configuration des clans
 CLAN_CONFIG = {
-    '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},
-}
-
-# Mapping role Discord ID → clé de clan  [IDs serveur DEV — à remplacer]
-CLAN_ROLE_IDS = {
-    0000000000000000001: 'TEAI',   # TODO: remplacer par l'ID rôle TEAI du serveur dev
-    0000000000000000002: 'TEAF',   # TODO: remplacer par l'ID rôle TEAF du serveur dev
-    0000000000000000003: 'TEAC',   # TODO: remplacer par l'ID rôle TEAC du serveur dev
-    0000000000000000004: 'TEACO',  # TODO: remplacer par l'ID rôle TEACO du serveur dev
-}
-
-# Mapping anciens clans → nouveaux (migration base existante)
-CLAN_MIGRATION = {
-    'RTF':  'TEAI',
-    'RTFC': 'TEAF',
-    'RTFR': 'TEAC',
+    'RTF':  {'name': 'RTF',  'emoji': '🛡️', 'color': 0x00ff00},
+    'RTFC': {'name': 'RTFC', 'emoji': '🔥', 'color': 0xff4500},
+    'RTFR': {'name': 'RTFR', 'emoji': '⚔️', 'color': 0x1e90ff}
 }
 
 # Configuration des boss avec difficultés

utils/DatabaseManager_class.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from config import DATABASE_PATH, CLAN_MIGRATION
+from config import DATABASE_PATH
 import sqlite3, os
 
 class DatabaseManager:
@@ -70,16 +70,7 @@ class DatabaseManager:
         
         if 'discord_id' not in columns:
             cursor.execute('ALTER TABLE users ADD COLUMN discord_id TEXT')
-
-        if 'clan' not in columns:
-            cursor.execute('ALTER TABLE users ADD COLUMN clan TEXT')
-            # Migration automatique : déduction du clan depuis l'ancien préfixe du pseudo
-            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}]%')
-                )
+            # Note: Vous devrez peut-être faire une migration manuelle pour les données existantes
         
         # Table pour l'historique global
         cursor.execute('''
@@ -117,33 +108,32 @@ 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, clan=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"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
-
+        
         # Récupérer l'ancien screenshot pour le supprimer
         old_data = self.get_user_pb(user_id, boss_type, difficulty)
         old_screenshot = old_data[1] if old_data else None
-
+        
         if difficulty:
             column_prefix = f"pb_{boss_type}_{difficulty}"
         else:
             column_prefix = f"pb_{boss_type}"
-
-        # COALESCE(?, clan) : on n'écrase pas le clan existant si la détection retourne None
+        
+        # Créer l'utilisateur s'il n'existe pas, sinon mettre à jour
         cursor.execute(f'''
-        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
+        INSERT INTO users (discord_id, discord_username, {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, clan, damage, screenshot_filename, username, clan, damage, screenshot_filename))
+        ''', (str(user_id), username, damage, screenshot_filename, username, damage, screenshot_filename))
         
         # Ajouter à l'historique
         cursor.execute('''
@@ -160,27 +150,27 @@ class DatabaseManager:
         """Récupère le classement pour un boss et difficulté spécifique"""
         conn = sqlite3.connect(self.db_path)
         cursor = conn.cursor()
-
+        
         if difficulty:
             column_prefix = f"pb_{boss_type}_{difficulty}"
         else:
             column_prefix = f"pb_{boss_type}"
-
+        
         base_query = f'''
-        SELECT discord_username, {column_prefix}, {column_prefix}_date, clan
-        FROM users
+        SELECT discord_username, {column_prefix}, {column_prefix}_date 
+        FROM users 
         WHERE {column_prefix} > 0
         '''
-
-        params = []
+        
         if clan:
-            base_query += ' AND clan = ?'
-            params.append(clan)
-
+            base_query += ''' AND (
+                discord_username LIKE '[''' + clan + '''] %' OR
+                discord_username LIKE '[''' + clan + ''']%'
+            )'''
+        
         base_query += f' ORDER BY {column_prefix} DESC LIMIT ?'
-        params.append(limit)
-
-        cursor.execute(base_query, params)
+        
+        cursor.execute(base_query, (limit,))
         results = cursor.fetchall()
         conn.close()
         return results

utils/helpers.py

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 import re
 from datetime import datetime
-from typing import Optional
-from config import AUTHORIZED_CHANNEL_ID, DIFFICULTY_SHORTCUTS, CLAN_ROLE_IDS
+from config import AUTHORIZED_CHANNEL_ID, DIFFICULTY_SHORTCUTS 
 
 def parse_damage_amount(damage_str):
     """Convertit les montants avec suffixes (K, M, B) en nombres entiers"""
@@ -44,13 +43,25 @@ def normalize_difficulty(difficulty):
         return DIFFICULTY_SHORTCUTS[difficulty_lower]
     return difficulty_lower
 
-def get_clan_from_member(member) -> Optional[str]:
-    """Détecte le clan d'un membre via ses rôles Discord"""
-    for role in member.roles:
-        if role.id in CLAN_ROLE_IDS:
-            return CLAN_ROLE_IDS[role.id]
+def get_user_clan(username):
+    """Détermine le clan d'un utilisateur basé sur son pseudo"""
+    if not username:
+        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"""
     if not date_str:

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
+from utils.helpers import normalize_difficulty, get_difficulty_display_name, format_damage_display, format_date_only, get_user_clan
 
 db_manager = None
 
@@ -49,18 +49,20 @@ async def show_leaderboard(ctx, boss_type, difficulty=None, clan=None):
         
         medals = ["🥇", "🥈", "🥉"] + ["🏅"] * 7
         
-        for i, (username, damage, date, row_clan) in enumerate(leaderboard):
+        for i, (username, damage, date) in enumerate(leaderboard):
             date_text = ""
             if date:
                 formatted_date = format_date_only(date)
                 if formatted_date:
                     date_text = f" • {formatted_date}"
-
-            # Afficher l'emoji du clan si le leaderboard est global (pas filtré par clan)
+            
+            # Afficher le clan dans le nom si pas de filtre par clan
             display_name = username
-            if not clan and row_clan:
-                clan_emoji = CLAN_CONFIG.get(row_clan, {'emoji': '🏛️'})['emoji']
-                display_name = f"{clan_emoji} {username}"
+            if not clan:
+                user_clan = get_user_clan(username)
+                if user_clan:
+                    clan_emoji = CLAN_CONFIG.get(user_clan, {'emoji': '🏛️'})['emoji']
+                    display_name = f"{clan_emoji} {username}"
             
             embed.add_field(
                 name=f"{medals[i]} #{i+1} {display_name}",

utils/pb_handler.py

@@ -8,7 +8,6 @@ from utils.helpers import (
     get_difficulty_display_name,
     format_damage_display,
     format_datetime,
-    get_clan_from_member,
 )
 
 db_manager = None
@@ -93,17 +92,16 @@ 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:
         screenshot_filename = await screenshot_manager.save_screenshot(
             attachment, username, damage, boss_type, difficulty
         )
-
+        
         if screenshot_filename:
             old_screenshot = db_manager.update_user_pb(
-                user_id, username, boss_type, damage, screenshot_filename, difficulty, clan
+                user_id, username, boss_type, damage, screenshot_filename, difficulty
             )
             
             if old_screenshot: