Update ruff hook and fix pyright checks

Author: Taaku18

.pre-commit-config.yaml

@@ -34,7 +34,7 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.14.10
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [ --fix ]
       - id: ruff-format
 

modmail/backends/mongodb/client.py

@@ -71,7 +71,7 @@ def __init__(self, config: Config) -> None:
         """
         super().__init__(config)
         self.db_name = self._mongodb_config.database
-        self._client: AsyncMongoClient | None = None
+        self._client: AsyncMongoClient[dict[str, Any]] | None = None
 
         # the loaded settings model from the database
         self.__settings_document: MongoDBSettingsDocument | None = None
@@ -634,7 +634,7 @@ async def close_thread(
         # Update the thread status and set closer information
         thread_document.status = thread_status
         thread_document.closed_at = datetime.datetime.now(tz=datetime.UTC)
-        thread_document.closed_by = closer_document
+        thread_document.closed_by = closer_document  # pyright: ignore [reportAttributeAccessIssue]  # not sure why beanie expects a Link[] here
 
         # Save the updated thread document
         # noinspection PyArgumentList

modmail/cogs/utility/commands/profile.py

@@ -11,7 +11,7 @@
 
 import logging
 import re
-from typing import TYPE_CHECKING, Any, Final, NamedTuple
+from typing import TYPE_CHECKING, Any, Final, NamedTuple, cast
 
 import discord
 from discord.ext import commands
@@ -25,7 +25,7 @@
     from .. import Utility
 
     # A "stub" for type hinting
-    class ProfileCustomizeView(discord.ui.View):
+    class _ProfileCustomizeView(discord.ui.View):
         _original_message: discord.Message | None
 
         def set_original_message(self, message: discord.Message) -> None: ...
@@ -106,7 +106,7 @@ def _check_is_bot(user_or_role: discord.Member | discord.User | discord.Role) ->
 
 async def make_profile_customize_view(
     cog: Utility, ctx: commands.Context[Bot], profile_detail: ProfileDetail, profile: ProfileModel
-) -> type[ProfileCustomizeView]:
+) -> type[_ProfileCustomizeView]:
     """Create a UI view for customizing profiles.
 
     Args:
@@ -308,6 +308,10 @@ async def customize_button(
             """Open the modal for profile customization."""
             await interaction.response.send_modal(ProfileCustomizeModal())
 
+    if TYPE_CHECKING:
+        # This is quite ugly, but until Protocol intersection is supported we have to do this
+        ProfileCustomizeView = cast(type[_ProfileCustomizeView], ProfileCustomizeView)  # noqa: N806
+
     return ProfileCustomizeView
 
 

modmail/config/models/bot_model.py

@@ -133,7 +133,7 @@ def check_jishaku_installed(cls, v: bool) -> bool:
         """
         if v:
             try:
-                import jishaku  # pyright: ignore [reportUnusedImport, reportMissingImports]  # noqa: F401
+                import jishaku  # pyright: ignore  # noqa: F401
             except ImportError:
                 logger.error("Jishaku is not installed, but is enabled in configs.")
                 return False

modmail/config/models/logging_model.py

@@ -41,7 +41,7 @@ class LoggingConfig(BaseModel):
     console_level: int = logging.INFO
     logfile_level: int = logging.DEBUG
     stdout_format: str = "%(message)s"
-    logfile: str | None = Field("logs/modmail.log", validate_default=True)
+    logfile: str | None = Field(default="logs/modmail.log", validate_default=True)
     logfile_format: str = "%(asctime)s %(levelname)s %(name)s:%(lineno)d %(message)s"
     logfile_max_size: NonNegativeInt = 1024 * 1024 * 10  # 10 MB
     logfile_backup_count: NonNegativeInt = 3

modmail/core/bot.py

@@ -471,7 +471,7 @@ async def clear_bot_presence(self) -> None:
         await self.database_client.update_settings(activity=None, status=None)
         await self.set_bot_presence()
 
-    async def on_command_error(self, context: commands.Context[Bot], exception: commands.CommandError, /) -> None:
+    async def on_command_error(self, context: commands.Context[Any], exception: commands.CommandError, /) -> None:
         """Handle command execution errors.
 
         Ignores CommandNotFound and CheckFailure errors, passes others to parent handler.

modmail/core/internals/command.py

@@ -58,7 +58,7 @@ def __init__(self, func: T, args: Any, kwargs: Any) -> None:
             args: Positional arguments for the command constructor.
             kwargs: Keyword arguments for the command constructor.
         """
-        self.base_func: Callable[..., Callable[[T], HcHg]] = staticmethod(commands.hybrid_command)
+        self.base_func: Callable[..., Callable[[T], HcHg]] = commands.hybrid_command
         self.callback = func
         self.args = args
         self.kwargs = kwargs
@@ -140,7 +140,7 @@ def __init__(self, func: T, args: Any, kwargs: Any) -> None:
             kwargs: Keyword arguments for the group command constructor.
         """
         super().__init__(func, args, kwargs)
-        self.base_func: Callable[..., Callable[[T], HcHg]] = staticmethod(commands.hybrid_group)
+        self.base_func: Callable[..., Callable[[T], HcHg]] = commands.hybrid_group
         self.children: list[LazyHybridCommand[Any]] = []
 
     def get_commands(self, cog_name: str) -> dict[str, HcHg]:

modmail/core/internals/thread_view.py

@@ -185,7 +185,7 @@ async def send_initial_staff_message(self) -> None:
 
         embed_proxies.sort(key=lambda x: x[0])  # Sort by recipient name
         embeds = await asyncio.gather(*[
-            embed.to_embed(self.bot.translator, CONFIG.default_locale) for x, embed in embed_proxies
+            embed.to_embed(self.bot.translator, CONFIG.default_locale) for _x, embed in embed_proxies
         ])
 
         # Set the timestamp for the first embed