Add role on auto_join

Author: karel26

plugins/tournament/commands.py

@@ -318,8 +318,8 @@ async def create(self, interaction: discord.Interaction, campaign: str):
             return
 
         # inform players
-        channel_id = self.get_config().get('channels', {}).get('info')
-        if not channel_id:
+        channel = self.get_info_channel()
+        if not channel:
             return
 
         if not await yn_question(interaction, _("Do you want to inform players about the new tournament now?"),
@@ -329,7 +329,7 @@ async def create(self, interaction: discord.Interaction, campaign: str):
 
         embed = await self.render_info_embed(tournament_id)
         # create a persistent message
-        await self.bot.setEmbed(embed_name=f"tournament_{tournament_id}", embed=embed, channel_id=channel_id)
+        await self.bot.setEmbed(embed_name=f"tournament_{tournament_id}", embed=embed, channel_id=channel.id)
 
     @tournament.command(description='Finish a tournament')
     @app_commands.guild_only()

plugins/tournament/listener.py

@@ -1,5 +1,6 @@
 import asyncio
 
+import discord
 from psycopg.errors import UniqueViolation
 
 from core import EventListener, event, Server, utils, get_translation, Coalition
@@ -303,11 +304,21 @@ async def onPlayerChangeSlot(self, server: Server, data: dict) -> None:
                     if config.get('auto_join', False):
                         try:
                             async with conn.transaction():
-                                await conn.execute(f"""
+                                cursor = await conn.execute(f"""
                                     INSERT INTO squadron_members (squadron_id, player_ucid)
                                     SELECT squadron_{side} AS squadron_id, '{player.ucid}'::TEXT 
                                     FROM tm_matches WHERE match_id = %s
+                                    RETURNING squadron_id
                                 """, (match_id, ))
+                                squadron_id = (await cursor.fetchone())[0]
+                                squadron = utils.get_squadron(self.node, squadron_id=squadron_id)
+                                # we need to give the member the role
+                                if player.member and 'role' in squadron:
+                                    try:
+                                        await player.member.add_roles(self.bot.get_role(squadron['role']))
+                                    except discord.Forbidden:
+                                        await self.bot.audit('permission "Manage Roles" missing.',
+                                                             user=self.bot.member)
                         except UniqueViolation:
                             await server.kick(player, "You can only be in one squadron at a time!")
                     else:

plugins/userstats/commands.py

@@ -339,7 +339,8 @@ async def add(self, interaction: discord.Interaction, squadron_id: int,
                     if self.get_config().get('squadrons', {}).get('persist_list', False):
                         await self.persist_squadron_list(squadron_id)
                 except UniqueViolation:
-                    await interaction.followup.send(f"{prefix} is a member of this squadron already!", ephemeral=True)
+                    await interaction.followup.send(f"{prefix} is a member of this or another squadron already!",
+                                                    phemeral=True)
 
                 # check, if the user needs a role
                 if role: