kdb-bot/src/bot/bot.json

@@ -19,7 +19,7 @@
       "cpl-core==2023.10.0",
       "cpl-translation==2023.4.0.post1",
       "cpl-query==2023.10.0",
-      "cpl-discord==2023.10.0.post1",
+      "cpl-discord==2023.10.0",
       "Flask==3.0.0",
       "Flask-Classful==0.16.0",
       "Flask-Cors==4.0.0",

kdb-bot/src/bot/config

@@ -1 +1 @@
-Subproject commit aa1249341910f2877522a2002df7feea95256749
+Subproject commit 839bbb823a6e0c9e1443e0844446bfe240284063

kdb-bot/src/bot_api/api_module.py

@@ -48,4 +48,4 @@ class ApiModule(ModuleABC):
         services.add_transient(GraphQLController)
 
         # cpl-discord
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, BotApiOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, BotApiOnReadyEvent)

kdb-bot/src/bot_core/core_extension/core_extension_module.py

@@ -19,4 +19,4 @@ class CoreExtensionModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, CoreExtensionOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, CoreExtensionOnReadyEvent)

kdb-bot/src/bot_core/core_module.py

@@ -32,4 +32,4 @@ class CoreModule(ModuleABC):
         # pipes
         services.add_transient(DateTimeOffsetPipe)
 
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, CoreOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, CoreOnReadyEvent)

kdb-bot/src/modules/achievements/achievements_module.py

@@ -26,9 +26,9 @@ class AchievementsModule(ModuleABC):
         services.add_transient(AchievementAttributeResolver)
         services.add_transient(AchievementService)
 
-        services.add_transient(AchievementGroup)
+        self._dc.add_command(AchievementGroup)
 
-        services.add_transient(DiscordEventTypesEnum.on_message.value, AchievementOnMessageEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_message.value, AchievementOnMessageEvent)
-        services.add_transient(DiscordEventTypesEnum.on_reaction_add.value, AchievementOnReactionAddEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_reaction_add.value, AchievementOnReactionAddEvent)
-        services.add_transient(DiscordEventTypesEnum.on_reaction_remove.value, AchievementOnReactionRemoveEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_reaction_remove.value, AchievementOnReactionRemoveEvent)
-        services.add_transient(DiscordEventTypesEnum.on_voice_state_update.value, AchievementOnVoiceStateUpdateEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_voice_state_update.value, AchievementOnVoiceStateUpdateEvent)

kdb-bot/src/modules/auto_role/auto_role_module.py

@@ -26,13 +26,13 @@ class AutoRoleModule(ModuleABC):
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(AutoRoleReactionHandler)
         # commands
-        services.add_transient(AutoRoleGroup)
+        self._dc.add_command(AutoRoleGroup)
         # events
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_raw_reaction_add.value,
             AutoRoleOnRawReactionAddEvent,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_raw_reaction_remove.value,
             AutoRoleOnRawReactionRemoveEvent,
         )

kdb-bot/src/modules/base/base_module.py

@@ -65,49 +65,49 @@ class BaseModule(ModuleABC):
         services.add_transient(ComplaintForm)
 
         # commands
-        services.add_transient(AFKCommand)
+        self._dc.add_command(AFKCommand)
-        services.add_transient(SubmitGroup)
+        self._dc.add_command(SubmitGroup)
-        services.add_transient(HelpCommand)
+        self._dc.add_command(HelpCommand)
-        services.add_transient(InfoCommand)
+        self._dc.add_command(InfoCommand)
-        services.add_transient(MassMoveCommand)
+        self._dc.add_command(MassMoveCommand)
-        services.add_transient(PingCommand)
+        self._dc.add_command(PingCommand)
-        services.add_transient(PresenceCommand)
+        self._dc.add_command(PresenceCommand)
-        services.add_transient(MakeCoffeeCommand)
+        self._dc.add_command(MakeCoffeeCommand)
 
-        services.add_transient(PurgeCommand)
+        self._dc.add_command(PurgeCommand)
-        services.add_transient(UserGroup)
+        self._dc.add_command(UserGroup)
-        services.add_transient(RegisterGroup)
+        self._dc.add_command(RegisterGroup)
-        services.add_transient(UnregisterGroup)
+        self._dc.add_command(UnregisterGroup)
-        services.add_transient(GameServerGroup)
+        self._dc.add_command(GameServerGroup)
         # events
-        services.add_transient(DiscordEventTypesEnum.on_command.value, BaseOnCommandEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_command.value, BaseOnCommandEvent)
-        services.add_transient(DiscordEventTypesEnum.on_command_error.value, BaseOnCommandErrorEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_command_error.value, BaseOnCommandErrorEvent)
-        services.add_transient(DiscordEventTypesEnum.on_member_join.value, BaseOnMemberJoinEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, BaseOnMemberJoinEvent)
-        services.add_transient(DiscordEventTypesEnum.on_member_remove.value, BaseOnMemberRemoveEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_member_remove.value, BaseOnMemberRemoveEvent)
-        services.add_transient(DiscordEventTypesEnum.on_message.value, BaseOnMessageEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_message.value, BaseOnMessageEvent)
-        services.add_transient(DiscordEventTypesEnum.on_message_delete.value, BaseOnMessageDeleteEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_message_delete.value, BaseOnMessageDeleteEvent)
-        services.add_transient(DiscordEventTypesEnum.on_raw_reaction_add.value, BaseOnRawReactionAddEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, BaseOnRawReactionAddEvent)
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_raw_reaction_remove.value,
             BaseOnRawReactionRemoveEvent,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_voice_state_update.value,
             BaseOnVoiceStateUpdateEvent,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_voice_state_update.value,
             BaseOnVoiceStateUpdateEventHelpChannel,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_voice_state_update.value,
             BaseOnVoiceStateUpdateEventScheduledEventBonus,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_scheduled_event_update.value,
             BaseOnScheduledEventUpdateEvent,
         )
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_guild_join.value,
             BaseOnGuildJoinEvent,
         )

kdb-bot/src/modules/boot_log/boot_log_module.py

@@ -19,4 +19,4 @@ class BootLogModule(ModuleABC):
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         # events
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, BootLogOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, BootLogOnReadyEvent)

kdb-bot/src/modules/config/config_module.py

@@ -17,4 +17,4 @@ class ConfigModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, ConfigOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, ConfigOnReadyEvent)

kdb-bot/src/modules/database/database_module.py

@@ -19,4 +19,4 @@ class DatabaseModule(ModuleABC):
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         # commands
         # events
-        services.add_transient(DiscordEventTypesEnum.on_ready.value, DatabaseOnReadyEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, DatabaseOnReadyEvent)

kdb-bot/src/modules/level/level_module.py

@@ -36,14 +36,14 @@ class LevelModule(ModuleABC):
         services.add_transient(LevelService)
 
         # commands
-        services.add_transient(LevelGroup)
+        self._dc.add_command(LevelGroup)
 
         # events
-        services.add_transient(DiscordEventTypesEnum.on_message.value, LevelOnMessageEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_message.value, LevelOnMessageEvent)
-        services.add_transient(
+        self._dc.add_event(
             DiscordEventTypesEnum.on_voice_state_update.value,
             LevelOnVoiceStateUpdateEvent,
         )
-        services.add_transient(DiscordEventTypesEnum.on_member_join.value, LevelOnMemberJoinEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, LevelOnMemberJoinEvent)
-        services.add_transient(DiscordEventTypesEnum.on_raw_reaction_add.value, LevelOnRawReactionAddEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, LevelOnRawReactionAddEvent)
-        services.add_transient(DiscordEventTypesEnum.on_raw_reaction_remove.value, LevelOnRawReactionRemoveEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_remove.value, LevelOnRawReactionRemoveEvent)

kdb-bot/src/modules/short_role_name/short_role_name_module.py

@@ -25,6 +25,6 @@ class ShortRoleNameModule(ModuleABC):
         services.add_transient(ShortRoleNameService)
 
         # commands
-        services.add_transient(ShortRoleNameCheckCommand)
+        self._dc.add_command(ShortRoleNameCheckCommand)
         # events
-        services.add_transient(DiscordEventTypesEnum.on_member_update.value, ShortRoleNameOnMemberUpdateEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_member_update.value, ShortRoleNameOnMemberUpdateEvent)

kdb-bot/src/modules/technician/technician_module.py

@@ -24,9 +24,9 @@ class TechnicianModule(ModuleABC):
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(DataSeederABC, ApiKeySeeder)
         # commands
-        services.add_transient(RestartCommand)
+        self._dc.add_command(RestartCommand)
-        services.add_transient(ShutdownCommand)
+        self._dc.add_command(ShutdownCommand)
-        services.add_transient(LogCommand)
+        self._dc.add_command(LogCommand)
-        services.add_transient(ApiKeyGroup)
+        self._dc.add_command(ApiKeyGroup)
-        services.add_transient(SyncXpGroup)
+        self._dc.add_command(SyncXpGroup)
         # events