refactor!: 타이핑 추가

bot.py

@@ -1,27 +1,33 @@
+from __future__ import annotations
+
 import os
-from typing import Any, Optional
+from typing import TYPE_CHECKING
 
-import aiohttp
 import discord
-from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import errors
 from discord.ext.commands.context import Context
 
-GUILD = discord.Object(id=os.getenv("TEST_GUILD_ID"))
+if TYPE_CHECKING:
+    from typing import Any
+
+    from discord import Interaction
+    from typing_extensions import Self
+
+GUILD = discord.Object(id=os.getenv("TEST_GUILD_ID") or "")
 
 
 class WakscordBot(commands.Bot):
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__(
             command_prefix="!",
             intents=discord.Intents.default(),
             allowed_mentions=discord.AllowedMentions.none(),
         )
 
-        self.session: aiohttp.ClientSession = None
+        # self.session: aiohttp.ClientSession = None
 
-    async def setup_hook(self):
+    async def setup_hook(self) -> None:
         await self.load_extension("commands.chat")
         await self.load_extension("commands.etc")
         await self.load_extension("commands.settings")
@@ -35,6 +41,8 @@ async def on_error(self, event_method: str, /, *args: Any, **kwargs: Any) -> Non
         print(event_method, args, kwargs)
         return await super().on_error(event_method, *args, **kwargs)
 
-    async def on_command_error(self, context, exception) -> None:
+    async def on_command_error(
+        self, context: commands.Context[Self], exception: commands.CommandError  # type: ignore[override]
+    ) -> None:
         print(context, exception)
         return await super().on_command_error(context, exception)

commands/chat.py

@@ -1,4 +1,6 @@
-import traceback
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
 
 import aiohttp
 import discord
@@ -7,35 +9,36 @@
 
 from utils import check_manage_permission, fetch_subscribe_info, get_webhook
 
+if TYPE_CHECKING:
+    from discord import Interaction
+
+    from bot import WakscordBot
+
 
 class Chat(commands.Cog):
-    def __init__(self, bot: commands.Bot):
+    def __init__(self, bot: WakscordBot):
         self.bot = bot
-        self.members: list[str] = None
+        self.members: list[str] = []
 
     group = app_commands.Group(name="채팅", description="트위치 채팅 멤버 필터링")
 
-    async def member_autocomplete(self, _: discord.Interaction, input: str):
-        try:
-            if self.members is None:
-                async with aiohttp.ClientSession() as session:
-                    async with session.get(
-                        "https://api.wakscord.xyz/members"
-                    ) as response:
-                        self.members = await response.json()
-
-            return [
-                app_commands.Choice(name=member, value=member)
-                for member in filter(
-                    lambda member: input == "" or input in member, self.members
-                )
-            ][:25]
-        except Exception as e:
-            traceback.print_exc()
+    async def member_autocomplete(
+        self, _: Interaction[WakscordBot], input: str
+    ) -> list[app_commands.Choice[str]]:
+        async with aiohttp.ClientSession() as session:
+            async with session.get("https://api.wakscord.xyz/members") as response:
+                self.members = await response.json()
+
+        return [
+            app_commands.Choice(name=member, value=member)
+            for member in filter(
+                lambda member: input == "" or input in member, self.members
+            )
+        ][:25]
 
     async def edit_subscribe(
         self, webhook: discord.Webhook, streamer: str, member: str, add: bool
-    ):
+    ) -> None:
         subs = await fetch_subscribe_info(webhook)
 
         if add:
@@ -73,10 +76,11 @@ async def edit_subscribe(
         member="왁타버스 멤버",
     )
     async def chat_add_member(
-        self, interaction: discord.Interaction, streamer: str, member: str
-    ):
+        self, interaction: Interaction[WakscordBot], streamer: str, member: str
+    ) -> None:
         """특정 멤버가 입력한 트위치 채팅을 디스코드로 전달 받습니다."""
 
+        assert isinstance(interaction.channel, discord.TextChannel)
         if not await check_manage_permission(interaction):
             return
 
@@ -116,10 +120,11 @@ async def chat_add_member(
         member="왁타버스 멤버",
     )
     async def chat_remove_member(
-        self, interaction: discord.Interaction, streamer: str, member: str
-    ):
+        self, interaction: Interaction[WakscordBot], streamer: str, member: str
+    ) -> None:
         """특정 멤버가 입력한 트위치 채팅을 디스코드로 전달 받지 않습니다."""
 
+        assert isinstance(interaction.channel, discord.TextChannel)
         if not await check_manage_permission(interaction):
             return
 
@@ -139,5 +144,5 @@ async def chat_remove_member(
         )
 
 
-async def setup(bot: commands.Bot):
+async def setup(bot: WakscordBot) -> None:
     await bot.add_cog(Chat(bot))

commands/etc.py

@@ -1,17 +1,25 @@
+from __future__ import annotations
+
 import asyncio
 import random
+from typing import TYPE_CHECKING
 
 import discord
 from discord import app_commands
 from discord.ext import commands
 
+if TYPE_CHECKING:
+    from discord import Interaction
+
+    from bot import WakscordBot
+
 
 class Etc(commands.Cog):
-    def __init__(self, bot: commands.Bot):
+    def __init__(self, bot: WakscordBot):
         self.bot = bot
 
     @app_commands.command(name="저메추")
-    async def refresh(self, interaction: discord.Interaction):
+    async def refresh(self, interaction: Interaction[WakscordBot]) -> None:
         """
         저녁 메뉴를 추천해줍니다.
         """
@@ -24,20 +32,20 @@ async def refresh(self, interaction: discord.Interaction):
     @app_commands.command(name="결정장애")
     @app_commands.describe(option1="첫번째", option2="두번째")
     async def random_choice(
-        self, interaction: discord.Interaction, option1: str, option2: str
-    ):
+        self, interaction: Interaction[WakscordBot], option1: str, option2: str
+    ) -> None:
         """
         두 가지 중 하나를 랜덤으로 골라줍니다.
         """
 
         await interaction.response.defer()
 
-        msg = await interaction.followup.send("두구두구...")
+        msg = await interaction.followup.send("두구두구...")  # type: ignore
 
         await asyncio.sleep(1)
 
-        await msg.edit(content=random.choice([option1, option2]))
+        await msg.edit(content=random.choice([option1, option2]))  # type: ignore
 
 
-async def setup(bot: commands.Bot):
+async def setup(bot: WakscordBot) -> None:
     await bot.add_cog(Etc(bot))