Merge branch 'main' into implement-strike-message

CSSUoB · Sep 25, 2024 · d6c29d1 · d6c29d1
2 parents ee2e8d0 + d9643af
commit d6c29d1
Show file tree

Hide file tree

Showing 15 changed files with 511 additions and 467 deletions.
diff --git a/cogs/__init__.py b/cogs/__init__.py
@@ -8,35 +8,35 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
+    "AnnualRolesResetCommandCog",
+    "AnnualYearChannelsIncrementCommandCog",
     "ArchiveCommandCog",
-    "GetTokenAuthorisationCommandCog",
+    "ClearRemindersBacklogTaskCog",
     "CommandErrorCog",
+    "CommitteeHandoverCommandCog",
     "DeleteAllCommandsCog",
     "EditMessageCommandCog",
     "EnsureMembersInductedCommandCog",
-    "MakeApplicantSlashCommandCog",
-    "MakeApplicantContextCommandsCog",
-    "CommitteeHandoverCommandCog",
-    "AnnualRolesResetCommandCog",
-    "InductSlashCommandCog",
-    "InductSendMessageCog",
+    "GetTokenAuthorisationCommandCog",
     "InductContextCommandsCog",
+    "InductSendMessageCog",
+    "InductSlashCommandCog",
     "KillCommandCog",
+    "MakeApplicantContextCommandsCog",
+    "MakeApplicantSlashCommandCog",
     "MakeMemberCommandCog",
-    "AnnualYearChannelsIncrementCommandCog",
+    "ManualModerationCog",
     "PingCommandCog",
-    "ClearRemindersBacklogTaskCog",
     "RemindMeCommandCog",
     "SendGetRolesRemindersTaskCog",
     "SendIntroductionRemindersTaskCog",
+    "setup",
     "SourceCommandCog",
     "StartupCog",
     "StatsCommandsCog",
-    "ManualModerationCog",
     "StrikeCommandCog",
     "StrikeContextCommandsCog",
     "WriteRolesCommandCog",
-    "setup",
 )
 
 
@@ -82,31 +82,31 @@
 def setup(bot: TeXBot) -> None:
     """Add all the cogs to the bot, at bot startup."""
     cogs: Iterable[type[TeXBotBaseCog]] = (
+        AnnualRolesResetCommandCog,
+        AnnualYearChannelsIncrementCommandCog,
         ArchiveCommandCog,
-        GetTokenAuthorisationCommandCog,
+        ClearRemindersBacklogTaskCog,
         CommandErrorCog,
+        CommitteeHandoverCommandCog,
         DeleteAllCommandsCog,
         EditMessageCommandCog,
         EnsureMembersInductedCommandCog,
-        CommitteeHandoverCommandCog,
-        AnnualRolesResetCommandCog,
-        InductSlashCommandCog,
-        InductSendMessageCog,
-        AnnualYearChannelsIncrementCommandCog,
+        GetTokenAuthorisationCommandCog,
         InductContextCommandsCog,
+        InductSendMessageCog,
+        InductSlashCommandCog,
         KillCommandCog,
-        MakeApplicantSlashCommandCog,
         MakeApplicantContextCommandsCog,
+        MakeApplicantSlashCommandCog,
         MakeMemberCommandCog,
+        ManualModerationCog,
         PingCommandCog,
-        ClearRemindersBacklogTaskCog,
         RemindMeCommandCog,
         SendGetRolesRemindersTaskCog,
         SendIntroductionRemindersTaskCog,
         SourceCommandCog,
         StartupCog,
         StatsCommandsCog,
-        ManualModerationCog,
         StrikeCommandCog,
         StrikeContextCommandsCog,
         WriteRolesCommandCog,

diff --git a/cogs/annual_handover_and_reset.py b/cogs/annual_handover_and_reset.py
@@ -3,9 +3,9 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
-    "CommitteeHandoverCommandCog",
     "AnnualRolesResetCommandCog",
     "AnnualYearChannelsIncrementCommandCog",
+    "CommitteeHandoverCommandCog",
 )
 
 import datetime

diff --git a/cogs/induct.py b/cogs/induct.py
@@ -3,11 +3,11 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
-    "InductSendMessageCog",
     "BaseInductCog",
-    "InductSlashCommandCog",
-    "InductContextCommandsCog",
     "EnsureMembersInductedCommandCog",
+    "InductContextCommandsCog",
+    "InductSendMessageCog",
+    "InductSlashCommandCog",
 )
 
 
@@ -185,6 +185,8 @@ async def _perform_induction(self, ctx: TeXBotApplicationContext, induction_memb
         main_guild: discord.Guild = self.bot.main_guild
         guest_role: discord.Role = await self.bot.guest_role
 
+        logger.debug("Inducting member %s, silent=%s", induction_member, silent)
+
         INDUCT_AUDIT_MESSAGE: Final[str] = (
             f"{ctx.user} used TeX Bot slash-command: \"/induct\""
         )
@@ -223,22 +225,11 @@ async def _perform_induction(self, ctx: TeXBotApplicationContext, induction_memb
             with contextlib.suppress(RolesChannelDoesNotExistError):
                 roles_channel_mention = (await self.bot.roles_channel).mention
 
-            message_already_sent: bool = False
-            message: discord.Message
-            async for message in general_channel.history(limit=7):
-                message_already_sent = bool(
-                    message.author == self.bot.user
-                    and "grab your roles" in message.content  # noqa: COM812
-                )
-                if message_already_sent:
-                    break
-
-            if not message_already_sent:
-                await general_channel.send(
-                    f"{await self.get_random_welcome_message(induction_member)} :tada:\n"
-                    f"Remember to grab your roles in {roles_channel_mention} "
-                    "and say hello to everyone here! :wave:",
-                )
+            await general_channel.send(
+                f"{await self.get_random_welcome_message(induction_member)} :tada:\n"
+                f"Remember to grab your roles in {roles_channel_mention} "
+                "and say hello to everyone here! :wave:",
+            )
 
         await induction_member.add_roles(
             guest_role,

diff --git a/cogs/kill.py b/cogs/kill.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Sequence
 
-__all__: Sequence[str] = ("KillCommandCog", "ConfirmKillView")
+__all__: Sequence[str] = ("ConfirmKillView", "KillCommandCog")
 
 
 import contextlib

diff --git a/cogs/make_applicant.py b/cogs/make_applicant.py
@@ -4,8 +4,8 @@
 
 __all__: Sequence[str] = (
     "BaseMakeApplicantCog",
-    "MakeApplicantSlashCommandCog",
     "MakeApplicantContextCommandsCog",
+    "MakeApplicantSlashCommandCog",
 )
 
 

diff --git a/cogs/remind_me.py b/cogs/remind_me.py
@@ -2,7 +2,7 @@
 
 from collections.abc import Sequence
 
-__all__: Sequence[str] = ("RemindMeCommandCog", "ClearRemindersBacklogTaskCog")
+__all__: Sequence[str] = ("ClearRemindersBacklogTaskCog", "RemindMeCommandCog")
 
 
 import datetime

diff --git a/cogs/strike.py b/cogs/strike.py
@@ -3,12 +3,12 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
-    "perform_moderation_action",
-    "ConfirmStrikeMemberView",
+    "BaseStrikeCog",
     "ConfirmManualModerationView",
+    "ConfirmStrikeMemberView",
     "ConfirmStrikesOutOfSyncWithBanView",
-    "BaseStrikeCog",
     "ManualModerationCog",
+    "perform_moderation_action",
     "StrikeCommandCog",
     "StrikeContextCommandsCog",
 )

diff --git a/exceptions/__init__.py b/exceptions/__init__.py
@@ -8,22 +8,22 @@
     "ChannelDoesNotExistError",
     "CommitteeElectRoleDoesNotExistError",
     "CommitteeRoleDoesNotExistError",
+    "DiscordMemberNotInMainGuildError",
+    "EveryoneRoleCouldNotBeRetrievedError",
     "GeneralChannelDoesNotExistError",
     "GuestRoleDoesNotExistError",
     "GuildDoesNotExistError",
+    "ImproperlyConfiguredError",
+    "InvalidMessagesJSONFileError",
     "MemberRoleDoesNotExistError",
+    "MessagesJSONFileMissingKeyError",
+    "MessagesJSONFileValueError",
+    "NoAuditLogsStrikeTrackingError",
+    "RestartRequiredDueToConfigChange",
     "RoleDoesNotExistError",
     "RolesChannelDoesNotExistError",
     "RulesChannelDoesNotExistError",
-    "DiscordMemberNotInMainGuildError",
-    "EveryoneRoleCouldNotBeRetrievedError",
     "StrikeTrackingError",
-    "NoAuditLogsStrikeTrackingError",
-    "MessagesJSONFileMissingKeyError",
-    "MessagesJSONFileValueError",
-    "InvalidMessagesJSONFileError",
-    "ImproperlyConfiguredError",
-    "RestartRequiredDueToConfigChange",
 )
 
 

diff --git a/exceptions/does_not_exist.py b/exceptions/does_not_exist.py
@@ -3,18 +3,18 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
-    "RulesChannelDoesNotExistError",
-    "GuildDoesNotExistError",
-    "RoleDoesNotExistError",
-    "CommitteeRoleDoesNotExistError",
+    "ApplicantRoleDoesNotExistError",
+    "ArchivistRoleDoesNotExistError",
+    "ChannelDoesNotExistError",
     "CommitteeElectRoleDoesNotExistError",
+    "CommitteeRoleDoesNotExistError",
+    "GeneralChannelDoesNotExistError",
     "GuestRoleDoesNotExistError",
+    "GuildDoesNotExistError",
     "MemberRoleDoesNotExistError",
-    "ArchivistRoleDoesNotExistError",
-    "ApplicantRoleDoesNotExistError",
-    "ChannelDoesNotExistError",
+    "RoleDoesNotExistError",
     "RolesChannelDoesNotExistError",
-    "GeneralChannelDoesNotExistError",
+    "RulesChannelDoesNotExistError",
 )
 
 

diff --git a/exceptions/strike.py b/exceptions/strike.py
@@ -3,8 +3,8 @@
 from collections.abc import Sequence
 
 __all__: Sequence[str] = (
-    "StrikeTrackingError",
     "NoAuditLogsStrikeTrackingError",
+    "StrikeTrackingError",
 )