Fix typing errors

Author: CarrotManMatt

cogs/command_error.py

@@ -68,20 +68,31 @@ async def on_application_command_error(
         if isinstance(error, discord.ApplicationCommandInvokeError) and isinstance(
             error.original, GuildDoesNotExistError
         ):
-            command_name: str = (
-                ctx.command.callback.__name__
-                if (
-                    hasattr(ctx.command, "callback")
-                    and not ctx.command.callback.__name__.startswith("_")
+            command_name: str | None = (
+                (
+                    ctx.command.callback.__name__
+                    if (
+                        hasattr(ctx.command, "callback")
+                        and not ctx.command.callback.__name__.startswith("_")
+                    )
+                    else ctx.command.qualified_name
                 )
-                else ctx.command.qualified_name
+                if ctx.command is not None
+                else None
             )
             logger.critical(
                 " ".join(
                     message_part
                     for message_part in (
                         error.original.ERROR_CODE,
-                        f"({command_name})" if command_name in self.ERROR_ACTIVITIES else "",
+                        (
+                            f"({command_name})"
+                            if (
+                                command_name is not None
+                                and command_name in self.ERROR_ACTIVITIES
+                            )
+                            else ""
+                        ),
                         str(error.original).rstrip(".:"),
                     )
                     if message_part

cogs/committee_actions_tracking.py

@@ -556,9 +556,9 @@ async def action_all_committee(
     async def list_user_actions(  # NOTE: Committee role check is not present because non-committee can have actions, and need to be able to list their own actions.
         self,
         ctx: "TeXBotApplicationContext",
-        action_member_id: None | str,
+        action_member_id: "None | str",
         ping: bool,  # noqa: FBT001
-        status: None | str,
+        status: "None | str",
     ) -> None:
         """
         Definition and callback of the "/list" command.

cogs/induct.py

@@ -239,7 +239,9 @@ async def _perform_induction(
                         applicant_role, reason=INDUCT_AUDIT_MESSAGE
                     )
 
-            tex_emoji: discord.Emoji | None = self.bot.get_emoji(743218410409820213)
+            tex_emoji: discord.Emoji | discord.AppEmoji | None = self.bot.get_emoji(
+                743218410409820213
+            )
             if not tex_emoji:
                 tex_emoji = discord.utils.get(main_guild.emojis, name="TeX")
 

cogs/kill.py

@@ -12,7 +12,7 @@
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from logging import Logger
-    from typing import Final
+    from typing import Final, Never
 
     from utils import TeXBotApplicationContext
 
@@ -27,17 +27,17 @@ class ConfirmKillView(View):
     @discord.ui.button(
         label="SHUTDOWN", style=discord.ButtonStyle.red, custom_id="shutdown_confirm"
     )
-    async def confirm_shutdown_button_callback(  # type: ignore[misc]
-        self, _: discord.Button, interaction: discord.Interaction
+    async def confirm_shutdown_button_callback(
+        self, _: "discord.ui.Button[Never]", interaction: discord.Interaction
     ) -> None:
         """When the shutdown button is pressed, delete the message."""
         logger.debug('"Confirm" button pressed. %s', interaction)
 
     @discord.ui.button(
         label="CANCEL", style=discord.ButtonStyle.grey, custom_id="shutdown_cancel"
     )
-    async def cancel_shutdown_button_callback(  # type: ignore[misc]
-        self, _: discord.Button, interaction: discord.Interaction
+    async def cancel_shutdown_button_callback(
+        self, _: "discord.ui.Button[Never]", interaction: discord.Interaction
     ) -> None:
         """When the cancel button is pressed, delete the message."""
         logger.debug('"Cancel" button pressed. %s', interaction)

cogs/make_applicant.py

@@ -62,7 +62,9 @@ async def _perform_make_applicant(
             await applicant_member.add_roles(applicant_role, reason=AUDIT_MESSAGE)
             logger.debug("Applicant role given to user %s", applicant_member)
 
-            tex_emoji: discord.Emoji | None = self.bot.get_emoji(743218410409820213)
+            tex_emoji: discord.Emoji | discord.AppEmoji | None = self.bot.get_emoji(
+                743218410409820213
+            )
             if not tex_emoji:
                 tex_emoji = discord.utils.get(main_guild.emojis, name="TeX")
 

cogs/make_member.py

@@ -109,7 +109,7 @@ async def make_member(
         )
 
         if not re.fullmatch(r"\A\d{7}\Z", raw_group_member_id):
-            await self.command_send_error(ctx, message=(INVALID_GROUP_MEMBER_ID_MESSAGE))
+            await self.command_send_error(ctx, message=INVALID_GROUP_MEMBER_ID_MESSAGE)
             return
 
         try:
@@ -195,6 +195,7 @@ async def make_member(
                         guest_role,
                         reason=f'{ctx.user} used TeX Bot slash-command: "/make-member"',
                     )
+
             applicant_role: discord.Role | None
             try:
                 applicant_role = await ctx.bot.applicant_role

cogs/remind_me.py

@@ -210,6 +210,12 @@ async def remind_me(
 
         The "remind_me" command responds with the given message after the specified time.
         """
+        if ctx.channel is None:
+            CTX_CHANNEL_IS_NONE_MESSAGE: Final[str] = (
+                "Cannot create reminder where `ctx.channel` is `None`."
+            )
+            raise TypeError(CTX_CHANNEL_IS_NONE_MESSAGE)
+
         parsed_time: tuple[time.struct_time, int] = parsedatetime.Calendar().parseDT(
             delay, tzinfo=timezone.get_current_timezone()
         )

cogs/send_introduction_reminders.py

@@ -28,7 +28,7 @@
 if TYPE_CHECKING:
     from collections.abc import Sequence
     from logging import Logger
-    from typing import Final
+    from typing import Final, Never
 
     from utils import TeXBot
 
@@ -231,8 +231,8 @@ async def send_error(
             style=discord.ButtonStyle.red,
             emoji=discord.PartialEmoji.from_str(emoji.emojize(":no_good:", language="alias")),
         )
-        async def opt_out_introduction_reminders_button_callback(  # type: ignore[misc]
-            self, button: discord.Button, interaction: discord.Interaction
+        async def opt_out_introduction_reminders_button_callback(
+            self, button: "discord.ui.Button[Never]", interaction: discord.Interaction
         ) -> None:
             """
             Set the opt-in/out flag depending on the status of the button.

cogs/stats/__init__.py

@@ -86,7 +86,24 @@ async def channel_stats(
         # NOTE: Shortcut accessors are placed at the top of the function so that the exceptions they raise are displayed before any further errors may be sent
         main_guild: discord.Guild = self.bot.main_guild
 
-        channel_id: int = ctx.channel_id
+        match ctx.channel:
+            case None:
+                CTX_CHANNEL_IS_NONE_MESSAGE: Final[str] = (
+                    "Cannot send stats graph when `ctx.channel` is `None`."
+                )
+                raise TypeError(CTX_CHANNEL_IS_NONE_MESSAGE)
+            case discord.ForumChannel() | discord.CategoryChannel():
+                await self.command_send_error(
+                    ctx,
+                    message=(
+                        f"The `/{ctx.command}` command cannot be used in the channel: {
+                            ctx.channel.mention
+                        }"
+                    ),
+                )
+                return
+
+        channel_id: int | None = ctx.channel_id
 
         if str_channel_id:
             if not re.fullmatch(r"\A\d{17,20}\Z", str_channel_id):
@@ -97,6 +114,12 @@ async def channel_stats(
 
             channel_id = int(str_channel_id)
 
+        if channel_id is None:
+            CTX_CHANNEL_ID_IS_NONE_MESSAGE: Final[str] = (
+                "Cannot produce stats graph when `ctx.channel_id` is `None`."
+            )
+            raise TypeError(CTX_CHANNEL_ID_IS_NONE_MESSAGE)
+
         channel: discord.TextChannel | None = discord.utils.get(
             main_guild.text_channels, id=channel_id
         )
@@ -157,6 +180,23 @@ async def server_stats(self, ctx: "TeXBotApplicationContext") -> None:
         main_guild: discord.Guild = self.bot.main_guild
         guest_role: discord.Role = await self.bot.guest_role
 
+        match ctx.channel:
+            case None:
+                CTX_CHANNEL_IS_NONE_MESSAGE: Final[str] = (
+                    "Cannot send stats graph when `ctx.channel` is `None`."
+                )
+                raise TypeError(CTX_CHANNEL_IS_NONE_MESSAGE)
+            case discord.ForumChannel() | discord.CategoryChannel():
+                await self.command_send_error(
+                    ctx,
+                    message=(
+                        f"The `/{ctx.command}` command cannot be used in the channel: {
+                            ctx.channel.mention
+                        }"
+                    ),
+                )
+                return
+
         await ctx.defer(ephemeral=True)
 
         message_counts: Mapping[str, Mapping[str, int]] = await get_server_message_counts(
@@ -248,6 +288,23 @@ async def user_stats(self, ctx: "TeXBotApplicationContext") -> None:
             )
             return
 
+        match ctx.channel:
+            case None:
+                CTX_CHANNEL_IS_NONE_MESSAGE: Final[str] = (
+                    "Cannot send stats graph when `ctx.channel` is `None`."
+                )
+                raise TypeError(CTX_CHANNEL_IS_NONE_MESSAGE)
+            case discord.ForumChannel() | discord.CategoryChannel():
+                await self.command_send_error(
+                    ctx,
+                    message=(
+                        f"The `/{ctx.command}` command cannot be used in the channel: {
+                            ctx.channel.mention
+                        }"
+                    ),
+                )
+                return
+
         await ctx.defer(ephemeral=True)
 
         message_counts: dict[str, int] = {"Total": 0}
@@ -314,6 +371,23 @@ async def left_member_stats(self, ctx: "TeXBotApplicationContext") -> None:
         # NOTE: Shortcut accessors are placed at the top of the function so that the exceptions they raise are displayed before any further errors may be sent
         main_guild: discord.Guild = self.bot.main_guild
 
+        match ctx.channel:
+            case None:
+                CTX_CHANNEL_IS_NONE_MESSAGE: Final[str] = (
+                    "Cannot send stats graph when `ctx.channel` is `None`."
+                )
+                raise TypeError(CTX_CHANNEL_IS_NONE_MESSAGE)
+            case discord.ForumChannel() | discord.CategoryChannel():
+                await self.command_send_error(
+                    ctx,
+                    message=(
+                        f"The `/{ctx.command}` command cannot be used in the channel: {
+                            ctx.channel.mention
+                        }"
+                    ),
+                )
+                return
+
         await ctx.defer(ephemeral=True)
 
         left_member_counts: dict[str, int] = {