RaidView refactoring (#24)

* Move view to a separate file
* RaidView is now in a separate file
* Fix flake

Author: drcrazy

slao_bot/cogs/bomberman.py

@@ -19,6 +19,7 @@ def __init__(self):
         self._engineers = defaultdict()
         self._bomb_damage = defaultdict()
         self._other_damage = defaultdict()
+        self.embed_title: str = 'Бомбим!'
 
     @app_commands.command(description='Использование гранат и схожих расходников')
     @app_commands.describe(report_id='WCL report ID')
@@ -27,10 +28,10 @@ async def engineers(self, interaction: discord.Interaction, report_id: str) -> N
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
 
-        embed = await self.process_bombs(report_id)
+        embed = await self.process_interaction(report_id)
         await interaction.edit_original_response(embed=embed)
 
-    async def process_bombs(self, report_id: str) -> Optional[discord.Embed]:
+    async def process_interaction(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_bombs(report_id)
@@ -44,7 +45,7 @@ async def process_bombs(self, report_id: str) -> Optional[discord.Embed]:
         self._other_damage = dict(sorted(self._other_damage.items(), key=lambda item: item[1], reverse=True))
 
         embed = Embed(
-            title='Бомбим!',
+            title=self.embed_title,
             description='Использование гранат и схожих расходников. Много гранат - быстрее пройден рейд.',
             colour=Colour.teal(),
         )

slao_bot/cogs/gear.py

@@ -76,24 +76,28 @@ def _check_enchants(self, raider_name: str, item: Dict) -> None:
 
 class Gear(commands.Cog):
 
+    def __init__(self):
+        """Cog to check gems and enchants."""
+        self.embed_title: str = 'Камни и зачаровывание'
+
     @app_commands.command(description='Камни и энчанты')
     @app_commands.describe(report_id='WCL report ID')
     async def gear(self, interaction: discord.Interaction, report_id: str) -> None:
         """Get data about missing or low-level gems and enchants."""
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
 
-        embed = await self.process_gear(report_id)
+        embed = await self.process_interaction(report_id)
         await interaction.edit_original_response(embed=embed)
 
-    async def process_gear(self, report_id: str) -> Optional[discord.Embed]:
+    async def process_interaction(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_table_summary(report_id)
             except tenacity.RetryError:
                 return
 
-        embed = Embed(title='Камни и зачаровывание', description='Щас будет душно!', colour=Colour.teal())
+        embed = Embed(title=self.embed_title, description='Щас будет душно!', colour=Colour.teal())
         embed.set_author(
             name='Лавка зачарованных самоцветов',
             url='',

slao_bot/cogs/potions.py

@@ -74,6 +74,9 @@ def calculate_total(self) -> None:
 
 
 class Potions(commands.Cog):
+    def __init__(self):
+        """Cog to provide basic statistics about raid."""
+        self.embed_title: str = 'Потная катка'
 
     @app_commands.command(description='Использование зелий и иже с ними')
     @app_commands.describe(report_id='WCL report ID')
@@ -82,10 +85,10 @@ async def potions(self, interaction: discord.Interaction, report_id: str) -> Non
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
 
-        embed = await self.process_pots(report_id)
+        embed = await self.process_interaction(report_id)
         await interaction.edit_original_response(embed=embed)
 
-    async def process_pots(self, report_id: str) -> Optional[discord.Embed]:
+    async def process_interaction(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_pots(report_id)
@@ -104,7 +107,7 @@ async def process_pots(self, report_id: str) -> Optional[discord.Embed]:
         consumables.process_prepotions(raiders_by_id, events_info['reportData']['report']['events']['data'])
         consumables.calculate_total()
 
-        embed = Embed(title='Потная катка', description='Пьём по КД, крутим логи.', colour=Colour.teal())
+        embed = Embed(title=self.embed_title, description='Пьём по КД, крутим логи.', colour=Colour.teal())
         embed.set_author(
             name='Синяя яма',
             url='',

slao_bot/cogs/raidreport.py

@@ -3,161 +3,24 @@
 
 import discord
 import tenacity
-from cogs.bomberman import Bomberman
-from cogs.gear import Gear
-from cogs.potions import Potions
 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
 
 
-class RaidView(discord.ui.View):
-    def __init__(self, bot: SlaoBot):
-        super().__init__(timeout=None)
-        self.bot: SlaoBot = bot
-
-    # noinspection PyUnusedLocal
-    @discord.ui.button(label='Refresh', style=discord.ButtonStyle.gray, custom_id='raid_view:refresh', emoji='🔄')
-    async def refresh(self, interaction: discord.Interaction, button: discord.ui.Button):
-        report_id = self._validate_interaction(interaction)
-        if report_id is None:
-            await self._reply_with_error(interaction)
-            return
-
-        author_icon = interaction.message.embeds[0].thumbnail.url
-
-        cog: Optional[RaidReport] = self.bot.get_cog('RaidReport')
-        if not cog:
-            return
-
-        # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-
-        embed = await cog.process_report(report_id, author_icon)
-        await interaction.edit_original_response(embed=embed)
-
-    # noinspection PyUnusedLocal
-    @discord.ui.button(label='Potions', style=discord.ButtonStyle.gray, custom_id='raid_view:potions', emoji='🧪')
-    async def potions(self, interaction: discord.Interaction, button: discord.ui.Button):
-        report_id = self._validate_interaction(interaction)
-        if report_id is None:
-            await self._reply_with_error(interaction)
-            return
-
-        cog: Optional[Potions] = self.bot.get_cog('Potions')
-        if not cog:
-            return
-
-        # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-
-        # Remove potions embed if exists
-        embeds = interaction.message.embeds
-        for item in embeds:
-            if item.title == 'Потная катка':
-                embeds.remove(item)
-                await interaction.message.edit(embeds=embeds)
-                return
-
-        # Add potion embeds if not exists
-        embed = await cog.process_pots(report_id)
-        embeds.append(embed)
-        await interaction.edit_original_response(embeds=embeds)
-
-    # noinspection PyUnusedLocal
-    @discord.ui.button(label='Gear', style=discord.ButtonStyle.gray, custom_id='raid_view:gear', emoji='🛂')
-    async def gear(self, interaction: discord.Interaction, button: discord.ui.Button):
-        report_id = self._validate_interaction(interaction)
-        if report_id is None:
-            await self._reply_with_error(interaction)
-            return
-
-        cog: Optional[Gear] = self.bot.get_cog('Gear')
-        if not cog:
-            return
-
-        # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-
-        # Remove gear embed if exists
-        embeds = interaction.message.embeds
-        for item in embeds:
-            if item.title == 'Камни и зачаровывание':
-                embeds.remove(item)
-                await interaction.message.edit(embeds=embeds)
-                return
-
-        # Add gear embeds if not exists
-        embed = await cog.process_gear(report_id)
-        embeds.append(embed)
-        await interaction.edit_original_response(embeds=embeds)
-
-    # noinspection PyUnusedLocal
-    @discord.ui.button(label='Bombs', style=discord.ButtonStyle.gray, custom_id='raid_view:bombs', emoji='💣')
-    async def bombs(self, interaction: discord.Interaction, button: discord.ui.Button):
-        report_id = self._validate_interaction(interaction)
-        if report_id is None:
-            await self._reply_with_error(interaction)
-            return
-
-        cog: Optional[Bomberman] = self.bot.get_cog('Bomberman')
-        if not cog:
-            return
-
-        # noinspection PyUnresolvedReferences
-        await interaction.response.defer()
-
-        # Remove gear embed if exists
-        embeds = interaction.message.embeds
-        for item in embeds:
-            if item.title == 'Бомбим!':
-                embeds.remove(item)
-                await interaction.message.edit(embeds=embeds)
-                return
-
-        # Add gear embed if not exists
-        embed = await cog.process_bombs(report_id)
-        embeds.append(embed)
-        await interaction.edit_original_response(embeds=embeds)
-
-    @staticmethod
-    def _validate_interaction(interaction: discord.Interaction) -> Optional[str]:
-        if interaction.message is None:
-            return None
-
-        # There should be an embed. Either waiting or report
-        embed: Embed = interaction.message.embeds[0]
-        if not embed:
-            return None
-
-        # Embed should have URL. I hope it is a WCL URL with report ID
-        report_id = embed.url.split('/')[-1]
-        if not report_id:
-            return None
-
-        return report_id
-
-    @staticmethod
-    async def _reply_with_error(interaction: discord.Interaction) -> None:
-        # noinspection PyUnresolvedReferences
-        await interaction.response.send_message(
-            'Embed or URL is missing. Something went wrong. Better call Doc!',
-            ephemeral=True,
-        )
-
-
 class RaidReport(commands.Cog):
     def __init__(self, bot: SlaoBot):
         """Cog to provide basic statistics about raid.
 
         :param bot: Bot instance
         """
         self.bot: SlaoBot = bot
-        self.bot.add_view(RaidView(self.bot))
+        self.bot.add_view(RaidView())
 
     @app_commands.command(description='Отчёт по логу на WCL')
     @app_commands.describe(report_id='WCL report ID')
@@ -166,10 +29,8 @@ async def report(self, interaction: discord.Interaction, report_id: str) -> None
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
 
-        author_icon = 'https://cdn.discordapp.com/icons/620682853709250560/6c53810d8a4e2b75069208a472465694.png'
-
-        embed = await self.process_report(report_id, author_icon)
-        await interaction.edit_original_response(embed=embed, view=RaidView(self.bot))
+        embed = await self.process_interaction(report_id)
+        await interaction.edit_original_response(embed=embed, view=RaidView())
 
     @commands.Cog.listener()
     async def on_message(self, message: Message) -> None:
@@ -191,22 +52,19 @@ async def on_message(self, message: Message) -> None:
 
         # Send interstitial embed to store report_id
         embed = self._make_waiting_embed(report_id, author_icon)
-        waiting_embed = await ctx.send(embed=embed)
+        waiting_message = await ctx.send(embed=embed)
 
-        embed = self.process_report(report_id, author_icon)
+        embed = await self.process_interaction(report_id, author_icon=author_icon)
         if embed is None:
-            await waiting_embed.edit(view=RaidView(self.bot))
+            await waiting_message.edit(view=RaidView())
 
-        await waiting_embed.edit(embed=embed, view=RaidView(self.bot))
+        await waiting_message.edit(embed=embed, view=RaidView())
 
-    async def process_report(self, report_id: str, author_icon: str) -> Optional[discord.Embed]:
+    async def process_interaction(self, report_id: str, **kwargs: Any) -> Optional[discord.Embed]:
         """Process a single report
 
         :param report_id: WarcraftLogs report ID
-        :param author_icon:
         """
-        report_url = f'https://classic.warcraftlogs.com/reports/{report_id}'
-
         async with WCLClient() as client:
             try:
                 rs = await client.get_rankings(report_id)
@@ -221,7 +79,10 @@ async def process_report(self, report_id: str, author_icon: str) -> Optional[dis
         else:
             report_tag = 'No tag'
 
+        report_url = f'https://classic.warcraftlogs.com/reports/{report_id}'
         report_description = Report.make_report_description(rs)
+        author_icon = kwargs.get('author_icon', self.bot.user.avatar.url)
+
         embed = Embed(title=f'{report_title} - {report_tag}',
                       url=report_url,
                       description=report_description,

slao_bot/slaobot.py

@@ -25,6 +25,7 @@ def __init__(self):
             members=True,
             messages=True,
             message_content=True,
+            emojis=True,
         )
         logging.basicConfig(level=logging.WARN)