Merge branch '1.0.1' into #270

Reviewed-on: sh-edraft.de/kd_discord_bot#275
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #274

kdb-bot/src/bot_core/abc/client_utils_abc.py

@@ -2,9 +2,11 @@ from abc import ABC, abstractmethod
 from datetime import datetime
 from typing import Callable
 
+import discord
 from cpl_query.extension import List
 from discord.ext.commands import Context
 
+from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.user import User
 from modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -59,3 +61,9 @@ class ClientUtilsABC(ABC):
     @abstractmethod
     def get_ontime_for_user(self, user: User) -> float:
         pass
+
+    @abstractmethod
+    async def react_to_message_by_auto_role_rule(
+        self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
+    ):
+        pass

kdb-bot/src/bot_core/service/client_utils_service.py

@@ -9,6 +9,7 @@ from cpl_core.time import TimeFormatSettings
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from cpl_translation import TranslatePipe
+from discord import Guild
 from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_abc import ClientUtilsABC
@@ -23,6 +24,7 @@ from bot_data.abc.user_joined_voice_channel_repository_abc import (
 from bot_data.abc.user_message_count_per_hour_repository_abc import (
     UserMessageCountPerHourRepositoryABC,
 )
+from bot_data.model.auto_role_rule import AutoRoleRule
 from bot_data.model.user import User
 from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
 from modules.base.configuration.base_server_settings import BaseServerSettings
@@ -192,3 +194,27 @@ class ClientUtilsService(ClientUtilsABC):
             .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
             2,
         )
+
+    async def react_to_message_by_auto_role_rule(
+        self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
+    ):
+        try:
+            guild: Guild = self._bot.guilds.where(lambda g: g == guild).single()
+            channel = guild.get_channel(discord_channel_id)
+            message = await channel.fetch_message(discord_message_id)
+            emoji = List(discord.Emoji, guild.emojis).where(lambda x: x.name == rule.emoji_name).single()
+
+            if emoji is None:
+                self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found")
+                return
+            await message.add_reaction(emoji)
+            self._logger.debug(
+                __name__,
+                f"Added reaction {rule.emoji_name} to message: {discord_message_id}",
+            )
+        except Exception as e:
+            self._logger.error(
+                __name__,
+                f"Cannot add reaction {rule.emoji_name} to message: {discord_message_id}",
+                e,
+            )

kdb-bot/src/bot_graphql/abc/query_abc.py

@@ -135,7 +135,7 @@ class QueryABC(ObjectType):
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
                 member = guild.get_member(u.discord_id)
-                if u.id == element.id or permissions.is_member_moderator(member):
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
@@ -144,7 +144,7 @@ class QueryABC(ObjectType):
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
                 member = guild.get_member(u.discord_id)
-                if u.id == element.id or permissions.is_member_moderator(member):
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 
@@ -153,7 +153,7 @@ class QueryABC(ObjectType):
                 u: User = u
                 guild = bot.get_guild(u.server.discord_id)
                 member = guild.get_member(u.discord_id)
-                if u.id == element.id or permissions.is_member_moderator(member):
+                if u.id == element.user.id or permissions.is_member_moderator(member):
                     access = True
                     break
 

kdb-bot/src/bot_graphql/mutations/auto_role_rule_mutation.py

@@ -1,5 +1,7 @@
 from cpl_core.database.context import DatabaseContextABC
+from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.abc.client_utils_abc import ClientUtilsABC
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.model.auto_role_rule import AutoRoleRule
@@ -10,15 +12,19 @@ from bot_graphql.abc.query_abc import QueryABC
 class AutoRoleRuleMutation(QueryABC):
     def __init__(
         self,
+        bot: DiscordBotServiceABC,
         servers: ServerRepositoryABC,
         auto_roles: AutoRoleRepositoryABC,
         db: DatabaseContextABC,
+        client_utils: ClientUtilsABC,
     ):
         QueryABC.__init__(self, "AutoRoleRuleMutation")
 
+        self._bot = bot
         self._servers = servers
         self._auto_roles = auto_roles
         self._db = db
+        self._client_utils = client_utils
 
         self.set_field("createAutoRoleRule", self.resolve_create_auto_role_rule)
         self.set_field("updateAutoRoleRule", self.resolve_update_auto_role_rule)
@@ -40,6 +46,14 @@ class AutoRoleRuleMutation(QueryABC):
                 and x.role_id == int(input["roleId"])
             )
 
+        self._bot.loop.create_task(
+            self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_rule.auto_role.discord_channel_id,
+                auto_role_rule.auto_role.discord_message_id,
+                auto_role_rule,
+                self._bot.get_guild(auto_role_rule.auto_role.server.discord_id),
+            )
+        )
         return self._auto_roles.get_auto_role_rules_by_auto_role_id(auto_role_rule.auto_role.id).where(get_new).last()
 
     def resolve_update_auto_role_rule(self, *_, input: dict):
@@ -53,6 +67,14 @@ class AutoRoleRuleMutation(QueryABC):
         self._db.save_changes()
 
         auto_role_rule = self._auto_roles.get_auto_role_rule_by_id(input["id"])
+        self._bot.loop.create_task(
+            self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_rule.auto_role.discord_channel_id,
+                auto_role_rule.auto_role.discord_message_id,
+                auto_role_rule,
+                self._bot.get_guild(auto_role_rule.auto_role.server.discord_id),
+            )
+        )
         return auto_role_rule
 
     def resolve_delete_auto_role_rule(self, *_, id: int):

kdb-bot/src/modules/auto_role/command/auto_role_group.py

@@ -6,7 +6,7 @@ from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_query.extension import List
 from cpl_translation import TranslatePipe
-from discord import app_commands, Guild
+from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
@@ -312,26 +312,13 @@ class AutoRoleGroup(DiscordCommandABC):
             .where(lambda r: r.emoji_name == emoji.name and int(role_id) == role.id)
             .single()
         )
-        try:
-            guild: Guild = self._bot.guilds.where(lambda g: g == ctx.guild).single()
-            channel = guild.get_channel(auto_role_from_db.discord_channel_id)
-            message = await channel.fetch_message(auto_role_from_db.discord_message_id)
-            emoji = List(discord.Emoji, guild.emojis).where(lambda x: x.name == rule.emoji_name).single()
 
-            if emoji is None:
-                self._logger.debug(__name__, f"Emoji {rule.emoji_name} not found")
-                return
-            await message.add_reaction(emoji)
-            self._logger.debug(
-                __name__,
-                f"Added reaction {rule.emoji_name} to message: {auto_role_from_db.discord_message_id}",
-            )
-        except Exception as e:
-            self._logger.error(
-                __name__,
-                f"Cannot add reaction {rule.emoji_name} to message: {auto_role_from_db.discord_message_id}",
-                e,
+        # as task to run in background
+        self._bot.loop.create_task(
+            await self._client_utils.react_to_message_by_auto_role_rule(
+                auto_role_from_db.discord_channel_id, auto_role_from_db.discord_message_id, rule, ctx.guild
             )
+        )
 
         await self._message_service.send_ctx_msg(
             ctx,

kdb-bot/src/modules/auto_role/helper/auto_role_reaction_handler.py

@@ -32,9 +32,9 @@ class AutoRoleReactionHandler:
             return
 
         guild = self._bot.get_guild(payload.guild_id)
-        user = guild.get_member(payload.user_id)
+        user = guild.get_member(payload.id)
         if user is None:
-            self._logger.warn(__name__, f"User {payload.user_id} in {guild.name} not found - skipping")
+            self._logger.warn(__name__, f"User {payload.id} in {guild.name} not found - skipping")
             return
 
         if user.bot:

kdb-bot/src/modules/base/events/base_on_voice_state_update_event.py

@@ -102,6 +102,9 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         server = self._servers.get_server_by_discord_id(member.guild.id)
 
         try:
+            if before.channel == after.channel:
+                return
+
             # join
             if (
                 before.channel is None

kdb-bot/src/modules/base/events/base_on_voice_state_update_event_scheduled_event_bonus.py

@@ -52,12 +52,12 @@ class BaseOnVoiceStateUpdateEventScheduledEventBonus(OnVoiceStateUpdateABC):
             return
 
         server = self._servers.get_server_by_discord_id(member.guild.id)
-        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.server_id)
-        if active_event.participants.any(lambda x: x.user_id == user.user_id):
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
+        if active_event.participants.any(lambda x: x.id == user.id):
             self._logger.debug(__name__, f"Module {type(self)} stopped")
             return
 
-        settings: BaseServerSettings = self._base_helper.get_config(server.discord_server_id)
+        settings: BaseServerSettings = self._base_helper.get_config(server.discord_id)
         user.xp += settings.xp_per_event_participation
         self._users.update_user(user)
         self._db.save_changes()

kdb-bot/src/modules/base/helper/base_reaction_handler.py

@@ -36,9 +36,9 @@ class BaseReactionHandler:
         self._logger.trace(__name__, f"Handle reaction {payload} {r_type}")
 
         guild = self._bot.get_guild(payload.guild_id)
-        member = guild.get_member(payload.user_id)
+        member = guild.get_member(payload.id)
         if member is None:
-            self._logger.warn(__name__, f"User {payload.user_id} in {guild.name} not found - skipping")
+            self._logger.warn(__name__, f"User {payload.id} in {guild.name} not found - skipping")
             return
 
         try:

kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.html

@@ -160,7 +160,7 @@
 
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="autoRoleRule.history" translationKey="view.server.auto_roles.rules.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil" (click)="onRowEditInit(dt, autoRoleRule, ri)"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
                       (click)="deleteAutoRoleRule(autoRoleRule)"></button>

kdb-web/src/app/modules/view/server/auto-role/components/auto-roles-rules/auto-roles-rules.component.ts

@@ -225,7 +225,7 @@ export class AutoRolesRulesComponent implements OnInit, OnDestroy {
       })).subscribe(result => {
         this.isEditingNew = false;
         this.spinner.hideSpinner();
-        this.toastService.success(this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_created"), this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create_d", { id: result.autoRoleRule.createAutoRoleRule?.id }));
+        this.toastService.success(this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create"), this.translate.instant("view.server.auto_roles.rules.message.auto_role_rule_create_d", { id: result.autoRoleRule.createAutoRoleRule?.id }));
         this.loadNextPage();
       });
       return;

kdb-web/src/app/modules/view/server/auto-role/components/auto-roles/auto-roles.component.html

@@ -193,7 +193,7 @@
             <div class="btn-wrapper">
 <!--              <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"-->
 <!--                      (click)="onRowEditInit(dt, autoRole, ri)"></button>-->
-              <app-history-btn [history]="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="autoRole.history" translationKey="view.server.auto_roles.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-sliders-h" [routerLink]="[autoRole.id, 'rules']"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"
                       (click)="deleteAutoRole(autoRole)"></button>

kdb-web/src/app/modules/view/server/levels/components/levels/levels.component.html

@@ -18,7 +18,7 @@
 
           <div class="table-caption-btn-wrapper btn-wrapper">
             <button pButton label="{{'common.add' | translate}}" class="icon-btn btn"
-                    icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew">
+                    icon="pi pi-user-plus" (click)="addLevel(dt)" [disabled]="isEditingNew || user?.isModerator && !user?.isAdmin">
             </button>
             <button pButton label="{{'common.reset_filters' | translate}}" icon="pi pi-undo"
                     class="icon-btn btn" (click)="resetFilters()">
@@ -184,7 +184,7 @@
           </td>
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="level.history" translationKey="view.server.levels.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="level.history" translationKey="view.server.levels.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
                       (click)="onRowEditInit(dt, level, ri)" [disabled]="!user || user.isModerator && !user.isAdmin"></button>
               <button *ngIf="!editing" pButton class="btn icon-btn danger-icon-btn" icon="pi pi-trash"

kdb-web/src/app/modules/view/server/members/members.component.html

@@ -224,7 +224,7 @@
           </td>
           <td>
             <div class="btn-wrapper">
-              <app-history-btn [history]="member.history" translationKey="view.server.members.header"></app-history-btn>
+              <app-history-btn *ngIf="!isEditingNew" [history] ="member.history" translationKey="view.server.members.header"></app-history-btn>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-pencil"
                       (click)="onRowEditInit(dt, member, ri)"></button>
               <button *ngIf="!editing" pButton pInitEditableRow class="btn icon-btn" icon="pi pi-user"

kdb-web/src/styles/themes/default-dark-theme.scss

@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $secondaryBackgroundColor !important;
 

kdb-web/src/styles/themes/default-light-theme.scss

@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $primaryBackgroundColor !important;
 

kdb-web/src/styles/themes/sh-edraft-dark-theme.scss

@@ -357,6 +357,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $secondaryBackgroundColor !important;
 

kdb-web/src/styles/themes/sh-edraft-light-theme.scss

@@ -353,6 +353,10 @@
         color: $primaryTextColor;
       }
 
+      .p-dropdown-panel .p-dropdown-items .p-dropdown-item {
+        color: $primaryTextColor !important;
+      }
+
       .p-dropdown-panel {
         background-color: $primaryBackgroundColor !important;