Dev

.github/workflows/static.yml

@@ -0,0 +1,48 @@
+name: Deploy Sphinx documentation to GitHub Pages
+
+on:
+  push:
+    branches: ["Dev"]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install sphinx sphinx_rtd_theme myst-parser furo
+
+      - name: Build Sphinx documentation
+        run: |
+          sphinx-build -b html ./docs/source ./docs/html
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ./docs/html  # Dossier contenant la doc HTML générée
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -1 +1,2 @@
 venv/
+*.env

README.md

@@ -6,7 +6,7 @@
 
 <p align="center">
   <a href="https://discord.gg/89ENkYSCWE">
-    <img src="/sprites/Discord-logo.png" alt="Discord Server" width="70" height="45">
+    <img src="/sprites/discord-logo.png" alt="Discord Server" width="70" height="45">
   </a>
 
  <p align="center">

TODO.md

@@ -0,0 +1,9 @@
+## 🛠️ To-Do List
+
+- [x] Générer la doc avec Sphinx
+- [x] Déployer la documentation en ligne
+- [ ] Création du jeu F1F
+- [ ] Commande administrateur complète
+- [ ] Gestions des data
+- [ ] Tester le bot à spa en commité réduit (DEV / STAFF / BOOSTEUR)
+- [ ] Supprimé la commande ban du bot

app/admin_command.py

@@ -0,0 +1,24 @@
+from config import EMBED_COLOR_RED, EMBED_THUMBNAIL, EMBED_FOOTER_TEXT, EMBED_IMAGE
+from error_embed import chat_Oops
+import discord
+
+async def ban(interaction: discord.Interaction, member: discord.Member, reason:str, article: str):
+    try:
+        await discord.Member.ban(reason=reason, article=article)
+
+        embed = discord.Embed(
+        title=f"Le membre {member} à été banni!",
+        description="Zoup dehors",
+        color=EMBED_COLOR_RED
+    )
+
+        embed.set_footer(text=EMBED_FOOTER_TEXT, icon_url=EMBED_THUMBNAIL)
+        embed.set_thumbnail(url=interaction.user.display_avatar.url)
+        embed.set_image(url=EMBED_IMAGE)
+
+        await interaction.response.send_message(embed=embed, ephemeral=False)
+
+    except ValueError:
+        chat_Oops(interaction)
+
+

app/classement.py

@@ -1,86 +1,168 @@
+import json
+import os
+from thefuzz import fuzz
 import discord
 from config import logger, EMBED_COLOR_RED, EMBED_THUMBNAIL, EMBED_FOOTER_TEXT, EMBED_IMAGE
-import pandas as pd
 
 
-def calculer_classement(resultats, pronostics_df, output_file_path):
-    classement = []
-
-    # Convertir JSON en dict position -> nom
-    resultats_dict = {int(pos): nom for pos, nom in resultats}
-
-    for _, row in pronostics_df.iterrows():
-        pseudo = row["Pseudo"]
-        score = 0
-
-        # Si tout est bon → +5 points
-        if (
-            row.get("Premier", "").strip().lower() == resultats_dict.get(1, "").strip().lower() and
-            row.get("Deuxième", "").strip().lower() == resultats_dict.get(2, "").strip().lower() and
-            row.get("Troisième", "").strip().lower(
-            ) == resultats_dict.get(3, "").strip().lower()
-        ):
-            score += 5
+def saveResults():
+
+    try:
+        with open('../data/Results.json', 'r', encoding='utf-8') as f:
+            results = json.load(f)
+        with open('../data/Pronos.json', 'r', encoding='utf-8') as f:
+            pronos = json.load(f)
+
+    except ValueError:
+        logger.info("Files cannot be accessed, are you sure pronostics exist ?")
+        return
+
+    try:
+        with open('data/Barem.json', 'r', encoding='utf-8') as f:
+            barem = json.load(f)
+    except ValueError:
+        logger.info("Problem with Barem")
+        return
+
+    Premier = results['1']
+    Second = results['2']
+    Troisième = results['3']
+
+    for key in pronos.keys():
+        points = 0
+        complex = False
+        logger.info(key)
+        Premier_Pronos = False
+        Second_Pronos = False
+        Troisième_Pronos = False
+
+        def match_Position(entry: str, target: str, threshold: int) -> bool:
+            parts = entry.strip().split(' ', 1)
+
+            if (len(parts) == 2):
+                prenom, nom = parts
+            else:
+                prenom = nom = parts[0]
+
+            target_prenom, target_nom = target.strip().split(' ', 1)
+            return fuzz.ratio(target_prenom.lower(), prenom.lower()) >= 90 or fuzz.ratio(target_nom.lower(), nom.lower()) >= threshold
+
+        Premier_Pronos = match_Position(pronos[key]['1'], Premier, 90)
+        Second_Pronos = match_Position(pronos[key]['2'], Second, 90)
+        Troisième_Pronos = match_Position(pronos[key]['3'], Troisième, 90)
+
+        try:
+            if Premier_Pronos and Second_Pronos and Troisième_Pronos:
+                logger.info("Tout juste pour "+pronos[key]["Pseudo"])
+                points += barem["allCorrect"]
+                complex = True
+
+            elif Premier_Pronos and Second_Pronos:
+                logger.info("Le premier et le deuxième sont bon pour " +
+                            pronos[key]['Pseudo']+" + "+str(barem["first2Correct"])+" Points")
+                points += barem["first2Correct"]
+                complex = True
+
+            elif Second_Pronos and Troisième_Pronos:
+
+                logger.info(
+                    "Le premier est bon"+pronos[key]['Pseudo']+" + "+str(barem["last2Correct"])+" Points")
+                points += barem["last2Correct"]
+                complex = True
+
+            elif (Troisième_Pronos and Premier_Pronos):
+
+                logger.info("Le premier et le dernier sont bons pour " +
+                            pronos[key]['Pseudo']+" + "+str(barem["1and3Correct"])+" Points")
+                points += barem["1and3Correct"]
+                complex = True
+
+        except KeyError as e:
+            logger.info(str(e) + "is missing")
+            pass
+        except TypeError as e:
+            logger.info(e)
+            pass
+
+        try:
+            if (Premier_Pronos and not complex):
+                logger.info("Le premier est bon pour " +
+                            pronos[key]['Pseudo']+" + "+str(barem["firstCorrect"])+" Points")
+                points += barem["firstCorrect"]
+
+            if (Second_Pronos and not complex):
+                logger.info("Le deuxième est bon pour " +
+                            pronos[key]['Pseudo']+" + "+str(barem["secondCorrect"])+" Points")
+                points += barem["secondCorrect"]
+
+            if (Troisième_Pronos and not complex):
+                logger.info("Le troisième est bon pour " +
+                            pronos[key]['Pseudo']+" + "+str(barem["thirdCorrect"])+" Points")
+                points += barem["thirdCorrect"]
+
+        except KeyError as e:
+            logger.info(str(e) + "is missing")
+            return
+
+        except TypeError as e:
+            logger.info(e)
+            return
+
+        file_path = 'data/Leaderbord.json'
+
+        if not os.path.exists(file_path):
+            pointsPronos = {
+                key: {
+                    "Pseudo": pronos[key]["Pseudo"],
+                    "Points": points
+                }
+            }
         else:
-            # Comparaison Premier
-            if "Premier" in row and 1 in resultats_dict:
-                if row["Premier"].strip().lower() == resultats_dict[1].strip().lower():
-                    score += 1
-                elif row["Premier"].strip().lower() in [
-                    resultats_dict[2].strip().lower(
-                    ), resultats_dict[3].strip().lower()
-                ]:
-                    score += 0.5
-
-            # Comparaison Deuxième
-            if "Deuxième" in row and 2 in resultats_dict:
-                if row["Deuxième"].strip().lower() == resultats_dict[2].strip().lower():
-                    score += 1
-                elif row["Deuxième"].strip().lower() in [
-                    resultats_dict[1].strip().lower(
-                    ), resultats_dict[3].strip().lower()
-                ]:
-                    score += 0.5
-
-            # Comparaison Troisième
-            if "Troisième" in row and 3 in resultats_dict:
-                if row["Troisième"].strip().lower() == resultats_dict[3].strip().lower():
-                    score += 1
-                elif row["Troisième"].strip().lower() in [
-                    resultats_dict[1].strip().lower(
-                    ), resultats_dict[2].strip().lower()
-                ]:
-                    score += 0.5
-
-        # Ajouter au classement
-        classement.append((pseudo, score))
-
-    # Trier par score décroissant
-    classement.sort(key=lambda x: x[1], reverse=True)
-
-    # Création du DataFrame à partir du classement calculé
-    colonnes = ["Pseudo", "Score"]
-    df_classement = pd.DataFrame(classement, columns=colonnes)
-
-    # Sauvegarde dans le fichier Excel
-    df_classement.to_excel(output_file_path, index=False)
-
-    logger.info(f"✅ Classement sauvegardé dans : {output_file_path}")
-
-    return df_classement
-
-# _______________________________________________________________________________________________________________________________
-
-
-def embed_classement(classement):
+            with open(file_path, 'r', encoding='utf-8') as f:
+                pointsPronos = json.load(f)
+                if key not in pointsPronos:
+                    pointsPronos[key] = {
+                        "Pseudo": pronos[key]["Pseudo"],
+                        "Points": points
+                    }
+                else:
+                    pointsPronos[key]["Pseudo"] = pronos[key]["Pseudo"]
+                    pointsPronos[key]["Points"] += points
+
+        with open(file_path, 'w', encoding='utf-8') as f:
+            json.dump(pointsPronos, f, ensure_ascii=False, indent=4)
+
+
+def Leaderboard():
+
+    try:
+        with open("data/Leaderbord.json", 'r', encoding='utf-8') as f:
+            pointsPronos = json.load(f)
+            pronosLeaderboard = dict(
+                sorted(pointsPronos.items(), key=lambda item: item[1]['Points'], reverse=True))
+
+    except FileNotFoundError:
+        logger.info("The file doesn't exist")
+        return
+
+    except KeyError:
+        logger.info("Erreur dans la lecture des points")
+        return
+
     embed = discord.Embed(
         title="🏆 Classement des Pronostics",
         color=EMBED_COLOR_RED
     )
-    for i, (pseudo, score) in enumerate(classement, start=1):
-        embed.add_field(name=f"{i}ᵉ - {pseudo}",
-                        value=f"Score : **{score}**", inline=False)
-
+    pseudos, points = zip(*[(val['Pseudo'], val['Points'])
+                          for val in pronosLeaderboard.values()])
+    pseudos = list(pseudos)
+    points = list(points)
+    position = 1
+    for i in range(len(pseudos)):
+        embed.add_field(name=f"{position}ᵉ - {pseudos[i]}",
+                        value=f"Score : **{points[i]}**", inline=False)
+        if (i+1 < len(pseudos) and points[i] != points[i+1]):
+            position += 1
     embed.set_footer(text=EMBED_FOOTER_TEXT)
     embed.set_image(url=EMBED_IMAGE)
     embed.set_thumbnail(url=EMBED_THUMBNAIL)

app/config.py

@@ -26,7 +26,7 @@
 logger = logging.getLogger("F1F_Bot")
 logger.setLevel(LOG_LEVEL)
 
-log_path = "../log/app.log"
+log_path = "log/app.log"
 # Crée le dossier si nécessaire
 os.makedirs(os.path.dirname(log_path), exist_ok=True)
 
@@ -46,7 +46,7 @@
 EMBED_THUMBNAIL = "https://cdn.discordapp.com/attachments/1339299411360088226/1367477935392428083/Votre_texte_de_paragraphe_12.png?ex=6871ac52&is=68705ad2&hm=a63fd375a9f30130247df80b936c43e1d93b3a5b16c3415f7a63cac72614058e&"
 EMBED_IMAGE = "https://cdn.discordapp.com/attachments/1339299411360088226/1368544420504272987/Design_sans_titre_2.png?ex=68719910&is=68704790&hm=46bd1e4a625f33cc26d5e029888bef5c265732b842de241daa62662206f13885&"
 
-EMBED_FOOTER_TEXT = "Bot créé par F1F Team"
+EMBED_FOOTER_TEXT = "Bot créé par F1F Team (BETA)"
 EMBED_FOOTER_ICON = EMBED_THUMBNAIL
 
 
@@ -57,3 +57,9 @@
 URL_BASE = "https://fr.motorsport.com/"
 URL_RESULT_COURSE = "https://fr.motorsport.com/f1/results/2025"
 URL_RESULT_QUALIF = "https://fr.motorsport.com/f1/results/2025/gp-de-grande-bretagne-653245/?st=Q3"
+
+# === Environment variable ===
+
+PRONOS_ID=1395093933176131755
+GUILD_ID = 1394054995523010761
+