Merge pull request #11 from ae-utbm/new_role_ancien

New role ancien

Author: TitouanDor

src/commands/club.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING
 
-from discord import Interaction, Member, app_commands
+from discord import Interaction, Member, app_commands, utils
 from discord.app_commands import Choice, Transform, Transformer
 from discord.ext import commands
 from discord.ext.commands import BadArgument
@@ -64,6 +64,7 @@ async def remove_club_member(
     ):
         await interaction.response.defer(thinking=True)
         discord_club = DiscordClub.load(club.id)
+        role_membre = utils.get(member.guild.roles, id=discord_club.member_role_id)
         if not discord_club:
             await interaction.followup.send(f"Le club : {club.name} n'existe pas")
             return
@@ -75,7 +76,7 @@ async def remove_club_member(
                 "Seul le président du club et les admins peuvent retirer un membre"
             )
             return
-        if member.id not in discord_club.members:
+        if role_membre not in member.roles:
             await interaction.followup.send("Cet utilisateur n'est pas dans le club")
             return
         await self.club_service.remove_member(discord_club, member)
@@ -93,6 +94,7 @@ async def add_club_member(
     ):
         await interaction.response.defer(thinking=True)
         discord_club = DiscordClub.load(club.id)
+        role_membre = utils.get(member.guild.roles, id=discord_club.member_role_id)
         if not discord_club:
             await interaction.followup.send(f"Le club : {club.name} n'existe pas")
             return
@@ -104,7 +106,7 @@ async def add_club_member(
                 "Seul le président du club et les admins peuvent ajouter un membre"
             )
             return
-        if member.id in discord_club.members:
+        if role_membre in member.roles:
             await interaction.followup.send("Cet utilisateur est déjà dans le club")
             return
         await self.club_service.add_member(discord_club, member)
@@ -133,8 +135,8 @@ async def handover(
         self,
         interaction: Interaction,
         club: Transform[ClubSchema, ClubTransformer],
-        new_pres: Member,
-        new_treso: Member,
+        new_president: Member,
+        new_treasurer: Member,
     ):
         await interaction.response.defer(thinking=True)
         discord_club = DiscordClub.load(club.id)
@@ -144,16 +146,16 @@ async def handover(
             await interaction.followup.send(f"Le club : {club.name} n'existe pas")
             return
 
-        await self.club_service.handover(club, new_pres, new_treso, guild)
+        await self.club_service.handover(club, new_president, new_treasurer, guild)
         annonce = await self.club_service.get_channel(
             guild, discord_club.category_id, f"annonces {club.name}".lower()
         )
 
         if annonce:
             await annonce.send(
-                f"La passation est réussie !! {new_pres.mention} Vous êtes le nouveau "
-                f"président du club {club.name}"
-                f" et {new_treso.mention} le nouveau trésorier !!"
+                f"La passation est réussie !! {new_president.mention} Vous êtes"
+                f"le nouveau président du club {club.name}"
+                f" et {new_treasurer.mention} le nouveau trésorier !!"
             )
 
         else:

src/services/club.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
 
 import json
-from typing import TYPE_CHECKING, Annotated, Self
+from typing import TYPE_CHECKING, Self
 from urllib.parse import urljoin
 
 from discord import Embed, PermissionOverwrite, utils
-from pydantic import BaseModel, PlainSerializer
+from pydantic import BaseModel
 
 from src.settings import BASE_DIR, Settings
 
@@ -31,7 +31,7 @@ class DiscordClub(BaseModel):
     treasurer_sith_id: int | None = None
     member_role_id: int
     member_sith_id: int | None = None
-    members: Annotated[set[int], PlainSerializer(list)]
+    former_member_role_id: int
 
     @classmethod
     def load_all(cls) -> dict[str, dict]:
@@ -99,18 +99,23 @@ def embed(self, club: ClubSchema) -> Embed:
 
     async def create_club(self, club: ClubSchema, guild: Guild):
         # create the role for member, presidence and treasurer
-        president = await guild.create_role(name=f"Président {club.name}")
+        president = await guild.create_role(name=f"Responsable {club.name}")
         treasurer = await guild.create_role(name=f"Trésorier {club.name}")
         member = await guild.create_role(name=f"Membre {club.name}", mentionable=True)
+        former_member = await guild.create_role(
+            name=f"Ancien membre {club.name}", mentionable=True
+        )
 
         # create the clubs category
         overwrites = {
             guild.default_role: PermissionOverwrite(read_messages=False),
             president: PermissionOverwrite(read_messages=True, manage_channels=True),
             member: PermissionOverwrite(read_messages=True),
             treasurer: PermissionOverwrite(read_messages=True),
+            former_member: PermissionOverwrite(read_messages=True),
         }
         news_overwrite = {
+            former_member: PermissionOverwrite(send_messages=False),
             member: PermissionOverwrite(send_messages=False),
             treasurer: PermissionOverwrite(send_messages=False),
             president: PermissionOverwrite(send_messages=True),
@@ -128,21 +133,26 @@ async def create_club(self, club: ClubSchema, guild: Guild):
             president_role_id=president.id,
             treasurer_role_id=treasurer.id,
             member_role_id=member.id,
+            former_member_role_id=former_member.id,
             category_id=category.id,
-            members=set(),
         )
         new_club.save()
 
     async def add_member(self, club: DiscordClub, member: Member):
         role = utils.get(member.guild.roles, id=club.member_role_id)
+        former = utils.get(member.guild.roles, id=club.former_member_role_id)
+        if former in member.roles:
+            await member.remove_roles(
+                former, reason=f"{member.name} joined club {club.name}"
+            )
         await member.add_roles(role, reason=f"{member.name} joined club {club.name}")
-        club.members.add(member.id)
         club.save()
 
     async def remove_member(self, club: DiscordClub, member: Member):
         role = utils.get(member.guild.roles, id=club.member_role_id)
+        former = utils.get(member.guild.roles, id=club.former_member_role_id)
         await member.remove_roles(role, reason=f"{member.name} leaved club {club.name}")
-        club.members.remove(member.id)
+        await member.add_roles(former, reason=f"{member.name} leaved club {club.name}")
         club.save()
 
     async def handover(
@@ -153,13 +163,19 @@ async def handover(
         # removing former presidence and treasurer
         role_pres = utils.get(guild.roles, id=club.president_role_id)
         role_treso = utils.get(guild.roles, id=club.treasurer_role_id)
-        l_pres = role_pres.members
-        l_treso = role_treso.members
-        for e in l_treso:
-            await e.remove_roles(role_treso, reason=f"Passation du club : {club.name}")
-        for e in l_pres:
-            await e.remove_roles(role_pres, reason=f"Passation du club : {club.name}")
+        former = utils.get(guild.roles, id=club.former_member_role_id)
+        old_board = {*role_pres.members, *role_treso.members}
+        for member in old_board:
+            await member.remove_roles(
+                role_pres, role_treso, reason=f"Passation du club : {club.name}"
+            )
+            await member.add_roles(former, reason=f"Passation du club : {club.name}")
 
         # add new presidence and treasurer
+        for new_member in [new_pres, new_treso]:
+            if former in new_member.roles:
+                await new_member.remove_roles(
+                    former, reason=f"{new_pres.name} joined club {club.name}"
+                )
         await new_pres.add_roles(role_pres, reason=f"Passation du club : {club.name}")
         await new_treso.add_roles(role_treso, reason=f"Passation du club : {club.name}")