User auto-join club

bot.toml.example

@@ -6,6 +6,7 @@ log_level = "INFO"
 id = <the id of the server here>
 news_channel_id = <the id of the news channel here>
 news_role_id = <the id of the news channel here>
+auto_role_channel_id = <the id of the auto role channel here>
 
 [sith_api]
 api_key = "<your sith api token here>"

src/commands/club.py

@@ -30,6 +30,7 @@ class ClubCog(commands.GroupCog, group_name="club"):
     def __init__(self, bot: AeBot):
         self.club_service = ClubService(bot)
         self.settings = Settings()
+        self.bot = bot
 
     async def autocomplete_club(
         self, _interaction: Interaction, current: str
@@ -52,6 +53,7 @@ async def autocomplete_existing_club(
     async def club_infos(
         self, interaction: Interaction, club: Transform[ClubSchema, ClubTransformer]
     ):
+        """Permet d'envoie les informations d'un club"""
         await interaction.response.defer(thinking=True)
         await interaction.followup.send(embed=self.club_service.embed(club))
 
@@ -63,6 +65,10 @@ async def remove_club_member(
         club: Transform[ClubSchema, ClubTransformer],
         member: Member,
     ):
+        """
+        Permet d'enlever, sur discord, un membre d'un club
+        et de l'ajouter en tant qu'ancien
+        """
         await interaction.response.defer(thinking=True)
         db_club = Club.get_or_none(Club.sith_id == club.id)
         if not db_club:
@@ -93,6 +99,7 @@ async def add_club_member(
         club: Transform[ClubSchema, ClubTransformer],
         member: Member,
     ):
+        """Permet d'ajouter un membre à un club existant sur le serveur discord"""
         await interaction.response.defer(thinking=True)
         db_club = Club.get_or_none(Club.sith_id == club.id)
         role_membre = member.guild.get_role(db_club.member_role_id)
@@ -121,11 +128,21 @@ async def add_club_member(
     async def create_club(
         self, interaction: Interaction, club: Transform[ClubSchema, ClubTransformer]
     ):
+        """Permet de créer un club déjà disponible sur le sith"""
         await interaction.response.defer(thinking=True)
         if Club.filter(Club.sith_id == club.id).exists():
             await interaction.followup.send(f"Le club : {club.name} existe déjà...")
         else:
-            await self.club_service.create_club(club, interaction.guild)
+            guild = interaction.guild
+            id_channel_autorole = utils.get(
+                guild.channels, id=self.bot.settings.guild.auto_role_channel_id
+            )
+            mess = await id_channel_autorole.send(
+                f"Réagi à ce message pour rejoindre le club {club.name}"
+            )
+
+            await mess.add_reaction("✅")
+            await self.club_service.create_club(club, guild, mess)
             await interaction.followup.send(f"Le club : {club.name} à été créé")
 
     @app_commands.command(name="passation")
@@ -138,6 +155,7 @@ async def handover(
         new_president: Member,
         new_treasurer: Member,
     ):
+        """Permet de faire la passation d'un club lors de la reprise"""
         await interaction.response.defer(thinking=True)
         db_club = Club.get_or_none(Club.sith_id == club.id)
         guild = interaction.guild
@@ -172,6 +190,7 @@ async def handover(
     async def stop_club(
         self, interaction: Interaction, club: Transform[ClubSchema, ClubTransformer]
     ):
+        """Permet de mettre un club en inactif"""
         await interaction.response.defer(thinking=True)
         db_club = Club.get_or_none(Club.sith_id == club.id)
         await self.club_service.stop_club(db_club, interaction.guild)

src/commands/role.py

@@ -0,0 +1,68 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from discord import RawReactionActionEvent
+from discord.ext import commands
+
+from src.client import ClubSchema  # noqa TC001
+from src.db.models import Club
+from src.services.club import ClubService
+from src.settings import Settings
+
+if TYPE_CHECKING:
+    from src.main import AeBot
+
+
+class RoleCog(commands.GroupCog, group_name="role"):
+    def __init__(self, bot: AeBot):
+        self.settings = Settings()
+        self.club_service = ClubService(bot)
+        self.bot = bot
+
+    @commands.Cog.listener()
+    async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
+        if payload.guild_id is None:
+            return
+
+        guild = self.bot.get_guild(payload.guild_id)
+        member = guild.get_member(payload.user_id)
+
+        if member == self.bot.user:
+            return
+
+        channel = self.bot.get_channel(payload.channel_id)
+        message = await channel.fetch_message(payload.message_id)
+        emoji = str(payload.emoji)
+        db_club = Club.get(Club.message_autorole_id == message.id)
+
+        if not db_club:
+            return
+
+        elif emoji != "✅":
+            await message.remove_reaction(payload.emoji, member)
+
+        await self.club_service.add_member(db_club, member)
+
+    @commands.Cog.listener()
+    async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
+        if payload.guild_id is None:
+            return
+
+        guild = self.bot.get_guild(payload.guild_id)
+        member = guild.get_member(payload.user_id)
+
+        if member == self.bot.user:
+            return
+
+        channel = self.bot.get_channel(payload.channel_id)
+        message = await channel.fetch_message(payload.message_id)
+        emoji = str(payload.emoji)
+
+        db_club = Club.get(Club.message_autorole_id == message.id)
+
+        if not db_club or emoji != "✅":
+            return
+
+        await self.club_service.remove_member(db_club, member, _former=0)

src/db/models.py

@@ -36,6 +36,7 @@ class Club(DbBaseModel):
     treasurer_role_id = peewee.IntegerField(unique=True)
     member_role_id = peewee.IntegerField(unique=True)
     former_member_role_id = peewee.IntegerField(unique=True)
+    message_autorole_id = peewee.IntegerField(unique=True)
 
 
 def init():

src/main.py

@@ -6,7 +6,7 @@
 from logging import handlers
 from typing import TYPE_CHECKING
 
-from discord import Guild, Intents, Interaction
+from discord import Game, Guild, Intents, Interaction
 from discord.ext import commands
 from discord.utils import setup_logging
 
@@ -15,6 +15,7 @@
 from src.commands.club import ClubCog
 from src.commands.misc import MiscCog
 from src.commands.news import NewsCog
+from src.commands.role import RoleCog
 from src.settings import BASE_DIR, Settings
 
 if TYPE_CHECKING:
@@ -38,10 +39,12 @@ async def setup_hook(self):
         await self.add_cog(NewsCog(self))
         await self.add_cog(AdminCog(self))
         await self.add_cog(MiscCog())
+        await self.add_cog(RoleCog(self))
 
     async def on_ready(self):
         await self.wait_until_ready()
         self.watched_guild = self.get_guild(self.settings.guild.id)
+        await self.change_presence(activity=Game(name="/help"))
         self.logger.info(f"Bot ready to act on {self.watched_guild.name}")
 
     async def on_command(self, ctx: Context):

src/services/club.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import asyncio
 from typing import TYPE_CHECKING
 from urllib.parse import urljoin
 
@@ -9,7 +10,7 @@
 from src.settings import Settings
 
 if TYPE_CHECKING:
-    from discord import Guild, Member
+    from discord import Guild, Member, Message
 
     from src.client import ClubSchema, SimpleClubSchema
     from src.main import AeBot
@@ -77,7 +78,7 @@ def embed(self, club: ClubSchema) -> Embed:
             )
         return embed
 
-    async def create_club(self, club: ClubSchema, guild: Guild):
+    async def create_club(self, club: ClubSchema, guild: Guild, mess: Message):
         if Club.filter(Club.sith_id == club.id).exists():
             raise ClubExists
         # create the role for member, presidence and treasurer
@@ -119,6 +120,7 @@ async def create_club(self, club: ClubSchema, guild: Guild):
             treasurer_role_id=treasurer.id,
             member_role_id=member.id,
             former_member_role_id=former_member.id,
+            message_autorole_id=mess.id,
         )
 
     async def add_member(self, club: Club, member: Member):
@@ -130,11 +132,14 @@ async def add_member(self, club: Club, member: Member):
             )
         await member.add_roles(role, reason=f"{member.name} joined club {club.name}")
 
-    async def remove_member(self, club: Club, member: Member):
+    async def remove_member(self, club: Club, member: Member, _former=1):
         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} left club {club.name}")
-        await member.add_roles(former, reason=f"{member.name} left club {club.name}")
+        if _former == 1:
+            await member.add_roles(
+                former, reason=f"{member.name} left club {club.name}"
+            )
 
     async def handover(
         self, club: ClubSchema, new_pres: Member, new_treso: Member, guild: Guild
@@ -187,4 +192,5 @@ async def stop_club(self, club: Club, guild: Guild):
                 role_member,
                 reason=f"Arrêt du club : {club.name}",
             )
+            await asyncio.sleep(1)
             await e.add_roles(role_former, reason=f"Arrêt du club : {club.name}")

src/settings.py

@@ -21,6 +21,7 @@ class GuildConfig(BaseModel):
     id: int
     news_channel_id: int | None = None
     news_role_id: int | None = None
+    auto_role_channel_id: int | None = None
 
 
 class BotConfig(BaseModel):