Merge main into 479-auto-slow-mode

Author: automatic-pr-updater[bot]

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/everest.py

@@ -93,10 +93,10 @@ async def autocomplete_get_course_years(
         name="course-type",
         description="The type of your university course.",
         input_type=str,
-        choices=(  # NOTE: Display name is stored in the enum's value.
+        choices={  # NOTE: Display name is stored in the enum's value.
             discord.OptionChoice(name=course_type.value, value=course_type.name)
             for course_type in _CourseTypes
-        ),
+        },
         required=True,
         parameter_name="raw_course_type",
     )
@@ -113,10 +113,10 @@ async def autocomplete_get_course_years(
         description="The percentage of the module that the assignment is worth.",
         input_type=float,
         autocomplete=discord.utils.basic_autocomplete(  # NOTE: Pycord documents that they accept any iterable, testing shows that they only accept lists (generators do not work correctly).
-            [
+            {
                 discord.OptionChoice(name=f"{percentage * 5:.1f}%", value=percentage * 5)
                 for percentage in range(1, 21)
-            ]
+            }
         ),
         required=True,
         parameter_name="percentage_of_module",

config.py

@@ -6,14 +6,14 @@
 """
 
 import abc
+import datetime
 import functools
 import importlib
 import json
 import logging
 import os
 import re
 from collections.abc import Iterable, Mapping
-from datetime import timedelta
 from pathlib import Path
 from typing import TYPE_CHECKING, final
 
@@ -570,7 +570,7 @@ def _setup_auto_su_platform_access_cookie_checking_interval(cls) -> None:
         }
 
         if (
-            timedelta(
+            datetime.timedelta(
                 **raw_timedelta_auto_su_platform_access_cookie_checking_interval
             ).total_seconds()
             <= 3
@@ -624,7 +624,9 @@ def _setup_send_introduction_reminders_delay(cls) -> None:
             .replace(" ", ""),
         )
 
-        raw_timedelta_send_introduction_reminders_delay: timedelta = timedelta()
+        raw_timedelta_send_introduction_reminders_delay: datetime.timedelta = (
+            datetime.timedelta()
+        )
 
         if cls._settings["SEND_INTRODUCTION_REMINDERS"]:
             if not raw_send_introduction_reminders_delay:
@@ -636,15 +638,15 @@ def _setup_send_introduction_reminders_delay(cls) -> None:
                     INVALID_SEND_INTRODUCTION_REMINDERS_DELAY_MESSAGE
                 )
 
-            raw_timedelta_send_introduction_reminders_delay = timedelta(
+            raw_timedelta_send_introduction_reminders_delay = datetime.timedelta(
                 **{
                     key: float(value)
                     for key, value in raw_send_introduction_reminders_delay.groupdict().items()
                     if value
                 }
             )
 
-            if raw_timedelta_send_introduction_reminders_delay < timedelta(days=1):
+            if raw_timedelta_send_introduction_reminders_delay < datetime.timedelta(days=1):
                 TOO_SMALL_SEND_INTRODUCTION_REMINDERS_DELAY_MESSAGE: Final[str] = (
                     "SEND_INTRODUCTION_REMINDERS_DELAY must be longer than or equal to 1 day."
                 )
@@ -694,7 +696,7 @@ def _setup_send_introduction_reminders_interval(cls) -> None:
             }
 
             if (
-                timedelta(
+                datetime.timedelta(
                     **raw_timedelta_details_send_introduction_reminders_interval
                 ).total_seconds()
                 <= 3
@@ -741,7 +743,7 @@ def _setup_send_get_roles_reminders_delay(cls) -> None:
             .replace(" ", ""),
         )
 
-        raw_timedelta_send_get_roles_reminders_delay: timedelta = timedelta()
+        raw_timedelta_send_get_roles_reminders_delay: datetime.timedelta = datetime.timedelta()
 
         if cls._settings["SEND_GET_ROLES_REMINDERS"]:
             if not raw_send_get_roles_reminders_delay:
@@ -751,15 +753,15 @@ def _setup_send_get_roles_reminders_delay(cls) -> None:
                 )
                 raise ImproperlyConfiguredError(INVALID_SEND_GET_ROLES_REMINDERS_DELAY_MESSAGE)
 
-            raw_timedelta_send_get_roles_reminders_delay = timedelta(
+            raw_timedelta_send_get_roles_reminders_delay = datetime.timedelta(
                 **{
                     key: float(value)
                     for key, value in raw_send_get_roles_reminders_delay.groupdict().items()
                     if value
                 }
             )
 
-            if raw_timedelta_send_get_roles_reminders_delay < timedelta(days=1):
+            if raw_timedelta_send_get_roles_reminders_delay < datetime.timedelta(days=1):
                 TOO_SMALL_SEND_GET_ROLES_REMINDERS_DELAY_MESSAGE: Final[str] = (
                     "SEND_GET_ROLES_REMINDERS_DELAY must be longer than or equal to 1 day."
                 )
@@ -831,7 +833,7 @@ def _setup_statistics_days(cls) -> None:
             )
             raise ImproperlyConfiguredError(TOO_SMALL_STATISTICS_DAYS_MESSAGE)
 
-        cls._settings["STATISTICS_DAYS"] = timedelta(days=raw_statistics_days)
+        cls._settings["STATISTICS_DAYS"] = datetime.timedelta(days=raw_statistics_days)
 
     @classmethod
     def _setup_statistics_roles(cls) -> None:

main.py

@@ -24,11 +24,8 @@
 with SuppressTraceback():
     config.run_setup()
 
-    intents: discord.Intents = discord.Intents.default()
-    intents.members = True
-
     bot: TeXBot = TeXBot(
-        intents=intents
+        intents=discord.Intents.default() | discord.Intents.members
     )  # NOTE: See https://github.com/CSSUoB/TeX-Bot-Py-V2/issues/261
 
     bot.load_extension("cogs")
@@ -37,10 +34,7 @@
 def _run_bot() -> "NoReturn":  # NOTE: See https://github.com/CSSUoB/TeX-Bot-Py-V2/issues/261
     bot.run(settings["DISCORD_BOT_TOKEN"])
 
-    if bot.EXIT_WAS_DUE_TO_KILL_COMMAND:
-        raise SystemExit(0)
-
-    raise SystemExit(1)
+    raise SystemExit(0 if bot.EXIT_WAS_DUE_TO_KILL_COMMAND else 1)
 
 
 if __name__ == "__main__":

pyproject.toml

@@ -170,7 +170,7 @@ banned-aliases = { "regex" = [
 ], "matplotlib.pyplot" = [
     "plt",
 ] }
-banned-from = ["abc", "re", "regex"]
+banned-from = ["abc", "date", "datetime", "re", "regex"]
 
 [tool.ruff.lint.flake8-self]
 extend-ignore-names = ["_base_manager", "_default_manager", "_get_wrap_line_width", "_meta"]

stubs/discord/commands/options.pyi

@@ -1,4 +1,5 @@
-from collections.abc import Awaitable, Callable, Iterable, Sequence
+from collections.abc import Awaitable, Callable, Sequence
+from collections.abc import Set as AbstractSet
 from typing import overload, override
 
 from discord.commands.context import AutocompleteContext
@@ -19,15 +20,18 @@ def option[**P, **Q, T, T_context: AutocompleteContext](
     input_type: type[T],
     required: bool = ...,
     default: T = ...,
-    choices: Iterable[OptionChoice] | Iterable[str] | Iterable[int] | Iterable[float] = ...,
+    choices: AbstractSet[OptionChoice]
+    | AbstractSet[str]
+    | AbstractSet[int]
+    | AbstractSet[float] = ...,
     parameter_name: str = ...,
     autocomplete: Callable[
         [T_context],
-        Awaitable[Iterable[OptionChoice] | Iterable[str]],
+        Awaitable[AbstractSet[OptionChoice] | AbstractSet[str]],
     ]
     | Callable[
         [T_context],
-        Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int]],
+        Awaitable[AbstractSet[OptionChoice] | AbstractSet[str] | AbstractSet[int]],
     ] = ...,
 ) -> Callable[[Callable[P, Awaitable[None]]], Callable[Q, Awaitable[None]]]: ...
 @overload
@@ -38,14 +42,17 @@ def option[**P, **Q, T_context: AutocompleteContext](
     input_type: type[str],
     parameter_name: str = ...,
     default: str = ...,
-    choices: Iterable[OptionChoice] | Iterable[str] | Iterable[int] | Iterable[float] = ...,
+    choices: AbstractSet[OptionChoice]
+    | AbstractSet[str]
+    | AbstractSet[int]
+    | AbstractSet[float] = ...,
     autocomplete: Callable[
         [T_context],
-        Awaitable[Iterable[OptionChoice] | Iterable[str]],
+        Awaitable[AbstractSet[OptionChoice] | AbstractSet[str]],
     ]
     | Callable[
         [T_context],
-        Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int]],
+        Awaitable[AbstractSet[OptionChoice] | AbstractSet[str] | AbstractSet[int]],
     ] = ...,
     required: bool = ...,
     min_length: int = ...,

stubs/discord/utils.pyi

@@ -1,5 +1,6 @@
 import datetime
 from collections.abc import Awaitable, Callable, Iterable, Sequence
+from collections.abc import Set as AbstractSet
 from typing import Literal
 
 from discord.abc import Snowflake
@@ -16,8 +17,8 @@ __all__: Sequence[str] = (
     "utcnow",
 )
 
-type Values = Iterable[OptionChoice] | Iterable[str]
-type ValuesWithInt = Values | Iterable[int]
+type Values = AbstractSet[OptionChoice] | AbstractSet[str]
+type ValuesWithInt = Values | AbstractSet[int]
 type AllValuesWithInt = ValuesWithInt | Awaitable[ValuesWithInt]
 
 def basic_autocomplete[T_context: AutocompleteContext](