Merge pull request 'support' (#303) from support into master

Reviewed-on: sh-edraft.de/kd_discord_bot#303
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>

kdb-bot/src/bot/module_list.py

@@ -25,10 +25,10 @@ class ModuleList:
                 DataModule,
                 GraphQLModule,
                 PermissionModule,
+                LevelModule,
                 DatabaseModule,
                 AutoRoleModule,
                 BaseModule,
-                LevelModule,
                 ApiModule,
                 TechnicianModule,
                 # has to be last!

kdb-bot/src/bot_core/helper/event_checks.py

@@ -1,9 +1,13 @@
 from typing import Optional
 
+from cpl_translation import TranslatePipe
 from discord.ext import commands
+from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.exception.check_error import CheckError
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class EventChecks:
@@ -19,7 +23,7 @@ class EventChecks:
     @classmethod
     def check_is_ready(cls):
         async def check_if_bot_is_ready() -> bool:
-            result = await cls._client_utils.check_if_bot_is_ready_yet()
+            result = await cls._client_utils.check_if_bot_is_ready()
             if not result:
                 raise CheckError(f"Bot is not ready")
             return result

kdb-bot/src/modules/level/events/level_on_raw_reaction_add_event.py

@@ -1,34 +0,0 @@
-from cpl_core.logging import LoggerABC
-from cpl_discord.events.on_raw_reaction_add_abc import OnRawReactionAddABC
-from cpl_discord.service import DiscordBotServiceABC
-from discord import RawReactionActionEvent
-
-from bot_core.helper.event_checks import EventChecks
-from modules.level.service.level_service import LevelService
-
-
-class LevelOnRawReactionAddEvent(OnRawReactionAddABC):
-    def __init__(
-        self,
-        logger: LoggerABC,
-        bot: DiscordBotServiceABC,
-        level: LevelService,
-    ):
-        OnRawReactionAddABC.__init__(self)
-
-        self._logger = logger
-        self._bot = bot
-        self._level = level
-
-    @EventChecks.check_is_ready()
-    async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
-        self._logger.debug(__name__, f"Module {type(self)} started")
-        try:
-            self._logger.trace(__name__, f"Handle reaction {payload} for level")
-
-            guild = self._bot.get_guild(payload.guild_id)
-            member = guild.get_member(payload.user_id)
-
-            await self._level.check_level(member)
-        except Exception as e:
-            self._logger.error(__name__, f"Level check by message failed", e)

kdb-bot/src/modules/level/events/level_on_raw_reaction_remove_event.py

@@ -1,34 +0,0 @@
-from cpl_core.logging import LoggerABC
-from cpl_discord.events.on_raw_reaction_remove_abc import OnRawReactionRemoveABC
-from cpl_discord.service import DiscordBotServiceABC
-from discord import RawReactionActionEvent
-
-from bot_core.helper.event_checks import EventChecks
-from modules.level.service.level_service import LevelService
-
-
-class LevelOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
-    def __init__(
-        self,
-        logger: LoggerABC,
-        bot: DiscordBotServiceABC,
-        level: LevelService,
-    ):
-        OnRawReactionRemoveABC.__init__(self)
-
-        self._logger = logger
-        self._bot = bot
-        self._level = level
-
-    @EventChecks.check_is_ready()
-    async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
-        self._logger.debug(__name__, f"Module {type(self)} started")
-        try:
-            self._logger.trace(__name__, f"Handle reaction {payload} for level")
-
-            guild = self._bot.get_guild(payload.guild_id)
-            member = guild.get_member(payload.user_id)
-
-            await self._level.check_level(member)
-        except Exception as e:
-            self._logger.error(__name__, f"Level check by message failed", e)

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

@@ -12,8 +12,6 @@ from bot_data.abc.data_seeder_abc import DataSeederABC
 from modules.level.command.level_group import LevelGroup
 from modules.level.events.level_on_member_join_event import LevelOnMemberJoinEvent
 from modules.level.events.level_on_message_event import LevelOnMessageEvent
-from modules.level.events.level_on_raw_reaction_add_event import LevelOnRawReactionAddEvent
-from modules.level.events.level_on_raw_reaction_remove_event import LevelOnRawReactionRemoveEvent
 from modules.level.events.level_on_voice_state_update_event import (
     LevelOnVoiceStateUpdateEvent,
 )
@@ -45,5 +43,3 @@ class LevelModule(ModuleABC):
             LevelOnVoiceStateUpdateEvent,
         )
         self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, LevelOnMemberJoinEvent)
-        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, LevelOnRawReactionAddEvent)
-        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_remove.value, LevelOnRawReactionRemoveEvent)

kdb-web/src/app/modules/auth/components/forget-password/forget-password.component.ts

@@ -40,7 +40,7 @@ export class ForgetPasswordComponent implements OnInit {
 
   ngOnInit(): void {
     this.spinnerService.showSpinner();
-    if (this.authService.isLoggedIn$.value) {
+    if (!this.authService.isLoggedIn$.value) {
       this.router.navigate(["/dashboard"]);
     }
 

kdb-web/src/app/modules/auth/components/registration/registration.component.ts

@@ -49,7 +49,7 @@ export class RegistrationComponent implements OnInit, OnDestroy {
     private settings: SettingsService
   ) {
     this.spinnerService.showSpinner();
-    if (this.authService.isLoggedIn$.value) {
+    if (!this.authService.isLoggedIn$.value) {
       this.router.navigate(["/dashboard"]);
     }
     this.spinnerService.hideSpinner();
@@ -57,6 +57,7 @@ export class RegistrationComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.translate.onLangChange.pipe(takeUntil(this.unsubscriber)).subscribe(lang => {
+
       this.confirmPrivacyString = this.translate.instant("auth.register.confirm_privacy", { url: this.settings.getPrivacyURL() });
     });
 
@@ -166,4 +167,8 @@ export class RegistrationComponent implements OnInit, OnDestroy {
         });
     }
   }
+
+  log($event: Event): void {
+    console.log($event);
+  }
 }

kdb-web/src/app/services/sidebar/sidebar.service.ts

@@ -37,7 +37,7 @@ export class SidebarService {
   ) {
     this.themeService.isSidebarOpen$.subscribe(value => {
       this.isSidebarOpen = value;
-      this.setMenu(true);
+      this.setMenu();
     });
 
     this.translateService.onLangChange.subscribe(_ => {