Merge branch '1.0.1' into #266

Reviewed-on: sh-edraft.de/kd_discord_bot#262
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #260

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_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)
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
-        if active_event.participants.any(lambda x: x.user_id == user.user_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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "kdb-web",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "scripts": {
         "ng": "ng",
         "update-version": "ts-node-esm update-version.ts",

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/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/assets/config.json

@@ -4,7 +4,7 @@
     "ImprintURL": "https://www.sh-edraft.de/Impressum",
     "WebVersion": {
         "Major": "1",
-        "Minor": "0",
+        "Minor": "1",
         "Micro": "0"
     },
     "Themes": [

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;