fix new mypy issues

Author: EntchenEric

commands/utility/schedulemessage.py

@@ -63,7 +63,7 @@ async def schedule_message(
         if (
             commandInfo.guild is not None
             and repeat
-            and isinstance(commandInfo.user, discord.Member)
+            and isinstance(commandInfo.user, discord.Member) # type: ignore[redundant-expr]
             and isinstance(commandInfo.channel, discord.abc.GuildChannel)
             and not commandInfo.channel.permissions_for(commandInfo.user).manage_messages
         ):
@@ -110,7 +110,7 @@ async def schedule_message(
 
     else:
         dmChannel = await commandInfo.user.create_dm()
-        if not dmChannel:
+        if dmChannel is None:
             embed = utility.tanjunEmbed(
                 title=tanjunLocalizer.localize(
                     commandInfo.locale,
@@ -140,7 +140,7 @@ async def schedule_message(
     if (
         channel
         and commandInfo.guild is not None
-        and isinstance(commandInfo.user, discord.Member)
+        and isinstance(commandInfo.user, discord.Member) # type: ignore[redundant-expr]
         and isinstance(commandInfo.channel, discord.abc.GuildChannel)
         and not commandInfo.channel.permissions_for(commandInfo.user).manage_messages
     ):

commands/utility/setupBoosterChannel.py

@@ -21,7 +21,7 @@ async def setupBoosterChannel(commandInfo: commandInfo, category: discord.Catego
         await commandInfo.reply(embed=embed)
         return
 
-    if isinstance(commandInfo.user, discord.Member) and not commandInfo.user.guild_permissions.administrator:
+    if not getattr(commandInfo.user, "guild_permissions", None) or not commandInfo.user.guild_permissions.administrator:  # type: ignore[union-attr]
         embed = utility.tanjunEmbed(
             title=tanjunLocalizer.localize(
                 commandInfo.locale,

commands/utility/setupBoosterRole.py

@@ -21,7 +21,7 @@ async def setupBoosterRole(commandInfo: commandInfo, role: discord.Role) -> None
         await commandInfo.reply(embed=embed)
         return
 
-    if isinstance(commandInfo.user, discord.Member) and not commandInfo.user.guild_permissions.administrator:
+    if not getattr(commandInfo.user, "guild_permissions", None) or not commandInfo.user.guild_permissions.administrator:  # type: ignore[union-attr]
         embed = utility.tanjunEmbed(
             title=tanjunLocalizer.localize(
                 commandInfo.locale,

localizer.py

@@ -20,8 +20,8 @@ def load_translations(self, locale: str) -> list[dict[str, object]]:
         except FileNotFoundError:
             try:
                 with open("locales/en.json", encoding="utf-8") as file:
-                    data: object = json.load(file)
-                    return cast(list[dict[str, object]], data)
+                    fallback_data: object = json.load(file)
+                    return cast(list[dict[str, object]], fallback_data)
             except (FileNotFoundError, json.JSONDecodeError):
                 return []
         except json.JSONDecodeError:
@@ -31,7 +31,7 @@ def load_translations(self, locale: str) -> list[dict[str, object]]:
     def get_translation(self, translations: list[dict[str, object]], key: str) -> dict[str, object] | None:
         """Retrieve a nested translation using dot notation for nested keys."""
         translation: dict[str, object] | None = next(
-            (t for t in translations if isinstance(t, dict) and str(t.get("identifier", "")).lower() == key.lower()),
+            (t for t in translations if str(t.get("identifier", "")).lower() == key.lower()),
             None,
         )
 

minigames/addLevelXp.py

@@ -22,7 +22,7 @@
 from localizer import tanjunLocalizer
 from utility import get_level_for_xp  # , checkIfHasPro
 
-notifiedUsers = []
+notifiedUsers: list[int] = []
 
 
 async def addLevelXp(message: discord.Message) -> None:

minigames/wordchain.py

@@ -46,7 +46,7 @@ async def wordchain(message: discord.Message) -> None:
         await message.delete()
         return
 
-    if await get_wordchain_last_user_id(message.channel.id) == message.author.id:
+    if str(await get_wordchain_last_user_id(message.channel.id)) == str(message.author.id):
         await message.delete()
         return
 

mypy_reports.txt

@@ -26,7 +26,7 @@ async def translate(
         self,
         string: app_commands.locale_str,
         locale: discord.Locale,
-        context: app_commands.TranslationContext,
+        context: app_commands.TranslationContext[Any, Any], # type: ignore[type-arg]
     ) -> str | None:
         if str(locale.value) not in ["de", "de-DE", "en", "en-US", "en-GB"]:
             return None

translator.py

@@ -182,7 +182,7 @@ def __init__(
             self.timestamp = timestamp
 
     @classmethod
-    def from_dict(cls, data: Mapping[str, Any]) -> Self:
+    def from_dict(cls, data: "Mapping[str, Any]") -> "tanjunEmbed":
         self = cls.__new__(cls)
 
         self.title = None
@@ -276,11 +276,11 @@ def __eq__(self, other: object) -> bool:
         return self.to_dict() == other.to_dict()
 
     @property
-    def colour(self) -> discord.Colour | None:
+    def colour(self) -> discord.Colour | None:  # type: ignore[override]
         return getattr(self, "_colour", None)
 
     @colour.setter
-    def colour(self, value: int | discord.Colour | None) -> None:
+    def colour(self, value: int | discord.Colour | None) -> None:  # type: ignore[override]
         if value is None:
             self._colour = None
         elif isinstance(value, discord.Colour):
@@ -289,11 +289,11 @@ def colour(self, value: int | discord.Colour | None) -> None:
             self._colour = discord.Colour(value=value)
 
     @property
-    def color(self) -> discord.Colour | None:
+    def color(self) -> discord.Colour | None:  # type: ignore[override]
         return self.colour
 
     @color.setter
-    def color(self, value: int | discord.Colour | None) -> None:
+    def color(self, value: int | discord.Colour | None) -> None:  # type: ignore[override]
         self.colour = value
 
     @property
@@ -416,7 +416,7 @@ def set_field_at(self, index: int, *, name: object, value: object, inline: bool
             raise IndexError("field index out of range")
         return self
 
-    def to_dict(self) -> dict[str, Any]:
+    def to_dict(self) -> dict[str, Any]:  # type: ignore[override]
         result: dict[str, object] = {}
         for key in self.__slots__:
             if key.startswith("_") and hasattr(self, key):
@@ -826,7 +826,7 @@ def eval_(node: ast.AST, variables: VariablesType) -> float | int | complex:
             raise TypeError(f"'{func_id_str}' is not a callable function.")
         args = [eval_(arg, variables) for arg in node.args]
         try:
-            return func_to_call(*args)
+            return cast(float | int | complex, func_to_call(*args))
         except TypeError as e:
             raise TypeError(f"Error calling function '{getattr(func_to_call, '__name__', func_id_str)}': {e}")
     elif isinstance(node, ast.Name):
@@ -858,14 +858,15 @@ def get_xp_for_level(level: int, scaling: str, custom_formula: str | None = None
         print(f"Warning: Unknown XP scaling '{scaling}'. Using 'medium'.")
         result = LEVEL_SCALINGS["medium"](level)
 
-    if isinstance(result, complex):
+    if type(result) is complex:  # type: ignore[redundant-expr]
         print(f"Warning: Custom XP formula resulted in a complex number ({result}). Using real part or 0.")
         return math.floor(result.real) if result.real is not None else 0
     elif isinstance(result, (float, int)):
         if math.isinf(result) or math.isnan(result):
             print(f"Warning: XP calculation resulted in {result}. Returning 0.")
             return 0
         return math.floor(result)
+    return 0
 
 
 def get_level_for_xp(xp: int, scaling: str, custom_formula: str | None = None) -> int:
@@ -1057,11 +1058,11 @@ def __init__(
 
     @property
     def guild(self) -> discord.Guild | None:
-        return self._mock_guild
+        return cast(discord.Guild | None, self._mock_guild)
 
     @property
     def channel(self) -> discord.abc.MessageableChannel | None:
-        return self._mock_channel
+        return cast(discord.abc.MessageableChannel | None, self._mock_channel)
 
     async def original_response(self) -> discord.Message:
         if hasattr(self.response, "message") and self.response.message:
@@ -1112,7 +1113,7 @@ async def send_message(
 
         channel = self.interaction._mock_channel
         if channel and hasattr(self.interaction, "_state"):
-            self.message = discord.Message(state=self.interaction._state, channel=channel, data=message_data)
+            self.message = discord.Message(state=self.interaction._state, channel=cast(Any, channel), data=message_data) # type: ignore[arg-type]
         else:
             self.message = None
         self.interaction._response_issued = True
@@ -1154,7 +1155,7 @@ async def send(
             mock_channel = self._state.Client.get_channel(0)
 
         # Use type ignore since we're mocking discord.Message creation
-        return discord.Message(state=self._state, channel=mock_channel, data=message_data)
+        return discord.Message(state=self._state, channel=cast(Any, mock_channel), data=message_data) # type: ignore[arg-type]
 
     async def edit_message(self, message_id: int, **kwargs: Any) -> discord.Message:
         raise NotImplementedError
@@ -1174,10 +1175,10 @@ def create_mock_interaction(bot_instance: InteractionClient) -> MockInteraction:
         A MockInteraction instance
     """
     # Create mock guild and channel objects that match the protocol
-    mock_guild = type("MockGuild", (), {"id": 12345, "name": "Mock Guild"})() if bot_instance is not None else None
-    mock_channel = type("MockChannel", (), {"id": 67890})() if bot_instance is not None else None
+    mock_guild = type("MockGuild", (), {"id": 12345, "name": "Mock Guild"})()
+    mock_channel = type("MockChannel", (), {"id": 67890})()
 
-    if bot_instance is None or bot_instance.user is None:
+    if bot_instance.user is None:
         raise ValueError("Bot instance or bot user is not valid.")
 
     # Create a mock user that matches the protocol