Slashcommands (#22)

* More slash commands
* Fix flake
* Finish with slashcommands
* Fix isort, I hope

Author: drcrazy

slao_bot/cogs/bomberman.py

@@ -1,10 +1,10 @@
 from collections import defaultdict
-from typing import Dict
+from typing import Dict, Optional
 
+import discord
 import tenacity
-from discord import Colour, Embed
+from discord import Colour, Embed, app_commands
 from discord.ext import commands
-from discord.ext.commands import Context
 from utils.wcl_client import WCLClient
 
 
@@ -14,27 +14,28 @@ class Bomberman(commands.Cog):
     _bomb_damage: Dict[str, int]
     _other_damage: Dict[str, int]
 
-    def __init__(self, bot):
-        """Cog to check potions used during a raid.
-
-        :param bot:
-        """
-        self.bot = bot
+    def __init__(self):
+        """Cog to check potions used during a raid."""
         self._engineers = defaultdict()
         self._bomb_damage = defaultdict()
         self._other_damage = defaultdict()
 
-    @commands.command(name='bomb')
-    async def bomb_command(self, ctx: Context, report_id: str) -> None:
-        """Get data about bombs and bombs-like items used. Format: <prefix>bomb SOME_REPORT_ID."""
-        await self.process_bombs(ctx, report_id)
+    @app_commands.command(description='Использование гранат и схожих расходников')
+    @app_commands.describe(report_id='WCL report ID')
+    async def engineers(self, interaction: discord.Interaction, report_id: str) -> None:
+        """Get data about bombs and bombs-like items used."""
+        # noinspection PyUnresolvedReferences
+        await interaction.response.defer()
+
+        embed = await self.process_bombs(report_id)
+        await interaction.edit_original_response(embed=embed)
 
-    async def process_bombs(self, ctx: Context, report_id: str) -> None:
+    async def process_bombs(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_bombs(report_id)
             except tenacity.RetryError:
-                return
+                return None
 
         self.make_engineers(rs['reportData']['report']['engineers']['data']['entries'])
         self._bomb_damage = self.calculate_damage(rs['reportData']['report']['bombs']['data']['entries'])
@@ -60,12 +61,7 @@ async def process_bombs(self, ctx: Context, report_id: str) -> None:
         self._bomb_damage.clear()
         self._other_damage.clear()
 
-        if ctx.message.author != self.bot.user:
-            await ctx.send(embed=embed)
-        else:
-            embeds = ctx.message.embeds
-            embeds.append(embed)
-            await ctx.message.edit(embeds=embeds)
+        return embed
 
     def calculate_damage(self, entries: Dict) -> Dict:
         damage = {}
@@ -141,4 +137,4 @@ def _add_damage(raider: Dict, result: Dict) -> Dict:
 
 
 async def setup(bot):
-    await bot.add_cog(Bomberman(bot))
+    await bot.add_cog(Bomberman())

slao_bot/cogs/gear.py

@@ -3,10 +3,11 @@
 from itertools import chain
 from typing import Any, Dict, Iterable, List, Optional, Set
 
+import discord
 import tenacity
-from discord import Colour, Embed
+from discord import Colour, Embed, app_commands
 from discord.ext import commands
-from discord.ext.commands import Context
+from slaobot import SlaoBot
 from utils import enchants
 from utils.constants import SLOT_NAMES, Role
 from utils.models import Raider
@@ -74,19 +75,18 @@ def _check_enchants(self, raider_name: str, item: Dict) -> None:
 
 
 class Gear(commands.Cog):
-    def __init__(self, bot: commands.Bot):
-        """Cog to check gems and enchants.
 
-        :param bot: Bot instance
-        """
-        self.bot = bot
+    @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()
 
-    @commands.command(name='gear')
-    async def gear_command(self, ctx: Context, report_id: str) -> None:
-        """Get data about potions used. Format: <prefix>gear SOME_REPORT_ID."""
-        await self.process_gear(ctx, report_id)
+        embed = await self.process_gear(report_id)
+        await interaction.edit_original_response(embed=embed)
 
-    async def process_gear(self, ctx: Context, report_id: str) -> None:
+    async def process_gear(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_table_summary(report_id)
@@ -128,12 +128,7 @@ async def process_gear(self, ctx: Context, report_id: str) -> None:
             inline=False,
         )
 
-        if ctx.message.author != self.bot.user:
-            await ctx.send(embed=embed)
-        else:
-            embeds = ctx.message.embeds
-            embeds.append(embed)
-            await ctx.message.edit(embeds=embeds)
+        return embed
 
     @staticmethod
     def _print_raiders(gear_issues: Dict[str, Set]) -> Optional[str]:
@@ -171,5 +166,5 @@ def _make_raiders(rs: Dict[str, Any]) -> Dict[Role, List[Raider]]:
         return raiders_by_role
 
 
-async def setup(bot: commands.Bot) -> None:
-    await bot.add_cog(Gear(bot))
+async def setup(bot: SlaoBot) -> None:
+    await bot.add_cog(Gear())

slao_bot/cogs/potions.py

@@ -1,11 +1,12 @@
 from collections import defaultdict
 from dataclasses import dataclass, field
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
+import discord
 import tenacity
-from discord import Colour, Embed
+from discord import Colour, Embed, app_commands
 from discord.ext import commands
-from discord.ext.commands import Context
+from slaobot import SlaoBot
 from utils.constants import POT_IMAGES
 from utils.wcl_client import WCLClient
 
@@ -73,29 +74,18 @@ def calculate_total(self) -> None:
 
 
 class Potions(commands.Cog):
-    def __init__(self, bot):
-        """Cog to check potions used during a raid.
 
-        :param bot:
-        """
-        self.bot = bot
+    @app_commands.command(description='Использование зелий и иже с ними')
+    @app_commands.describe(report_id='WCL report ID')
+    async def potions(self, interaction: discord.Interaction, report_id: str) -> None:
+        """Get data about potions used. """
+        # noinspection PyUnresolvedReferences
+        await interaction.response.defer()
 
-    @staticmethod
-    def raiders_by_id(rs: Dict[str, Any]) -> Dict[int, str]:
-        raiders = rs['reportData']['report']['table']['data']['composition']
-        result = defaultdict()
-
-        for raider in raiders:
-            result[raider['id']] = raider['name']
-
-        return result
-
-    @commands.command(name='pot')
-    async def pot_command(self, ctx: Context, report_id: str) -> None:
-        """Get data about potions used. Format: <prefix>pot SOME_REPORT_ID."""
-        await self.process_pots(ctx, report_id)
+        embed = await self.process_pots(report_id)
+        await interaction.edit_original_response(embed=embed)
 
-    async def process_pots(self, ctx: Context, report_id: str) -> None:
+    async def process_pots(self, report_id: str) -> Optional[discord.Embed]:
         async with WCLClient() as client:
             try:
                 rs = await client.get_pots(report_id)
@@ -104,7 +94,7 @@ async def process_pots(self, ctx: Context, report_id: str) -> None:
             except tenacity.RetryError:
                 return
 
-        raiders_by_id = self.raiders_by_id(table_summary)
+        raiders_by_id = self._raiders_by_id(table_summary)
 
         consumables = RaidConsumables()
         consumables.clear_data()
@@ -132,12 +122,17 @@ async def process_pots(self, ctx: Context, report_id: str) -> None:
                         value=self._print_pot_total(consumables.combat_total),
                         inline=False)
 
-        if ctx.message.author != self.bot.user:
-            await ctx.send(embed=embed)
-        else:
-            embeds = ctx.message.embeds
-            embeds.append(embed)
-            await ctx.message.edit(embeds=embeds)
+        return embed
+
+    @staticmethod
+    def _raiders_by_id(rs: Dict[str, Any]) -> Dict[int, str]:
+        raiders = rs['reportData']['report']['table']['data']['composition']
+        result = defaultdict()
+
+        for raider in raiders:
+            result[raider['id']] = raider['name']
+
+        return result
 
     @staticmethod
     def _print_pot_usage(entries: Dict[str, int]) -> str:
@@ -164,5 +159,5 @@ def _print_pot_total(entries: Dict[str, List]) -> str:
         return result if len(result) > 0 else 'Вагонимся'
 
 
-async def setup(bot):
-    await bot.add_cog(Potions(bot))
+async def setup(bot: SlaoBot):
+    await bot.add_cog(Potions())