Merge pull request '0.3' (#146) from 0.3 into master

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

kdb-bot/cpl-workspace.json

@@ -13,19 +13,20 @@
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",
       "stats": "src/modules/stats/stats.json",
+      "technician": "src/modules/technician/technician.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
       "set-version": "tools/set_version/set-version.json"
     },
     "Scripts": {
-      "sv": "cpl set-version",
-      "set-version": "cpl run set-version $ARGS; echo '';",
+      "sv": "cpl set-version $ARGS",
+      "set-version": "cpl run set-version $ARGS --dev; echo '';",
 
       "gv": "cpl get-version",
-      "get-version": "export VERSION=$(cpl run get-version); echo $VERSION;",
+      "get-version": "export VERSION=$(cpl run get-version --dev); echo $VERSION;",
 
       "pre-build": "cpl set-version $ARGS",
-      "post-build": "cpl run post-build",
+      "post-build": "cpl run post-build --dev",
 
       "pre-prod": "cpl build",
       "prod": "export KDB_ENVIRONMENT=production; export KDB_NAME=KDB-Prod; cpl start;",
@@ -36,9 +37,10 @@
       "pre-dev": "cpl build",
       "dev": "export KDB_ENVIRONMENT=development; export KDB_NAME=KDB-Dev; cpl start;",
 
-      "docker-build": "cpl b; docker-compose down; docker build -t kdb-bot/kdb-bot:$(cpl gv) .",
-      "docker-compose": "docker-compose up -d",
-      "docker": "cpl docker-build; cpl docker-compose;"
+      "docker-build": "cpl build $ARGS; docker build -t kdb-bot/kdb-bot:$(cpl gv) .;",
+      "dc-up": "docker-compose up -d",
+      "dc-down": "docker-compose down",
+      "docker": "cpl dc-down; cpl docker-build; cpl dc-up;"
     }
   }
 }

kdb-bot/dockerfile

@@ -0,0 +1,18 @@
+# syntax=docker/dockerfile:1
+FROM python:3.10.6-alpine
+
+WORKDIR /app
+COPY ./dist/bot/build/kdb-bot/ .
+COPY ./dist/bot/build/requirements.txt .
+
+RUN python -m pip install --upgrade pip
+
+RUN apk update
+RUN apk add --update alpine-sdk linux-headers
+RUN apk add bash
+RUN apk add nano
+
+RUN pip install -r requirements.txt --extra-index-url https://pip.sh-edraft.de
+RUN pip install flask[async]
+
+CMD [ "bash", "/app/bot/bot"]

kdb-bot/src/bot/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "dev25"
+      "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,21 +16,22 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.10.0.post7",
+      "cpl-core==2022.12.0",
       "cpl-translation==2022.10.0.post2",
-      "cpl-query==2022.10.0.post2",
-      "cpl-discord==2022.10.0.post6",
+      "cpl-query==2022.12.2",
+      "cpl-discord==2022.12.0",
       "Flask==2.2.2",
       "Flask-Classful==0.14.2",
       "Flask-Cors==3.0.10",
       "PyJWT==2.6.0",
       "waitress==2.1.2",
-      "Flask-SocketIO==5.3.1",
-      "eventlet==0.33.1",
-      "requests-oauthlib==1.3.1"
+      "Flask-SocketIO==5.3.2",
+      "eventlet==0.33.2",
+      "requests-oauthlib==1.3.1",
+      "icmplib==3.0.3"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},
@@ -59,9 +60,9 @@
       "../modules/boot_log/boot-log.json",
       "../modules/database/database.json",
       "../modules/level/level.json",
-      "../modules/permission/level.json",
       "../modules/permission/permission.json",
-      "../modules/permission/stats.json"
+      "../modules/stats/stats.json",
+      "../modules/technician/technician.json"
     ]
   }
 }

kdb-bot/src/bot/main.py

@@ -12,6 +12,7 @@ from bot.startup_migration_extension import StartupMigrationExtension
 from bot.startup_module_extension import StartupModuleExtension
 from bot.startup_settings_extension import StartupSettingsExtension
 from bot_api.app_api_extension import AppApiExtension
+from bot_core.core_extension.core_extension import CoreExtension
 from modules.boot_log.boot_log_extension import BootLogExtension
 from modules.database.database_extension import DatabaseExtension
 
@@ -31,6 +32,7 @@ class Program:
             .use_extension(BootLogExtension) \
             .use_extension(DatabaseExtension) \
             .use_extension(AppApiExtension) \
+            .use_extension(CoreExtension) \
             .use_startup(Startup)
         self.app: Application = await app_builder.build_async()
         await self.app.run_async()

kdb-bot/src/bot/module_list.py

@@ -11,6 +11,7 @@ from modules.database.database_module import DatabaseModule
 from modules.level.level_module import LevelModule
 from modules.permission.permission_module import PermissionModule
 from modules.stats.stats_module import StatsModule
+from modules.technician.technician_module import TechnicianModule
 
 
 class ModuleList:
@@ -21,13 +22,14 @@ class ModuleList:
         return List(type, [
             CoreModule,  # has to be first!
             DataModule,
+            PermissionModule,
+            DatabaseModule,
             AutoRoleModule,
             BaseModule,
-            DatabaseModule,
             LevelModule,
-            PermissionModule,
             ApiModule,
             StatsModule,
+            TechnicianModule,
             # has to be last!
             BootLogModule,
             CoreExtensionModule,

kdb-bot/src/bot/startup_migration_extension.py

@@ -5,6 +5,7 @@ from cpl_core.environment import ApplicationEnvironmentABC
 
 from bot_data.abc.migration_abc import MigrationABC
 from bot_data.migration.api_migration import ApiMigration
+from bot_data.migration.auto_role_fix1_migration import AutoRoleFix1Migration
 from bot_data.migration.auto_role_migration import AutoRoleMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
@@ -27,3 +28,4 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, ApiMigration)  # 15.10.2022 #70 - 0.3.0
         services.add_transient(MigrationABC, LevelMigration)  # 06.11.2022 #25 - 0.3.0
         services.add_transient(MigrationABC, StatsMigration)  # 09.11.2022 #46 - 0.3.0
+        services.add_transient(MigrationABC, AutoRoleFix1Migration)  # 30.12.2022 #151 - 0.3.0

kdb-bot/src/bot/translation/de.json

@@ -6,7 +6,7 @@
     "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
     "presence": {
       "booting": "{} Ich fahre gerade hoch...",
-      "running": "{} Behalte Ruhe und iss Kekse :D",
+      "running": "{} Ich esse Kekse :D",
       "restart": "{} Muss neue Kekse holen...",
       "shutdown": "{} Ich werde bestimmt wieder kommen..."
     },
@@ -72,11 +72,6 @@
     }
   },
   "modules": {
-    "admin": {
-      "restart_message": "Bin gleich wieder da :D",
-      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, Euer Freund. Lebt lange und in Frieden :)",
-      "deploy_message": "Der neue Stand wurde hochgeladen."
-    },
     "auto_role": {
       "list": {
         "title": "Beobachtete Nachrichten:",
@@ -113,7 +108,7 @@
           "error": {
             "not_found": "Regel für auto-role {} nicht gefunden!",
             "emoji_not_found": "Emoji {} für auto-role Regel {} nicht gefunden!",
-            "rule_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
+            "role_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
             "already_exists": "Regel für auto-role {} existiert bereits!"
           }
         },
@@ -132,16 +127,17 @@
       "purge_message": "Na gut..., ich lösche alle Nachrichten wenns sein muss."
     },
     "base": {
-      "technician_error_message": "Es gab ein Fehler mit dem Event: {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.UUID: {}",
-      "technician_command_error_message": "Es gab ein Fehler mit dem Befehl: {} ausgelöst von {} -> {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.UUID: {}",
-      "welcome_message": "Hello There!\nIch heiße dich bei {} herzlichst willkommen!",
+      "technician_error_message": "Es gab ein Fehler mit dem Event: {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.\nUUID: {}",
+      "technician_command_error_message": "Es gab ein Fehler mit dem Befehl: {} ausgelöst von {} -> {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.\nUUID: {}",
+      "welcome_message": "Hello There!\nIch heiße dich bei {} herzlichst Willkommen!",
       "welcome_message_for_team": "{} hat gerade das Irrenhaus betreten.",
-      "goodbye_message": "Schade das du uns so schnell verlässt :(",
+      "goodbye_message": "Schade, dass du uns so schnell verlässt :(",
       "afk_command_channel_missing_message": "Zu unfähig einem Sprachkanal beizutreten?",
       "afk_command_move_message": "Ich verschiebe dich ja schon... (◔_◔)",
+      "member_joined_help_voice_channel": "{} braucht hilfe, bitte kümmer dich drum :D",
       "pong": "Pong",
       "info": {
-        "title": "Gismo",
+        "title": "Krümmelmonster",
         "description": "Informationen über mich",
         "fields": {
           "version": "Version",
@@ -155,8 +151,17 @@
         },
         "footer": ""
       },
-      "user_info": {
-        "fields": {
+      "mass_move": {
+        "moved": "Alle Personen aus {} wurden nach {} verschoben.",
+        "channel_from_error": "Du musst dich in einem Voicechannel befinden oder die Option \"channel_from\" mit angeben."
+      },
+      "presence": {
+        "changed": "Presence wurde geändert.",
+        "removed": "Presence wurde entfernt.",
+        "max_char_count_exceeded": "Der Text darf nicht mehr als 128 Zeichen lang sein!"
+      },
+      "user": {
+        "atr": {
           "id": "Id",
           "name": "Name",
           "discord_join": "Discord beigetreten am",
@@ -168,27 +173,47 @@
           "lefts": "Abgänge",
           "warnings": "Verwarnungen"
         },
+        "info": {
           "footer": ""
+        },
+        "get": {
+          "xp": "{} hat {} xp",
+          "ontime": "{} war insgesamt {} Stunden aktiv in einem Sprachkanal"
+        },
+        "set": {
+          "xp": "{} hat nun {} xp",
+          "error": {
+            "value_type_not_numeric": "Der angegebende Wert ist keine Ganzzahl! :(",
+            "type_error": "Der angegebene Wert ist keine Zahl! :("
+          }
+        },
+        "remove": {
+          "xp": "Die {} von {} wurden entfernt",
+          "ontime": "Die {} von {} wurden entfernt"
+        },
+        "error": {
+          "atr_not_found": "Das Attribut {} konnte nicht gefunden werden :("
+        }
       }
     },
     "boot_log": {
       "login_message": "Ich bin on the line :D\nDer Scheiß hat {} Sekunden gedauert"
     },
     "level": {
-      "new_level_message": "<@{}> ist nun Level {}",
-      "seeding_started": "Levelsystem wird neu geladen.",
-      "seeding_failed": "Levelsystem konnte nicht neu geladen werden.",
-      "seeding_finished": "Levelsystem wurde Erfolgreich neu geladen.",
+      "new_level_message": "{} ist nun Level {}",
+      "seeding_started": "Levelsystem wird neu geladen...",
+      "seeding_failed": "Levelsystem konnte nicht neu geladen werden :(",
+      "seeding_finished": "Levelsystem wurde Erfolgreich neu geladen :)",
       "error": {
         "nothing_found": "Keine Level Einträge gefunden.",
         "level_with_name_already_exists": "Ein Level mit dem Namen {} existiert bereits!",
-        "level_with_xp_already_exists": "Das Level {} hat bereits die Mindest XP {}!"
+        "level_with_xp_already_exists": "Das Level {} hat bereits die Mindest-XP {}!"
       },
       "list": {
         "title": "Level:",
         "description": "Konfigurierte Level:",
         "name": "Name",
-        "min_xp": "Mindest XP",
+        "min_xp": "Mindest-XP",
         "permission_int": "Berechtigungen"
       },
       "create": {
@@ -248,6 +273,11 @@
         "failed": "Statistik kann nicht gelöscht werden :(",
         "success": "Statistik wurde gelöscht :D"
       }
+    },
+    "technician": {
+      "restart_message": "Bin gleich wieder da :D",
+      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, Euer Freund. Lebt lange und in Frieden :)",
+      "log_message": "Hier sind deine Logdateien! :)"
     }
   },
   "api": {

kdb-bot/src/bot_api/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/abc/__init__.py

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_api.service'
+__title__ = 'bot_api.abc'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/abc/auth_service_abc.py

@@ -70,6 +70,9 @@ class AuthServiceABC(ABC):
     @abstractmethod
     async def login_async(self, user_dto: AuthUserDTO) -> TokenDTO: pass
 
+    @abstractmethod
+    async def login_discord_async(self, oauth_dto: AuthUserDTO) -> TokenDTO: pass
+
     @abstractmethod
     async def refresh_async(self, token_dto: TokenDTO) -> TokenDTO: pass
 

kdb-bot/src/bot_api/bot-api.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "dev70"
+      "Micro": "0"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core==2022.10.0.post7"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_api/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/controller/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/controller/auth_controller.py

@@ -46,14 +46,14 @@ class AuthController:
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_all_users(self) -> Response:
         result = await self._auth_service.get_all_auth_users_async()
-        return jsonify(result.select(lambda x: x.to_dict()))
+        return jsonify(result.select(lambda x: x.to_dict()).to_list())
 
     @Route.post(f'{BasePath}/users/get/filtered')
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_filtered_users(self) -> Response:
         dto: AuthUserSelectCriteria = JSONProcessor.process(AuthUserSelectCriteria, request.get_json(force=True, silent=True))
         result = await self._auth_service.get_filtered_auth_users_async(dto)
-        result.result = result.result.select(lambda x: x.to_dict())
+        result.result = result.result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result.to_dict())
 
     @Route.get(f'{BasePath}/users/get/<email>')

kdb-bot/src/bot_api/controller/auth_discord_controller.py

@@ -82,8 +82,18 @@ class AuthDiscordController:
         ), response['id'])
         return jsonify(result.to_dict())
 
-    @Route.post(f'{BasePath}/register')
-    async def discord_register(self):
-        dto: OAuthDTO = JSONProcessor.process(OAuthDTO, request.get_json(force=True, silent=True))
-        await self._auth_service.add_auth_user_by_oauth_async(dto)
-        return '', 200
+    @Route.get(f'{BasePath}/login')
+    async def discord_login(self) -> Response:
+        response = self._get_user_from_discord_response()
+        dto = AuthUserDTO(
+            0,
+            response['username'],
+            response['discriminator'],
+            response['email'],
+            str(uuid.uuid4()),
+            None,
+            AuthRoleEnum.normal
+        )
+
+        result = await self._auth_service.login_discord_async(dto)
+        return jsonify(result.to_dict())

kdb-bot/src/bot_api/controller/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller.discord'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/controller/discord/server_controller.py

@@ -40,14 +40,14 @@ class ServerController:
     @Route.authorize(role=AuthRoleEnum.admin)
     async def get_all_servers(self) -> Response:
         result = await self._discord_service.get_all_servers()
-        result = result.select(lambda x: x.to_dict())
+        result = result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result)
 
     @Route.get(f'{BasePath}/get/servers-by-user')
     @Route.authorize
     async def get_all_servers_by_user(self) -> Response:
         result = await self._discord_service.get_all_servers_by_user()
-        result = result.select(lambda x: x.to_dict())
+        result = result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result)
 
     @Route.post(f'{BasePath}/get/filtered')
@@ -55,11 +55,11 @@ class ServerController:
     async def get_filtered_servers(self) -> Response:
         dto: ServerSelectCriteria = JSONProcessor.process(ServerSelectCriteria, request.get_json(force=True, silent=True))
         result = await self._discord_service.get_filtered_servers_async(dto)
-        result.result = result.result.select(lambda x: x.to_dict())
+        result.result = result.result.select(lambda x: x.to_dict()).to_list()
         return jsonify(result.to_dict())
 
     @Route.get(f'{BasePath}/get/<id>')
     @Route.authorize
     async def get_server_by_id(self, id: int) -> Response:
-        result = await self._discord_service.get_server_by_id_async(id)
+        result = await self._discord_service.get_server_by_id_async(id).to_list()
         return jsonify(result.to_dict())

kdb-bot/src/bot_api/event/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.event'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/exception/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.exception'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/filter/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/filter/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter.discord'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.model'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/model/discord/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.model.discord'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/route/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.route'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_api/service/auth_service.py

@@ -460,6 +460,24 @@ class AuthService(AuthServiceABC):
         self._db.save_changes()
         return TokenDTO(token, refresh_token)
 
+    async def login_discord_async(self, user_dto: AuthUserDTO) -> TokenDTO:
+        if user_dto is None:
+            raise ServiceException(ServiceErrorCode.InvalidData, 'User not set')
+
+        db_user = self._auth_users.find_auth_user_by_email(user_dto.email)
+        if db_user is None:
+            await self.add_auth_user_async(user_dto)
+            # raise ServiceException(ServiceErrorCode.InvalidUser, f'User not found')
+
+        db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
+        token = self.generate_token(db_user)
+        refresh_token = self._create_and_save_refresh_token(db_user)
+        if db_user.forgot_password_id is not None:
+            db_user.forgot_password_id = None
+
+        self._db.save_changes()
+        return TokenDTO(token, refresh_token)
+
     async def refresh_async(self, token_dto: TokenDTO) -> TokenDTO:
         if token_dto is None:
             raise ServiceException(ServiceErrorCode.InvalidData, f'Token not set')

kdb-bot/src/bot_api/transformer/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_api.transformer'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_core/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_core.service'
+__title__ = 'bot_core.abc'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -1,5 +1,7 @@
 from abc import ABC, abstractmethod
+from typing import Callable
 
+from cpl_query.extension import List
 from discord.ext.commands import Context
 
 
@@ -14,11 +16,20 @@ class ClientUtilsServiceABC(ABC):
     @abstractmethod
     def moved_user(self, guild_id: int): pass
 
+    @abstractmethod
+    def moved_users(self, guild_id: int, count: int): pass
+
     @abstractmethod
     def get_client(self, dc_ic: int, guild_id: int): pass
 
+    @abstractmethod
+    async def check_if_bot_is_ready_yet(self) -> bool: pass
+
     @abstractmethod
     async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool: pass
 
     @abstractmethod
     async def presence_game(self, t_key: str): pass
+
+    @abstractmethod
+    def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List: pass

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

@@ -13,10 +13,14 @@ class CustomFileLoggerABC(Logger, ABC):
     @abstractmethod
     def __init__(self, key: str, config: ConfigurationABC, time_format: TimeFormatSettings, env: ApplicationEnvironmentABC):
         self._key = key
-        settings: LoggingSettings = config.get_configuration(f'{FileLoggingSettings.__name__}_{key}')
-        Logger.__init__(self, settings, time_format, env)
+        self._settings: LoggingSettings = config.get_configuration(f'{FileLoggingSettings.__name__}_{key}')
+        Logger.__init__(self, self._settings, time_format, env)
         self._begin_log()
 
+    @property
+    def settings(self) -> LoggingSettings:
+        return self._settings
+
     def _begin_log(self):
         console_level = self._console.value
         self._console = LoggingLevelEnum.OFF

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

@@ -25,7 +25,7 @@ class MessageServiceABC(ABC):
     async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False): pass
 
     @abstractmethod
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, wait_before_delete: int = None, without_tracking=True): pass
+    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True): pass
 
     @abstractmethod
-    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=True): pass
+    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True, **kwargs): pass

kdb-bot/src/bot_core/bot-core.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "dev70"
+      "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=0.3.dev70"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_core/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -15,7 +15,7 @@ __title__ = 'bot_core.core_extension'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -0,0 +1,30 @@
+from cpl_core.application import ApplicationExtensionABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_translation import TranslatePipe
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
+from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
+from bot_core.helper.command_checks import CommandChecks
+from bot_core.helper.event_checks import EventChecks
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class CoreExtension(ApplicationExtensionABC):
+
+    def __init__(self):
+        ApplicationExtensionABC.__init__(self)
+
+    async def run(self, config: ConfigurationABC, services: ServiceProviderABC):
+        feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
+        if not feature_flags.get_flag(FeatureFlagsEnum.core_module):
+            return
+
+        permissions: PermissionServiceABC = services.get_service(PermissionServiceABC)
+        client_utils: ClientUtilsServiceABC = services.get_service(ClientUtilsServiceABC)
+        message_service: MessageServiceABC = services.get_service(MessageServiceABC)
+        t: TranslatePipe = services.get_service(TranslatePipe)
+        CommandChecks.init(permissions, client_utils, message_service, t)
+        EventChecks.init(client_utils)

kdb-bot/src/bot_core/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.events'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_core/exception/__init__.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+"""
+bot Keksdose bot
+~~~~~~~~~~~~~~~~~~~
+
+Discord bot  for the Keksdose discord Server
+
+:copyright: (c) 2022 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'bot_core.exception'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
+__version__ = '0.3.0'
+
+from collections import namedtuple
+
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_core/exception/check_error.py

@@ -0,0 +1,7 @@
+from discord.ext.commands import CommandError
+
+
+class CheckError(CommandError):
+
+    def __init__(self, message, *args):
+        CommandError.__init__(self, message, *args)

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

@@ -15,7 +15,7 @@ __title__ = 'bot_core.helper'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -0,0 +1,76 @@
+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_service_abc import ClientUtilsServiceABC
+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 CommandChecks:
+    _permissions: Optional[PermissionServiceABC] = None
+    _client_utils: Optional[ClientUtilsServiceABC] = None
+    _message_service: Optional[MessageServiceABC] = None
+    _t: Optional[TranslatePipe] = None
+
+    @classmethod
+    def init(
+            cls,
+            permissions: PermissionServiceABC,
+            client_utils: ClientUtilsServiceABC,
+            message_service: MessageServiceABC,
+            translate: TranslatePipe,
+    ):
+        cls._permissions = permissions
+        cls._client_utils = client_utils
+        cls._message_service = message_service
+        cls._t = translate
+
+    @classmethod
+    def check_is_ready(cls):
+        async def check_if_bot_is_ready_yet_and_respond(ctx: Context) -> bool:
+            result = await cls._client_utils.check_if_bot_is_ready_yet_and_respond(ctx)
+            if not result:
+                raise CheckError(f'Bot is not ready')
+            return result
+
+        return commands.check(check_if_bot_is_ready_yet_and_respond)
+
+    @classmethod
+    def check_is_member_admin(cls):
+        async def check_is_member_admin(ctx: Context):
+            has_permission = cls._permissions.is_member_admin(ctx.author)
+            if not has_permission:
+                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
+                raise CheckError(f'Member {ctx.author.name} is not admin')
+
+            return has_permission
+
+        return commands.check(check_is_member_admin)
+
+    @classmethod
+    def check_is_member_technician(cls):
+        async def check_is_member_technician(ctx: Context):
+            has_permission = cls._permissions.is_member_technician(ctx.author)
+            if not has_permission:
+                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
+                raise CheckError(f'Member {ctx.author.name} is not technician')
+
+            return has_permission
+
+        return commands.check(check_is_member_technician)
+
+    @classmethod
+    def check_is_member_moderator(cls):
+        async def check_is_member_moderator(ctx: Context):
+            has_permission = cls._permissions.is_member_moderator(ctx.author)
+            if not has_permission:
+                await cls._message_service.send_ctx_msg(ctx, cls._t.transform('common.no_permission_message'))
+                raise CheckError(f'Member {ctx.author.name} is not moderator')
+
+            return has_permission
+
+        return commands.check(check_is_member_moderator)

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

@@ -0,0 +1,31 @@
+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_service_abc import ClientUtilsServiceABC
+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:
+    _client_utils: Optional[ClientUtilsServiceABC] = None
+
+    @classmethod
+    def init(
+            cls,
+            client_utils: ClientUtilsServiceABC,
+    ):
+        cls._client_utils = client_utils
+
+    @classmethod
+    def check_is_ready(cls):
+        async def check_if_bot_is_ready() -> bool:
+            result = await cls._client_utils.check_if_bot_is_ready()
+            if not result:
+                raise CheckError(f'Bot is not ready')
+            return result
+
+        return commands.check(check_if_bot_is_ready)

kdb-bot/src/bot_core/logging/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_core/pipes/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_core.pipes'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -15,7 +15,7 @@ __title__ = 'bot_core.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -1,10 +1,14 @@
+from typing import Callable
+
 import discord
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 
 from cpl_discord.service import DiscordBotServiceABC
+from cpl_query.extension import List
 from cpl_translation import TranslatePipe
+from discord import app_commands
 from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
@@ -54,19 +58,32 @@ class ClientUtilsService(ClientUtilsServiceABC):
         self._clients.update_client(client)
         self._db.save_changes()
 
+    def moved_users(self, guild_id: int, count: int):
+        server = self._servers.get_server_by_discord_id(guild_id)
+        client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.server_id)
+        client.moved_users_count += count
+        self._clients.update_client(client)
+        self._db.save_changes()
+
     def get_client(self, dc_ic: int, guild_id: int):
         server = self._servers.get_server_by_discord_id(guild_id)
         client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.server_id)
         return client
 
-    async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool:
+    async def check_if_bot_is_ready_yet(self) -> bool:
         if self._config.get_configuration('IS_READY') == 'true':
             return True
 
         self._logger.debug(__name__, f'Bot is not ready yet {self._t.transform("common.errors.bot_not_ready_yet")}')
-        await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
         return False
 
+    async def check_if_bot_is_ready_yet_and_respond(self, ctx: Context) -> bool:
+        result = await self.check_if_bot_is_ready_yet()
+        if not result:
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
+
+        return result
+
     async def presence_game(self, t_key: str):
         if not self._feature_flags.get_flag(FeatureFlagsEnum.presence):
             return
@@ -75,3 +92,17 @@ class ClientUtilsService(ClientUtilsServiceABC):
         name = self._t.transform(t_key).format(bot.__version__)
         await self._bot.change_presence(activity=discord.Game(name=name))
         self._logger.info(__name__, f'Set presence {name}')
+
+    def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List:
+        if current != '':
+            if select is None:
+                select = lambda x: x
+
+            sl = _l.select(select)
+            sl = sl.where(lambda x: current in x)
+            if current in sl:
+                sl = sl.skip(sl.index_of(current))
+
+            _l = _l.where(lambda x: x.name in sl)
+
+        return _l.take(25)

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

@@ -89,7 +89,7 @@ class MessageService(MessageServiceABC):
                 self._db.save_changes()
             self._logger.info(__name__, f'Sent message to user {receiver.id}')
     
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
+    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False):
         if ctx is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
@@ -99,9 +99,9 @@ class MessageService(MessageServiceABC):
         msg = None
         try:
             if isinstance(message, discord.Embed):
-                msg = await ctx.send(embed=message, file=file)
+                msg = await ctx.send(embed=message, file=file, ephemeral=not is_public)
             else:
-                msg = await ctx.send(message, file=file)
+                msg = await ctx.send(message, file=file, ephemeral=not is_public)
         except Exception as e:
             self._logger.error(__name__, f'Send message to channel {ctx.channel.id} failed', e)
         else:
@@ -119,7 +119,7 @@ class MessageService(MessageServiceABC):
             if ctx.guild is not None:
                 await self.delete_message(msg, without_tracking)
 
-    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
+    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False, **kwargs):
         if interaction is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
@@ -128,9 +128,9 @@ class MessageService(MessageServiceABC):
         self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {interaction.channel}')
         try:
             if isinstance(message, discord.Embed):
-                await interaction.response.send_message(embed=message)
+                await interaction.response.send_message(embed=message, ephemeral=not is_public, **kwargs)
             else:
-                await interaction.response.send_message(message)
+                await interaction.response.send_message(message, ephemeral=not is_public, **kwargs)
         except Exception as e:
             self._logger.error(__name__, f'Send message to channel {interaction.channel.id} failed', e)
         else:

kdb-bot/src/bot_data/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_data'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_data/abc/__init__.py

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_data.service'
+__title__ = 'bot_data.abc'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_data/abc/user_joined_voice_channel_abc.py

@@ -35,3 +35,6 @@ class UserJoinedVoiceChannelRepositoryABC(ABC):
     
     @abstractmethod
     def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel): pass
+
+    @abstractmethod
+    def delete_user_joined_voice_channel_by_user_id(self, user_id: int): pass

kdb-bot/src/bot_data/bot-data.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "dev70"
+      "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,10 +16,10 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core>=0.3.dev70"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_data/migration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_data.migration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_data/migration/auto_role_fix1_migration.py

@@ -0,0 +1,29 @@
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_data.abc.migration_abc import MigrationABC
+from bot_data.db_context import DBContext
+
+
+class AutoRoleFix1Migration(MigrationABC):
+    name = '0.3.0_AutoRoleMigration'
+
+    def __init__(self, logger: DatabaseLogger, db: DBContext):
+        MigrationABC.__init__(self)
+        self._logger = logger
+        self._db = db
+        self._cursor = db.cursor
+
+    def upgrade(self):
+        self._logger.debug(__name__, 'Running upgrade')
+
+        self._cursor.execute(
+            str(f"""
+            ALTER TABLE AutoRoles ADD DiscordChannelId BIGINT NOT NULL AFTER ServerId;
+            """)
+        )
+
+    def downgrade(self):
+        self._cursor.execute(
+            str(f"""
+            ALTER TABLE AutoRoles DROP COLUMN DiscordChannelId;
+            """)
+        )

kdb-bot/src/bot_data/model/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_data.model'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_data/model/auto_role.py

@@ -6,9 +6,10 @@ from cpl_core.database import TableABC
 
 class AutoRole(TableABC):
 
-    def __init__(self, server_id: int, dc_message_id: int, created_at: datetime=None, modified_at: datetime=None, id=0):
+    def __init__(self, server_id: int, dc_channel_id: int, dc_message_id: int, created_at: datetime=None, modified_at: datetime=None, id=0):
         self._auto_role_id = id
         self._server_id = server_id
+        self._discord_channel_id = dc_channel_id
         self._discord_message_id = dc_message_id
         
         TableABC.__init__(self)
@@ -23,6 +24,10 @@ class AutoRole(TableABC):
     def server_id(self) -> int:
         return self._server_id
 
+    @property
+    def discord_channel_id(self) -> int:
+        return self._discord_channel_id
+
     @property
     def discord_message_id(self) -> int:
         return self._discord_message_id
@@ -58,9 +63,10 @@ class AutoRole(TableABC):
     def insert_string(self) -> str:
         return str(f"""
             INSERT INTO `AutoRoles` (
-                `ServerId`, `DiscordMessageId`, `CreatedAt`, `LastModifiedAt`
+                `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `CreatedAt`, `LastModifiedAt`
             ) VALUES (
                 {self._server_id},
+                {self._discord_channel_id},
                 {self._discord_message_id},
                 '{self._created_at}',
                 '{self._modified_at}'
@@ -72,6 +78,7 @@ class AutoRole(TableABC):
         return str(f"""
             UPDATE `AutoRoles`
             SET `ServerId` = {self._server_id},
+            `DiscordChannelId` = {self._discord_channel_id},
             `DiscordMessageId` = {self._discord_message_id},
             `LastModifiedAt` = '{self._modified_at}'
             WHERE `AutoRoleId` = {self._auto_role_id};

kdb-bot/src/bot_data/model/user_joined_voice_channel.py

@@ -119,3 +119,10 @@ class UserJoinedVoiceChannel(TableABC):
             DELETE FROM `UserJoinedVoiceChannel`
             WHERE `JoinId` = {self._join_id};
         """)
+
+    @staticmethod
+    def delete_by_user_id_string(id: int) -> str:
+        return str(f"""
+            DELETE FROM `UserJoinedVoiceChannel`
+            WHERE `UserId` = {id}
+    """)

kdb-bot/src/bot_data/service/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'bot_data.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/bot_data/service/auto_role_repository_service.py

@@ -27,6 +27,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
                 result[2],
                 result[3],
                 result[4],
+                result[5],
                 id=result[0]
             ))
 
@@ -40,6 +41,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
             result[2],
             result[3],
             result[4],
+            result[5],
             id=result[0]
         )
 
@@ -56,6 +58,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
             result[2],
             result[3],
             result[4],
+            result[5],
             id=result[0]
         )
 
@@ -69,6 +72,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
                 result[2],
                 result[3],
                 result[4],
+                result[5],
                 id=result[0]
             ))
 
@@ -82,6 +86,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
             result[2],
             result[3],
             result[4],
+            result[5],
             id=result[0]
         )
 
@@ -98,6 +103,7 @@ class AutoRoleRepositoryService(AutoRoleRepositoryABC):
             result[2],
             result[3],
             result[4],
+            result[5],
             id=result[0]
         )
 

kdb-bot/src/bot_data/service/user_joined_voice_channel_service.py

@@ -121,3 +121,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
     def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
         self._logger.trace(__name__, f'Send SQL command: {user_joined_voice_channel.delete_string}')
         self._context.cursor.execute(user_joined_voice_channel.delete_string)
+
+    def delete_user_joined_voice_channel_by_user_id(self, user_id: int):
+        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.delete_by_user_id_string}')
+        self._context.cursor.execute(UserJoinedVoiceChannel.delete_by_user_id_string(user_id))

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

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports: 
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/auto_role/auto-role.json

@@ -2,8 +2,8 @@
   "ProjectSettings": {
     "Name": "auto-role",
     "Version": {
-      "Major": "1",
-      "Minor": "0",
+      "Major": "0",
+      "Minor": "3",
       "Micro": "0"
     },
     "Author": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post5"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

@@ -9,7 +9,7 @@ from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from modules.auto_role.command.auto_role_group import AutoRoleGroup
 from modules.auto_role.events.auto_role_on_raw_reaction_add import AutoRoleOnRawReactionAddEvent
 from modules.auto_role.events.auto_role_on_raw_reaction_remove import AutoRoleOnRawReactionRemoveEvent
-from modules.auto_role.helper.reaction_handler import ReactionHandler
+from modules.auto_role.helper.auto_role_reaction_handler import AutoRoleReactionHandler
 
 
 class AutoRoleModule(ModuleABC):
@@ -21,7 +21,7 @@ class AutoRoleModule(ModuleABC):
         pass
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
-        services.add_transient(ReactionHandler)
+        services.add_transient(AutoRoleReactionHandler)
         # commands
         self._dc.add_command(AutoRoleGroup)
         # events

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

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -1,4 +1,4 @@
-from typing import List as TList, Optional
+from typing import List as TList, Optional, Any
 
 import discord
 from cpl_core.database.context import DatabaseContextABC
@@ -13,6 +13,7 @@ from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
@@ -49,6 +50,11 @@ class AutoRoleGroup(DiscordCommandABC):
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
+    async def _auto_role_auto_complete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
+        server = self._servers.get_server_by_discord_id(interaction.guild.id)
+        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
+        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in self._client_utils.get_auto_complete_list(auto_roles, current)]
+
     @commands.hybrid_group(name="auto-role")
     @commands.guild_only()
     async def auto_role(self, ctx: Context):
@@ -56,16 +62,10 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command(alias='auto-roles')
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, wait: int = None):
         self._logger.debug(__name__, f'Received command auto-role list {ctx}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role list')
-            return
 
         if ctx.guild is None:
             return
@@ -95,21 +95,15 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def add(self, ctx: Context, channel: discord.TextChannel, message_id: str):
         self._logger.debug(__name__, f'Received command auto-role add {ctx} {message_id}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role add')
-            return
 
         message = List(discord.Message, [message async for message in channel.history(limit=50)]).where(lambda m: m.id == int(message_id)).single_or_default()
         if message is None:
             self._logger.debug(__name__, f'Message with id {message_id} not found in {channel.name}')
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.auto_role.add.error.not_found').format(message_id, channel.name))
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.auto_role.add.error.not_found').format(message_id, channel.mention))
             self._logger.trace(__name__, f'Finished command auto-role add')
             return
 
@@ -120,7 +114,7 @@ class AutoRoleGroup(DiscordCommandABC):
             return
 
         server_id = self._servers.get_server_by_discord_id(ctx.guild.id).server_id
-        self._auto_roles.add_auto_role(AutoRole(server_id, int(message_id)))
+        self._auto_roles.add_auto_role(AutoRole(server_id, int(channel.id), int(message_id)))
         self._db_context.save_changes()
         self._logger.info(__name__, f'Saved auto-role for message {message_id} at server {server_id}')
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.auto_role.add.success').format(message_id))
@@ -142,16 +136,10 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @auto_role.command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def remove(self, ctx: Context, auto_role: int):
         self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role remove')
-            return
 
         auto_role_from_db = self._auto_roles.find_auto_role_by_id(auto_role)
         if auto_role_from_db is None:
@@ -172,9 +160,7 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @remove.autocomplete('auto_role')
     async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        server = self._servers.get_server_by_discord_id(interaction.guild.id)
-        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
-        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
+        return await self._auto_role_auto_complete(interaction, current)
 
     @auto_role.group()
     @commands.guild_only()
@@ -183,16 +169,10 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @rule.command(alias='rules')
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def list(self, ctx: Context, auto_role: int, wait: int = None):
         self._logger.debug(__name__, f'Received command auto-role rule list {ctx}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role rule list')
-            return
 
         embed = discord.Embed(
             title=self._t.transform('modules.auto_role.list.title'),
@@ -221,22 +201,14 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @list.autocomplete('auto_role')
     async def list_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        server = self._servers.get_server_by_discord_id(interaction.guild.id)
-        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
-        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
+        return await self._auto_role_auto_complete(interaction, current)
 
     @rule.command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def add(self, ctx: Context, auto_role: int, emoji_name: str, role_id: str):
         self._logger.debug(__name__, f'Received command auto-role add {ctx} {auto_role}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role rule add')
-            return
 
         emoji = discord.utils.get(self._bot.emojis, name=emoji_name)
         if emoji is None:
@@ -267,8 +239,9 @@ class AutoRoleGroup(DiscordCommandABC):
         self._db_context.save_changes()
         rule = self._auto_roles.get_auto_role_rules_by_auto_role_id(auto_role).where(lambda r: r.emoji_name == emoji.name and int(role_id) == role.id).single()
         try:
-            message = await ctx.fetch_message(auto_role_from_db.discord_message_id)
             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:
@@ -279,37 +252,29 @@ class AutoRoleGroup(DiscordCommandABC):
         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)
 
-        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.auto_role.rule.add.success').format(emoji, role.name, auto_role))
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.auto_role.rule.add.success').format(emoji, role.mention, auto_role))
         self._logger.trace(__name__, f'Finished command auto-role rule add')
 
     @add.autocomplete('auto_role')
     async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        server = self._servers.get_server_by_discord_id(interaction.guild.id)
-        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
-        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
+        return await self._auto_role_auto_complete(interaction, current)
 
     @add.autocomplete('emoji_name')
     async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        emojis = interaction.guild.emojis
-        return [app_commands.Choice(name=emoji.name, value=emoji.name) for emoji in emojis]
+        emojis = List(discord.Emoji, interaction.guild.emojis)
+        return [app_commands.Choice(name=emoji.name, value=emoji.name) for emoji in self._client_utils.get_auto_complete_list(emojis, current, lambda e: e.name)]
 
     @add.autocomplete('role_id')
     async def rule_add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        roles = interaction.guild.roles
-        return [app_commands.Choice(name=role.name, value=str(role.id)) for role in roles]
+        roles = List(discord.Role, interaction.guild.roles)
+        return [app_commands.Choice(name=role.name, value=str(role.id)) for role in self._client_utils.get_auto_complete_list(roles, current, lambda r: r.name)]
 
     @rule.command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def remove(self, ctx: Context, auto_role_rule: int):
         self._logger.debug(__name__, f'Received command auto-role remove {ctx} {auto_role_rule}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
-
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished command auto-role remove')
-            return
 
         auto_role_from_db = self._auto_roles.get_auto_role_rule_by_id(auto_role_rule)
         if auto_role_from_db is None:
@@ -329,4 +294,10 @@ class AutoRoleGroup(DiscordCommandABC):
         server = self._servers.get_server_by_discord_id(interaction.guild.id)
         auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
         rules = auto_roles.select_many(lambda ar: self._auto_roles.get_auto_role_rules_by_auto_role_id(ar))
-        return [app_commands.Choice(name=f'{rule.auto_role_rule_id} {rule.emoji_name} {interaction.guild.get_role(int(rule.role_id))}', value=rule.auto_role_rule_id) for rule in rules]
+        return [
+            app_commands.Choice(
+                name=f'{rule.auto_role_rule_id} {rule.emoji_name} {interaction.guild.get_role(int(rule.role_id))}',
+                value=rule.auto_role_rule_id
+            )
+            for rule in self._client_utils.get_auto_complete_list(rules, current, lambda r: r.auto_role_rule_id)
+        ]

kdb-bot/src/modules/auto_role/events/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.events'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/auto_role/events/auto_role_on_raw_reaction_add.py

@@ -3,9 +3,10 @@ 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 bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from modules.auto_role.helper.reaction_handler import ReactionHandler
+from modules.auto_role.helper.auto_role_reaction_handler import AutoRoleReactionHandler
 
 
 class AutoRoleOnRawReactionAddEvent(OnRawReactionAddABC):
@@ -16,7 +17,7 @@ class AutoRoleOnRawReactionAddEvent(OnRawReactionAddABC):
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             auto_roles: AutoRoleRepositoryABC,
-            reaction_handler: ReactionHandler
+            reaction_handler: AutoRoleReactionHandler
     ):
         OnRawReactionAddABC.__init__(self)
 
@@ -26,6 +27,7 @@ class AutoRoleOnRawReactionAddEvent(OnRawReactionAddABC):
         self._auto_roles = auto_roles
         self._reaction_handler = reaction_handler
 
+    @EventChecks.check_is_ready()
     async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
         self._logger.debug(__name__, f'Module {type(self)} started')
 

kdb-bot/src/modules/auto_role/events/auto_role_on_raw_reaction_remove.py

@@ -3,9 +3,10 @@ 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 bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from modules.auto_role.helper.reaction_handler import ReactionHandler
+from modules.auto_role.helper.auto_role_reaction_handler import AutoRoleReactionHandler
 
 
 class AutoRoleOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
@@ -16,7 +17,7 @@ class AutoRoleOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             auto_roles: AutoRoleRepositoryABC,
-            reaction_handler: ReactionHandler
+            reaction_handler: AutoRoleReactionHandler
     ):
         OnRawReactionRemoveABC.__init__(self)
 
@@ -26,6 +27,7 @@ class AutoRoleOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
         self._auto_roles = auto_roles
         self._reaction_handler = reaction_handler
 
+    @EventChecks.check_is_ready()
     async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
         self._logger.debug(__name__, f'Module {type(self)} started')
 

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

@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.helper'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -10,7 +10,7 @@ from bot_data.model.auto_role import AutoRole
 from bot_data.model.auto_role_rule import AutoRoleRule
 
 
-class ReactionHandler:
+class AutoRoleReactionHandler:
 
     def __init__(
             self,

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

@@ -15,7 +15,7 @@ __title__ = 'modules.base'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/base/abc/__init__.py

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'modules.base.service'
+__title__ = 'modules.base.abc'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/base/base.json

@@ -2,8 +2,8 @@
   "ProjectSettings": {
     "Name": "base",
     "Version": {
-      "Major": "1",
-      "Minor": "0",
+      "Major": "0",
+      "Minor": "3",
       "Micro": "0"
     },
     "Author": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core>=2022.10.0.post2"
+      "cpl-core==2022.12.0"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.10.0"
+      "cpl-cli==2022.12.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

@@ -10,17 +10,21 @@ from modules.base.abc.base_helper_abc import BaseHelperABC
 from modules.base.command.afk_command import AFKCommand
 from modules.base.command.help_command import HelpCommand
 from modules.base.command.info_command import InfoCommand
+from modules.base.command.mass_move_command import MassMoveCommand
 from modules.base.command.ping_command import PingCommand
+from modules.base.command.presence_command import PresenceCommand
 from modules.base.command.purge_command import PurgeCommand
-from modules.base.command.restart_command import RestartCommand
-from modules.base.command.shutdown_command import ShutdownCommand
 from modules.base.command.user_group import UserGroup
 from modules.base.events.base_on_command_error_event import BaseOnCommandErrorEvent
 from modules.base.events.base_on_command_event import BaseOnCommandEvent
 from modules.base.events.base_on_member_join_event import BaseOnMemberJoinEvent
 from modules.base.events.base_on_member_remove_event import BaseOnMemberRemoveEvent
 from modules.base.events.base_on_message_event import BaseOnMessageEvent
+from modules.base.events.base_on_raw_reaction_add import BaseOnRawReactionAddEvent
+from modules.base.events.base_on_raw_reaction_remove import BaseOnRawReactionRemoveEvent
 from modules.base.events.base_on_voice_state_update_event import BaseOnVoiceStateUpdateEvent
+from modules.base.events.base_on_voice_state_update_event_help_channel import BaseOnVoiceStateUpdateEventHelpChannel
+from modules.base.helper.base_reaction_handler import BaseReactionHandler
 from modules.base.service.base_helper_service import BaseHelperService
 
 
@@ -34,14 +38,15 @@ class BaseModule(ModuleABC):
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(BaseHelperABC, BaseHelperService)
+        services.add_transient(BaseReactionHandler)
         # commands
         self._dc.add_command(AFKCommand)
         self._dc.add_command(HelpCommand)
         self._dc.add_command(InfoCommand)
+        self._dc.add_command(MassMoveCommand)
         self._dc.add_command(PingCommand)
+        self._dc.add_command(PresenceCommand)
 
-        self._dc.add_command(RestartCommand)
-        self._dc.add_command(ShutdownCommand)
         self._dc.add_command(PurgeCommand)
         self._dc.add_command(UserGroup)
         # events
@@ -50,4 +55,7 @@ class BaseModule(ModuleABC):
         self._dc.add_event(DiscordEventTypesEnum.on_member_join.value, BaseOnMemberJoinEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_member_remove.value, BaseOnMemberRemoveEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_message.value, BaseOnMessageEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_add.value, BaseOnRawReactionAddEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_raw_reaction_remove.value, BaseOnRawReactionRemoveEvent)
         self._dc.add_event(DiscordEventTypesEnum.on_voice_state_update.value, BaseOnVoiceStateUpdateEvent)
+        self._dc.add_event(DiscordEventTypesEnum.on_voice_state_update.value, BaseOnVoiceStateUpdateEventHelpChannel)

kdb-bot/src/modules/base/command/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.base.command'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/base/command/afk_command.py

@@ -8,6 +8,7 @@ from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -36,11 +37,9 @@ class AFKCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
     async def afk(self, ctx: Context):
         self._logger.debug(__name__, f'Received command afk {ctx}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
         settings: BaseServerSettings = self._config.get_configuration(f'BaseServerSettings_{ctx.guild.id}')
 
         if ctx.author.voice is None or ctx.author.voice.channel is None:

kdb-bot/src/modules/base/command/help_command.py

@@ -10,6 +10,7 @@ from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from modules.base.configuration.base_server_settings import BaseServerSettings
 
@@ -36,14 +37,12 @@ class HelpCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
     async def help(self, ctx: Context, persistent_flag: str = None):
         self._logger.debug(__name__, f'Received command help {ctx}:{persistent_flag}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
         settings: BaseServerSettings = self._config.get_configuration(f'BaseServerSettings_{ctx.guild.id}')
         is_persistent = persistent_flag == '--stay'
-        await self._message_service.send_ctx_msg(ctx, settings.help_command_reference_url, is_persistent=is_persistent)
+        await self._message_service.send_ctx_msg(ctx, settings.help_command_reference_url, is_persistent=is_persistent, is_public=True)
         self._logger.trace(__name__, f'Finished help command')
 
     @help.autocomplete('persistent_flag')

kdb-bot/src/modules/base/command/info_command.py

@@ -11,6 +11,7 @@ from discord.ext.commands import Context
 import bot
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 
 
@@ -38,11 +39,9 @@ class InfoCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
     async def info(self, ctx: Context, *, wait: int = None):
         self._logger.debug(__name__, f'Received command info {ctx},{wait}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
         client = self._client_utils.get_client(self._bot.user.id, ctx.guild.id)
 
         embed = discord.Embed(

kdb-bot/src/modules/base/command/mass_move_command.py

@@ -0,0 +1,54 @@
+import asyncio
+
+import discord
+from cpl_discord.command import DiscordCommandABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
+from bot_core.logging.command_logger import CommandLogger
+from bot_core.service.client_utils_service import ClientUtilsService
+
+
+class MassMoveCommand(DiscordCommandABC):
+
+    def __init__(
+            self,
+            logger: CommandLogger,
+            message_service: MessageServiceABC,
+            bot: DiscordBotServiceABC,
+            translate: TranslatePipe,
+            client_utils: ClientUtilsService
+    ):
+        DiscordCommandABC.__init__(self)
+        self._logger = logger
+        self._message_service = message_service
+        self._bot = bot
+        self._t = translate
+        self._client_utils = client_utils
+
+    @commands.hybrid_command(name='mass-move')
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def mass_move(self, ctx: Context, channel_to: discord.VoiceChannel,
+                        channel_from: discord.VoiceChannel = None):
+        self._logger.debug(__name__, f'Received command mass-move {ctx}')
+
+        if channel_from is None and ctx.author.voice is None:
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.mass_move.channel_from_error'))
+            return
+
+        if channel_from is None:
+            channel_from = ctx.author.voice.channel
+
+        moves = [member.move_to(channel_to) for member in channel_from.members]
+        move_count = len(moves)
+        await asyncio.gather(*moves)
+        self._client_utils.moved_users(ctx.guild.id, move_count)
+
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.mass_move.moved').format(channel_from.mention, channel_to.mention))
+
+        self._logger.trace(__name__, f'Finished mass-move command')

kdb-bot/src/modules/base/command/ping_command.py

@@ -1,3 +1,4 @@
+import discord
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
@@ -6,7 +7,12 @@ from discord.ext.commands import Context
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from modules.base.abc.base_helper_abc import BaseHelperABC
+from modules.base.configuration.base_server_settings import BaseServerSettings
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
 class PingCommand(DiscordCommandABC):
@@ -17,7 +23,10 @@ class PingCommand(DiscordCommandABC):
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
             client_utils: ClientUtilsServiceABC,
-            translate: TranslatePipe
+            translate: TranslatePipe,
+            permissions: PermissionServiceABC,
+            base_helper: BaseHelperABC,
+            servers: ServerRepositoryABC,
     ):
         DiscordCommandABC.__init__(self)
 
@@ -26,15 +35,34 @@ class PingCommand(DiscordCommandABC):
         self._bot = bot
         self._client_utils = client_utils
         self._t = translate
+        self._permissions = permissions
+        self._base_helper = base_helper
+        self._servers = servers
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
+    @staticmethod
+    def _get_ping(url: str) -> float:
+        from icmplib import ping
+        ping_result = ping(url, count=4, interval=0.2, privileged=False)
+        return ping_result.avg_rtt
+
     @commands.hybrid_command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
     async def ping(self, ctx: Context):
         self._logger.debug(__name__, f'Received command ping {ctx}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
+        if self._permissions.is_member_technician(ctx.author):
+            embed = discord.Embed(
+                title=self._t.transform('modules.base.info.title'),
+                description=self._t.transform('modules.base.info.description'),
+                color=int('ef9d0d', 16)
+            )
+            server = self._servers.get_server_by_discord_id(ctx.guild.id)
+            settings: BaseServerSettings = self._base_helper.get_config(server.discord_server_id)
+            for server in settings.ping_urls:
+                embed.add_field(name=server, value=f'{self._get_ping(server)} ms', inline=False)
+            await self._message_service.send_ctx_msg(ctx, embed)
+        else:
             await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.pong'))
         self._logger.trace(__name__, f'Finished ping command')

kdb-bot/src/modules/base/command/presence_command.py

@@ -0,0 +1,48 @@
+import discord
+from cpl_discord.command import DiscordCommandABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+from discord.ext import commands
+from discord.ext.commands import Context
+
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
+from bot_core.logging.command_logger import CommandLogger
+
+
+class PresenceCommand(DiscordCommandABC):
+
+    def __init__(
+            self,
+            logger: CommandLogger,
+            message_service: MessageServiceABC,
+            bot: DiscordBotServiceABC,
+            translate: TranslatePipe,
+    ):
+        DiscordCommandABC.__init__(self)
+
+        self._logger = logger
+        self._message_service = message_service
+        self._bot = bot
+        self._t = translate
+
+    @commands.hybrid_command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def presence(self, ctx: Context, text: str = ''):
+        self._logger.debug(__name__, f'Received command presence {ctx}')
+
+        if text == '':
+            await self._bot.change_presence(activity=None)
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.presence.removed'))
+            return
+
+        if len(text) > 128:
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.presence.max_char_count_exceeded'))
+            return
+
+        await self._bot.change_presence(activity=discord.Game(name=text))
+        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.presence.changed'))
+
+        self._logger.trace(__name__, f'Finished presence command')

kdb-bot/src/modules/base/command/purge_command.py

@@ -9,6 +9,7 @@ from discord.ext.commands import Context
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.server_settings import ServerSettings
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
@@ -37,18 +38,12 @@ class PurgeCommand(DiscordCommandABC):
 
     @commands.hybrid_command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
     async def purge(self, ctx: Context):
         self._logger.debug(__name__, f'Received command purge {ctx}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
         server_settings: ServerSettings = self._config.get_configuration(f'ServerSettings_{ctx.guild.id}')
 
-        if not self._permissions.is_member_moderator(ctx.author):
-            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished purge command')
-            return
-
         await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.moderator.purge_message'))
         await asyncio.sleep(server_settings.message_delete_timer)
         try:

kdb-bot/src/modules/base/command/user_group.py

@@ -1,21 +1,26 @@
-from typing import Optional
+from typing import Optional, List
 
 import discord
 from cpl_core.configuration import ConfigurationABC
+from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.command import DiscordCommandABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
+from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
+from mysql.connector.errors import DatabaseError
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.command_checks import CommandChecks
 from bot_core.logging.command_logger import CommandLogger
 from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
+from modules.level.service.level_service import LevelService
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
@@ -30,11 +35,13 @@ class UserGroup(DiscordCommandABC):
             client_utils: ClientUtilsServiceABC,
             permissions: PermissionServiceABC,
             servers: ServerRepositoryABC,
+            db: DatabaseContextABC,
             users: UserRepositoryABC,
             user_joined_servers: UserJoinedServerRepositoryABC,
             user_joined_voice_channel: UserJoinedVoiceChannelRepositoryABC,
             translate: TranslatePipe,
-            date: DateTimeOffsetPipe
+            date: DateTimeOffsetPipe,
+            level: LevelService
     ):
         DiscordCommandABC.__init__(self)
 
@@ -45,14 +52,23 @@ class UserGroup(DiscordCommandABC):
         self._client_utils = client_utils
         self._permissions = permissions
         self._servers = servers
+        self._db = db
         self._users = users
         self._user_joined_servers = user_joined_servers
         self._user_joined_voice_channel = user_joined_voice_channel
         self._t = translate
         self._date = date
+        self._level = level
 
         self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 
+        self._atr_dict = {
+            "xp": self._t.transform('modules.base.user.atr.xp'),
+            'ontime': self._t.transform('modules.base.user.atr.ontime')
+        }
+
+        self._atr_list = [(key, self._atr_dict[key]) for key in self._atr_dict]
+
     @commands.hybrid_group()
     @commands.guild_only()
     async def user(self, ctx: Context):
@@ -60,15 +76,13 @@ class UserGroup(DiscordCommandABC):
 
     @user.command()
     @commands.guild_only()
+    @CommandChecks.check_is_ready()
     async def info(self, ctx: Context, member: Optional[discord.Member] = None, *, wait: int = None):
         self._logger.debug(__name__, f'Received command user-info {ctx}:{member},{wait}')
-        if not await self._client_utils.check_if_bot_is_ready_yet_and_respond(ctx):
-            return
-        self._client_utils.received_command(ctx.guild.id)
 
-        if not self._permissions.is_member_moderator(ctx.author):
+        is_mod = self._permissions.is_member_moderator(ctx.author)
+        if member is not None and not is_mod:
             await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
-            self._logger.trace(__name__, f'Finished purge command')
             return
 
         if member is None or not isinstance(member, discord.Member):
@@ -84,26 +98,31 @@ class UserGroup(DiscordCommandABC):
             color=int('ef9d0d', 16)
         )
 
-        ujvs = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
-        ontime = ujvs.sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
+        ontime = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)\
+            .where(lambda x: x.leaved_on is not None and x.joined_on is not None)\
+            .sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
 
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.id'), value=member.id)
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.name'), value=member.name)
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.discord_join'), value=self._date.transform(member.created_at), inline=False)
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.last_join'), value=self._date.transform(member.joined_at), inline=False)
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.xp'), value=str(user.xp))
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.ontime'), value=str(ontime))
+        embed.add_field(name=self._t.transform('modules.base.user.atr.id'), value=member.id)
+        embed.add_field(name=self._t.transform('modules.base.user.atr.name'), value=member.name)
+        embed.add_field(name=self._t.transform('modules.base.user.atr.discord_join'),
+                        value=self._date.transform(member.created_at), inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user.atr.last_join'),
+                        value=self._date.transform(member.joined_at), inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user.atr.xp'), value=str(user.xp))
+        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'), value=str(ontime))
 
         roles = ''
         for role in member.roles:
             roles += f'{role.name}\n'
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.roles'), value=roles, inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user.atr.roles'), value=roles, inline=False)
 
+        if is_mod or member == ctx.author:
             joins_string = ''
             for join in joins:
                 joins_string += f'{self._date.transform(join.joined_on)}\n'
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.joins'), value=joins_string)
+            embed.add_field(name=self._t.transform('modules.base.user.atr.joins'), value=joins_string)
 
+        if is_mod or member == ctx.author:
             lefts_string = ''
             for join in joins:
                 if join.leaved_on is None:
@@ -111,8 +130,129 @@ class UserGroup(DiscordCommandABC):
                         lefts_string = '/'
                     continue
                 lefts_string += f'{self._date.transform(join.leaved_on)}\n'
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.lefts'), value=lefts_string)
-        embed.add_field(name=self._t.transform('modules.base.user_info.fields.warnings'), value=self._t.transform('common.not_implemented_yet'), inline=False)
 
-        await self._message_service.send_ctx_msg(ctx, embed, wait_before_delete=wait)
+            embed.add_field(name=self._t.transform('modules.base.user.atr.lefts'), value=lefts_string)
+
+        if is_mod or member == ctx.author:
+            embed.add_field(name=self._t.transform('modules.base.user.atr.warnings'),
+                            value=self._t.transform('common.not_implemented_yet'), inline=False)
+
+        # send to interaction because of sensitive data
+        await self._message_service.send_interaction_msg(ctx.interaction, embed, wait_before_delete=wait)
         self._logger.trace(__name__, f'Finished user-info command')
+
+    @user.command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    async def get(self, ctx: Context, atr: str, member: discord.Member = None):
+        self._logger.debug(__name__, f'Received command user-get {atr} {ctx}:{member}')
+
+        is_mod = self._permissions.is_member_moderator(ctx.author)
+        if member is not None and not is_mod:
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
+            return
+
+        if member is None or not isinstance(member, discord.Member):
+            member = ctx.author
+
+        server = self._servers.find_server_by_discord_id(ctx.guild.id)
+        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
+
+        if atr == 'xp':
+            value = str(user.xp)
+
+        elif atr == 'ontime':
+            value = str(round(
+                self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
+                .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
+                2
+            ))
+
+        else:
+            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            return
+
+        await self._message_service.send_interaction_msg(
+            ctx.interaction,
+            self._t.transform(f'modules.base.user.get.{atr.lower()}').format(member.mention, value)
+        )
+
+    @get.autocomplete('atr')
+    async def get_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
+        return [app_commands.Choice(name=value, value=key) for key, value in self._atr_list]
+
+    @user.command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def set(self, ctx: Context, atr: str, value: str, member: discord.Member = None):
+        self._logger.debug(__name__, f'Received command user-set {atr} {ctx}:{member}')
+
+        if member is None or not isinstance(member, discord.Member):
+            member = ctx.author
+
+        server = self._servers.find_server_by_discord_id(ctx.guild.id)
+        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
+
+        if atr == 'xp':
+            if not value.isnumeric():
+                await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.set.error.value_type_not_numeric'))
+                return
+
+            try:
+                user.xp = int(value)
+            except TypeError as te:
+                self._logger.error(__name__, f'String value couldn\'t be converted to int', te)
+                await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.set.error.type_error'))
+                return
+            else:
+                self._users.update_user(user)
+                self._db.save_changes()
+                await self._level.check_level(member)
+
+        else:
+            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            return
+
+        await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform(f'modules.base.user.set.{atr.lower()}').format(member.mention, value))
+
+    @set.autocomplete('atr')
+    async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
+        atr_list = [('xp', self._atr_dict['xp'])]
+        return [app_commands.Choice(name=value, value=key) for key, value in atr_list]
+
+    @user.command()
+    @commands.guild_only()
+    @CommandChecks.check_is_ready()
+    @CommandChecks.check_is_member_moderator()
+    async def remove(self, ctx: Context, atr: str, member: discord.Member = None):
+        self._logger.debug(__name__, f'Received command user-remove {atr} {ctx}:{member}')
+
+        if member is None or not isinstance(member, discord.Member):
+            member = ctx.author
+
+        server = self._servers.find_server_by_discord_id(ctx.guild.id)
+        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
+
+        if atr == 'xp':
+            user.xp = 0
+            self._users.update_user(user)
+            self._db.save_changes()
+            await self._level.check_level(member)
+
+        elif atr == 'ontime':
+            self._user_joined_voice_channel.delete_user_joined_voice_channel_by_user_id(user.user_id)
+            self._db.save_changes()
+
+        else:
+            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
+            return
+
+        await self._message_service.send_interaction_msg(
+            ctx.interaction,
+            self._t.transform(f'modules.base.user.remove.{atr.lower()}').format(atr, member.mention)
+        )
+
+    @remove.autocomplete('atr')
+    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
+        return [app_commands.Choice(name=value, value=key) for key, value in self._atr_list]

kdb-bot/src/modules/base/configuration/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.base.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

kdb-bot/src/modules/base/configuration/base_server_settings.py

@@ -13,10 +13,13 @@ class BaseServerSettings(ConfigurationModelABC):
         self._id: int = 0
         self._max_voice_state_hours: int = 0
         self._xp_per_message: int = 0
+        self._xp_per_reaction: int = 0
         self._xp_per_ontime_hour: int = 0
         self._afk_channel_ids: List[int] = List(int)
         self._afk_command_channel_id: int = 0
         self._help_command_reference_url: str = ''
+        self._help_voice_channel_id: int = 0
+        self._ping_urls = List(str)
 
     @property
     def id(self) -> int:
@@ -30,6 +33,10 @@ class BaseServerSettings(ConfigurationModelABC):
     def xp_per_message(self) -> int:
         return self._xp_per_message
 
+    @property
+    def xp_per_reaction(self) -> int:
+        return self._xp_per_reaction
+
     @property
     def xp_per_ontime_hour(self) -> int:
         return self._xp_per_ontime_hour
@@ -46,16 +53,28 @@ class BaseServerSettings(ConfigurationModelABC):
     def help_command_reference_url(self) -> str:
         return self._help_command_reference_url
 
+    @property
+    def help_voice_channel_id(self) -> int:
+        return self._help_voice_channel_id
+
+    @property
+    def ping_urls(self) -> List[str]:
+        return self._ping_urls
+
     def from_dict(self, settings: dict):
         try:
             self._id = int(settings['Id'])
             self._max_voice_state_hours = int(settings['MaxVoiceStateHours'])
             self._xp_per_message = int(settings['XpPerMessage'])
+            self._xp_per_reaction = int(settings['XpPerReaction'])
             self._xp_per_ontime_hour = int(settings['XpPerOntimeHour'])
             for index in settings['AFKChannelIds']:
                 self._afk_channel_ids.append(int(index))
             self._afk_command_channel_id = settings['AFKCommandChannelId']
             self._help_command_reference_url = settings['HelpCommandReferenceUrl']
+            self._help_voice_channel_id = settings['HelpVoiceChannelId']
+            for url in settings['PingURLs']:
+                self._ping_urls.append(url)
         except Exception as e:
             Console.error(f'[ ERROR ] [ {__name__} ]: Reading error in {type(self).__name__} settings')
             Console.error(f'[ EXCEPTION ] [ {__name__} ]: {e} -> {traceback.format_exc()}')

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

@@ -15,7 +15,7 @@ __title__ = 'modules.base.events'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.dev25'
+__version__ = '0.3.0'
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='dev25')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -13,6 +13,7 @@ from cpl_discord.events.on_command_error_abc import OnCommandErrorABC
 
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.configuration.bot_settings import BotSettings
+from bot_core.exception.check_error import CheckError
 
 
 class BaseOnCommandErrorEvent(OnCommandErrorABC):
@@ -35,6 +36,9 @@ class BaseOnCommandErrorEvent(OnCommandErrorABC):
         self._t = translate
 
     async def on_command_error(self, ctx: Context, error: CommandError):
+        if isinstance(error, CheckError):
+            return
+
         error = getattr(error, 'original', error)
         uid = uuid.uuid4()
         self._logger.error(__name__, f'Got error: {type(error).__name__} UID: {uid}')

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

@@ -9,6 +9,7 @@ from cpl_discord.events import OnMemberJoinABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
@@ -69,17 +70,17 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
         await self._messenger.send_dm_message(self._t.transform('modules.base.welcome_message').format(member.guild.name), member)
 
         for admin in self._permission_service.get_admins(member.guild.id):
-            await self._messenger.send_dm_message(self._t.transform('modules.base.welcome_message_for_team').format(member.name), admin)
+            await self._messenger.send_dm_message(self._t.transform('modules.base.welcome_message_for_team').format(member.mention), admin)
 
         for moderator in self._permission_service.get_moderators(member.guild.id):
-            await self._messenger.send_dm_message(self._t.transform('modules.base.welcome_message_for_team').format(member.name), moderator)
+            await self._messenger.send_dm_message(self._t.transform('modules.base.welcome_message_for_team').format(member.mention), moderator)
 
         try:
             server = self._servers.get_server_by_discord_id(member.guild.id)
-
             user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
             if user is not None:
                 self._user_joins.add_user_joined_server(UserJoinedServer(user, datetime.now()))
+                self._db.save_changes()
                 return
 
             self._logger.debug(__name__, f'Add user: {member.id}')
@@ -91,6 +92,7 @@ class BaseOnMemberJoinEvent(OnMemberJoinABC):
         except Exception as e:
             self._logger.error(__name__, f'Cannot get user {member.id}', e)
 
+    @EventChecks.check_is_ready()
     async def on_member_join(self, member: discord.Member):
         self._logger.debug(__name__, f'Module {type(self)} started')
         self._check_for_known_user(member)

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

@@ -8,6 +8,7 @@ from cpl_discord.events import OnMemberRemoveABC
 from cpl_translation import TranslatePipe
 
 from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -59,6 +60,7 @@ class BaseOnMemberRemoveEvent(OnMemberRemoveABC):
         except Exception as e:
             self._logger.error(__name__, f'Cannot get user {member.id}', e)
 
+    @EventChecks.check_is_ready()
     async def on_member_remove(self, member: discord.Member):
         self._logger.debug(__name__, f'Module {type(self)} started')
         await self._remove_user(member)

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

@@ -5,6 +5,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_discord.events import OnMessageABC
 from cpl_discord.service import DiscordBotServiceABC
 
+from bot_core.helper.event_checks import EventChecks
 from bot_core.helper.log_message_helper import LogMessageHelper
 from bot_core.logging.message_logger import MessageLogger
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
@@ -70,6 +71,7 @@ class BaseOnMessageEvent(OnMessageABC):
 
         self._logger.debug(__name__, f'User {user} sent message. xp: from {old_xp} to {user.xp}')
 
+    @EventChecks.check_is_ready()
     async def on_message(self, message: discord.Message):
         self._logger.debug(__name__, f'Module {type(self)} started')
         self._logger.info(__name__, f'Received message: {LogMessageHelper.get_log_string(message)}')

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

@@ -0,0 +1,36 @@
+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 bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from modules.base.helper.base_reaction_handler import BaseReactionHandler
+
+
+class BaseOnRawReactionAddEvent(OnRawReactionAddABC):
+
+    def __init__(
+            self,
+            logger: LoggerABC,
+            bot: DiscordBotServiceABC,
+            servers: ServerRepositoryABC,
+            auto_roles: AutoRoleRepositoryABC,
+            reaction_handler: BaseReactionHandler
+    ):
+        OnRawReactionAddABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._servers = servers
+        self._auto_roles = auto_roles
+        self._reaction_handler = reaction_handler
+
+    @EventChecks.check_is_ready()
+    async def on_raw_reaction_add(self, payload: RawReactionActionEvent):
+        self._logger.debug(__name__, f'Module {type(self)} started')
+
+        await self._reaction_handler.handle(payload, 'add')
+
+        self._logger.debug(__name__, f'Module {type(self)} stopped')

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

@@ -0,0 +1,36 @@
+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 bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from modules.base.helper.base_reaction_handler import BaseReactionHandler
+
+
+class BaseOnRawReactionRemoveEvent(OnRawReactionRemoveABC):
+
+    def __init__(
+            self,
+            logger: LoggerABC,
+            bot: DiscordBotServiceABC,
+            servers: ServerRepositoryABC,
+            auto_roles: AutoRoleRepositoryABC,
+            reaction_handler: BaseReactionHandler,
+    ):
+        OnRawReactionRemoveABC.__init__(self)
+
+        self._logger = logger
+        self._bot = bot
+        self._servers = servers
+        self._auto_roles = auto_roles
+        self._reaction_handler = reaction_handler
+
+    @EventChecks.check_is_ready()
+    async def on_raw_reaction_remove(self, payload: RawReactionActionEvent):
+        self._logger.debug(__name__, f'Module {type(self)} started')
+
+        await self._reaction_handler.handle(payload, 'remove')
+
+        self._logger.debug(__name__, f'Module {type(self)} stopped')

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

@@ -7,6 +7,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
+from bot_core.helper.event_checks import EventChecks
 from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
@@ -83,6 +84,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         except Exception as e:
             self._logger.error(__name__, f'Ontime validation failed', e)
 
+    @EventChecks.check_is_ready()
     async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
         self._logger.debug(__name__, f'Module {type(self)} started')
         self._logger.trace(__name__, f'Detected on_voice_state_update {member.id} from {before} to {after}')

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

@@ -0,0 +1,53 @@
+import discord
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.logging import LoggerABC
+from cpl_discord.events import OnVoiceStateUpdateABC
+from cpl_translation import TranslatePipe
+
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.helper.event_checks import EventChecks
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from modules.base.abc.base_helper_abc import BaseHelperABC
+from modules.base.configuration.base_server_settings import BaseServerSettings
+from modules.permission.abc.permission_service_abc import PermissionServiceABC
+
+
+class BaseOnVoiceStateUpdateEventHelpChannel(OnVoiceStateUpdateABC):
+
+    def __init__(
+            self,
+            config: ConfigurationABC,
+            logger: LoggerABC,
+            base_helper: BaseHelperABC,
+            servers: ServerRepositoryABC,
+            permissions: PermissionServiceABC,
+            message_service: MessageServiceABC,
+            t: TranslatePipe,
+    ):
+        OnVoiceStateUpdateABC.__init__(self)
+        self._config = config
+        self._logger = logger
+        self._base_helper = base_helper
+        self._servers = servers
+        self._permissions = permissions
+        self._message_service = message_service
+        self._t = t
+
+        self._logger.info(__name__, f'Module {type(self)} loaded')
+
+    @EventChecks.check_is_ready()
+    async def on_voice_state_update(self, member: discord.Member, before: discord.VoiceState, after: discord.VoiceState):
+        self._logger.debug(__name__, f'Module {type(self)} started')
+        server = self._servers.get_server_by_discord_id(member.guild.id)
+        settings: BaseServerSettings = self._base_helper.get_config(server.discord_server_id)
+        if after.channel is None or after.channel.id != settings.help_voice_channel_id:
+            return
+
+        mods = [*self._permissions.get_admins(member.guild.id), *self._permissions.get_moderators(member.guild.id)]
+        for a in mods:
+            await self._message_service.send_dm_message(
+                self._t.transform('modules.base.member_joined_help_voice_channel').format(member.mention),
+                a,
+            )
+
+            self._logger.debug(__name__, f'Module {type(self)} stopped')

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

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+"""
+bot Keksdose bot
+~~~~~~~~~~~~~~~~~~~
+
+Discord bot  for the Keksdose discord Server
+
+:copyright: (c) 2022 sh-edraft.de
+:license: MIT, see LICENSE for more details.
+
+"""
+
+__title__ = 'modules.base.helper'
+__author__ = 'Sven Heidemann'
+__license__ = 'MIT'
+__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
+__version__ = '0.3.0'
+
+from collections import namedtuple
+
+
+# imports:
+
+VersionInfo = namedtuple('VersionInfo', 'major minor micro')
+version_info = VersionInfo(major='0', minor='3', micro='0')

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

@@ -0,0 +1,55 @@
+from cpl_core.database.context import DatabaseContextABC
+from cpl_core.logging import LoggerABC
+from cpl_discord.service import DiscordBotServiceABC
+from discord import RawReactionActionEvent
+
+from bot_data.abc.server_repository_abc import ServerRepositoryABC
+from bot_data.abc.user_repository_abc import UserRepositoryABC
+from modules.base.abc.base_helper_abc import BaseHelperABC
+from modules.base.configuration.base_server_settings import BaseServerSettings
+
+
+class BaseReactionHandler:
+
+    def __init__(
+            self,
+            logger: LoggerABC,
+            bot: DiscordBotServiceABC,
+            servers: ServerRepositoryABC,
+            users: UserRepositoryABC,
+            base_helper: BaseHelperABC,
+            db: DatabaseContextABC,
+    ):
+        self._logger = logger
+        self._bot = bot
+        self._servers = servers
+        self._users = users
+        self._base_helper = base_helper
+        self._db = db
+
+    async def handle(self, payload: RawReactionActionEvent, r_type=None) -> None:
+        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)
+        if member is None:
+            self._logger.warn(__name__, f'User {payload.user_id} in {guild.name} not found - skipping')
+            return
+
+        if member.bot:
+            return
+
+        server = self._servers.get_server_by_discord_id(guild.id)
+        user = self._users.get_user_by_discord_id_and_server_id(member.id, server.server_id)
+        settings: BaseServerSettings = self._base_helper.get_config(guild.id)
+
+        if r_type == 'add':
+            user.xp += settings.xp_per_reaction
+            self._users.update_user(user)
+            self._db.save_changes()
+        elif r_type == 'remove':
+            user.xp -= settings.xp_per_reaction
+            self._users.update_user(user)
+            self._db.save_changes()
+        else:
+            self._logger.warn(__name__, f'Invalid reaction type {r_type}')