Add ability to assign Discord role in SignUp request (#36)

* Update dependencies
* Fix isort
* Give role to applicant

Author: drcrazy

.gitignore

@@ -85,7 +85,7 @@ celerybeat-schedule
 *.sage.py
 
 # Environments
-slao_bot/.env
+.env
 .venv
 env/
 venv/

requirements-dev.txt

@@ -1,33 +1,33 @@
 -r requirements.txt
 
-isort==5.12.0
+isort==5.13.2
 cognitive-complexity==1.3.0
 
-mypy==1.4.1
+mypy==1.10.1
 
 mccabe==0.7.0
-flake8==6.0.0
+flake8==7.1.0
 flake8-broken-line==1.0.0
-flake8-bugbear==23.7.10
-flake8-builtins==2.1.0
+flake8-bugbear==24.4.26
+flake8-builtins==2.5.0
 flake8-class-attributes-order==0.1.3
 flake8-cognitive-complexity==0.1.0
-flake8-commas==2.1.0
-flake8-comprehensions==3.14.0
+flake8-commas==4.0.0
+flake8-comprehensions==3.15.0
 flake8-debugger==4.1.2
 flake8-eradicate==1.5.0
 flake8-functions==0.0.8
-flake8-isort==6.0.0
+flake8-isort==6.1.1
 flake8-mock==0.4
 flake8-multiline-containers==0.0.19
 flake8-mutable==1.2.0
-flake8-noqa==1.3.2
+flake8-noqa==1.4.0
 flake8-print==5.0.0
-flake8-pytest-style==1.7.2
+flake8-pytest-style==2.0.0
 flake8-pytest==1.4
-flake8-quotes==3.3.2
-flake8-simplify==0.20.0
+flake8-quotes==3.4.0
+flake8-simplify==0.21.0
 flake8-string-format==0.3.0
 flake8-super==0.1.3
-flake8-todos==0.3.0
+flake8-todos==0.3.1
 flake8-variables-names==0.0.6

requirements.txt

@@ -1,6 +1,6 @@
-aiohttp==3.9.4
-discord==2.3.1
+aiohttp==3.9.5
+discord.py==2.4.0
 gql[all]==3.5.0
-pydantic-settings==2.0.2
-tenacity==8.2.2
-diskcache==5.6.1
+pydantic-settings==2.3.4
+tenacity==8.5.0
+diskcache==5.6.3

setup.cfg

@@ -49,6 +49,7 @@ line_length = 80
 multi_line_output = 5
 combine_as_imports = True
 include_trailing_comma = True
+known_first_party = slaobot
 
 [mypy]
 incremental = False

slao_bot/cogs/gear.py

@@ -7,14 +7,15 @@
 import tenacity
 from discord import Colour, Embed, app_commands
 from discord.ext import commands
-from slaobot import SlaoBot
 from utils import enchants
 from utils.constants import SLOT_NAMES, Role
 from utils.models import Raider
 from utils.report import Report
 from utils.sockets import MIN_GEM_ILEVEL, SOCKETS
 from utils.wcl_client import WCLClient
 
+from slaobot import SlaoBot
+
 
 @dataclass
 class RaidWeakEquipment:

slao_bot/cogs/potions.py

@@ -6,10 +6,11 @@
 import tenacity
 from discord import Colour, Embed, app_commands
 from discord.ext import commands
-from slaobot import SlaoBot
 from utils.constants import POT_IMAGES
 from utils.wcl_client import WCLClient
 
+from slaobot import SlaoBot
+
 
 @dataclass
 class RaidConsumables:

slao_bot/cogs/raidreport.py

@@ -5,13 +5,14 @@
 import tenacity
 from discord import Colour, Embed, Message, app_commands
 from discord.ext import commands
-from slaobot import SlaoBot
 from utils.constants import ZONE_IMAGES, Role
 from utils.format import bold, make_execution
 from utils.raidview import RaidView
 from utils.report import Report
 from utils.wcl_client import WCLClient
 
+from slaobot import SlaoBot
+
 
 class RaidReport(commands.Cog):
     def __init__(self, bot: SlaoBot):

slao_bot/cogs/signup.py

@@ -1,12 +1,61 @@
+import time
+
 import discord
 from discord import Colour, Embed, Member, app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
-from slaobot import SlaoBot
 from utils.config import settings
 
+from slaobot import SlaoBot
+
+
+class SignUpRequest(discord.ui.View):
+    """View that will give starting role to a newcomer"""
+
+    def __init__(self):
+        super().__init__(timeout=None)
+
+    @discord.ui.button(label='Принять', style=discord.ButtonStyle.green, custom_id='sur:accept')
+    async def accept(self, interaction: discord.Interaction, button: discord.ui.Button):
+        if interaction.message is None:
+            return None
+
+        # noinspection PyUnresolvedReferences
+        await interaction.response.defer()
+
+        # There should be an embed with questionnaire answers
+        embed: Embed = interaction.message.embeds[0]
+        if not embed:
+            return None
+
+        try:
+            mention = embed.fields[5].value
+            mention = mention.replace('<', '')
+            mention = mention.replace('>', '')
+            mention = mention.replace('@', '')
+            mention = mention.replace('!', '')
+
+            candidate = interaction.guild.get_member(int(mention))
+        except discord.NotFound:
+            await interaction.followup.send('Не нашел пользователя.', ephemeral=True)
+            return None
+
+        role = discord.utils.get(interaction.guild.roles, name='Служитель')
+        try:
+            await candidate.add_roles(role)
+        except discord.Forbidden:
+            await interaction.followup.send('Нет прав.', ephemeral=True)
+            return None
+
+        # Role set. Let's update embed and stop the view
+        embed.set_footer(text=f'{interaction.user} сделал Служителем | {time.asctime(time.localtime(time.time()))} ')
+        await interaction.message.edit(embed=embed, view=None)
+        self.stop()
+
 
 class SignUpModal(discord.ui.Modal, title='Информация о себе'):
+    """Modal dialog window with basic questions about newcomer."""
+
     name = discord.ui.TextInput(
         label='Твой имя',
         placeholder='Как тебя зовут',
@@ -62,7 +111,7 @@ async def on_submit(self, interaction: discord.Interaction):
             signup_embed.add_field(name='Пользователь', value=format(interaction.user.mention))
             if interaction.user.avatar:
                 signup_embed.set_thumbnail(url=interaction.user.avatar.url)
-            await signup_channel.send(embed=signup_embed)
+            await signup_channel.send(embed=signup_embed, view=SignUpRequest())
 
         # noinspection PyUnresolvedReferences
         await interaction.response.send_message(
@@ -76,13 +125,15 @@ async def on_error(self, interaction: discord.Interaction, error: Exception) ->
 
 
 class SignUp(commands.Cog):
-    def __init__(self, bot: SlaoBot):
-        """
-        Cog to greet newcomers and give them some basic questionnaire.
+    """Cog to greet newcomers and give them some basic questionnaire.
+
+    :param bot: Bot instance
+    """
 
-        :param bot: Bot instance
-        """
+    def __init__(self, bot: SlaoBot):
         self.bot: SlaoBot = bot
+        # Register the persistent view for listening here.
+        self.bot.add_view(SignUpRequest())
 
     @commands.Cog.listener()
     async def on_member_join(self, member: Member) -> None:
@@ -95,7 +146,7 @@ async def on_member_join(self, member: Member) -> None:
         dm_channel = await member.create_dm()
         intro_message = (f'Привет, {format(member.mention)}! \r\n'
                          'Приветствуем тебя на Discord сервере гильдии <Адепты Катаклизма>! \r\n'
-                         'Мы играем в Wrath of the Lich King Classic за Альянс на Пламегоре. \r\n'
+                         'Мы играем в Cataclysm Classic за Альянс на Пламегоре. \r\n'
                          'Если хочешь вступить к нам в гильдию, то напиши /signup в любом  \r\n'
                          'канале Discord сервера Адептов. \r\n'
                          'Удачного времяпрепровождения!')

slao_bot/utils/raidview.py

@@ -2,6 +2,7 @@
 
 import discord
 from discord import Embed
+
 from slaobot import SlaoBot