Fixed tests #139

.gitignore

@@ -144,3 +144,4 @@ deploy/
 
 # idea
 .idea/
+selenium-data/

kdb-bot/README.md

@@ -1,2 +1,14 @@
 # kd_discord_bot
 
+## Test Bot
+
+To test the bot run unittests or call ```cpl test```.
+Configure test instance by creating the file ./test/ui_tests/.env and set following environment variables:
+
+```sh
+KDB_TEST_DB_PASSWORD=
+KDB_TEST_NAME=
+KDB_TEST_TOKEN=
+KDB_TEST_DISCORD_MAIL=
+KDB_TEST_DISCORD_PASSWORD=
+```

kdb-bot/cpl-workspace.json

@@ -14,29 +14,27 @@
       "permission": "src/modules/permission/permission.json",
       "stats": "src/modules/stats/stats.json",
       "technician": "src/modules/technician/technician.json",
+      "ui-tests": "test/ui_tests/ui-tests.json",
+      "ui-tests-shared": "test/ui_tests_shared/ui-tests-shared.json",
+      "ui-tests-tests": "test/ui_tests_tests/ui-tests-tests.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": {
+      "test": "export $(cat test/ui_tests/.env); export PYTHONPATH=$PWD/src:$PYTHONPATH; cpl run ui-tests",
       "sv": "cpl set-version $ARGS",
-      "set-version": "cpl run set-version $ARGS --dev; echo '';",
-
+      "set-version": "cpl run set-version $ARGS; echo '';",
       "gv": "cpl get-version",
-      "get-version": "export VERSION=$(cpl run get-version --dev); echo $VERSION;",
-
+      "get-version": "export VERSION=$(cpl run get-version); echo $VERSION;",
       "pre-build": "cpl set-version $ARGS",
-      "post-build": "cpl run post-build --dev",
-
+      "post-build": "cpl run post-build",
       "pre-prod": "cpl build",
       "prod": "export KDB_ENVIRONMENT=production; export KDB_NAME=KDB-Prod; cpl start;",
-
       "pre-stage": "cpl build",
       "stage": "export KDB_ENVIRONMENT=staging; export KDB_NAME=KDB-Stage; cpl start;",
-
       "pre-dev": "cpl build",
       "dev": "export KDB_ENVIRONMENT=development; export KDB_NAME=KDB-Dev; cpl start;",
-
       "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",

kdb-bot/dockerfile

@@ -1,9 +1,8 @@
 # syntax=docker/dockerfile:1
-FROM python:3.10.6-alpine
+FROM python:3.10.4-alpine
 
 WORKDIR /app
-COPY ./dist/bot/build/kdb-bot/ .
-COPY ./dist/bot/build/requirements.txt .
+COPY ./dist/bot/build/ .
 
 RUN python -m pip install --upgrade pip
 

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

kdb-bot/src/bot/bot.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "dev25"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
@@ -16,22 +16,22 @@
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2022.12.0",
+      "cpl-core==2022.10.0.post9",
       "cpl-translation==2022.10.0.post2",
-      "cpl-query==2022.12.2",
-      "cpl-discord==2022.12.0",
+      "cpl-query==2022.10.0.post2",
+      "cpl-discord==2022.10.0.post6",
       "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.2",
-      "eventlet==0.33.2",
+      "Flask-SocketIO==5.3.1",
+      "eventlet==0.33.1",
       "requests-oauthlib==1.3.1",
       "icmplib==3.0.3"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.0"
+      "cpl-cli==2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot/startup_migration_extension.py

@@ -5,12 +5,10 @@ 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
 from bot_data.migration.stats_migration import StatsMigration
-from bot_data.migration.user_message_count_per_hour_migration import UserMessageCountPerHourMigration
 from bot_data.service.migration_service import MigrationService
 
 
@@ -29,5 +27,3 @@ 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
-        services.add_transient(MigrationABC, UserMessageCountPerHourMigration)  # 11.01.2023 #168 - 0.3.1

kdb-bot/src/bot/startup_settings_extension.py

@@ -31,8 +31,6 @@ class StartupSettingsExtension(StartupExtensionABC):
         configuration.add_json_file(f'config/appsettings.{environment.host_name}.json', optional=True)
         # load feature-flags
         configuration.add_json_file(f'config/feature-flags.json', optional=False)
-        configuration.add_json_file(f'config/feature-flags.{environment.environment_name}.json', optional=True)
-        configuration.add_json_file(f'config/feature-flags.{environment.host_name}.json', optional=True)
 
         configuration.add_configuration('Startup_StartTime', str(self._start_time))
         self._configure_settings_with_sub_settings(configuration, BotSettings, lambda x: x.servers, lambda x: x.id)

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": "{} Ich esse Kekse :D",
+      "running": "{} Behalte Ruhe und iss Kekse :D",
       "restart": "{} Muss neue Kekse holen...",
       "shutdown": "{} Ich werde bestimmt wieder kommen..."
     },
@@ -108,7 +108,7 @@
           "error": {
             "not_found": "Regel für auto-role {} nicht gefunden!",
             "emoji_not_found": "Emoji {} für auto-role Regel {} nicht gefunden!",
-            "role_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
+            "rule_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
             "already_exists": "Regel für auto-role {} existiert bereits!"
           }
         },
@@ -127,17 +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.\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!",
+      "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!",
       "welcome_message_for_team": "{} hat gerade das Irrenhaus betreten.",
-      "goodbye_message": "Schade, dass du uns so schnell verlässt :(",
+      "goodbye_message": "Schade das 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": "Krümmelmonster",
+        "title": "Gismo",
         "description": "Informationen über mich",
         "fields": {
           "version": "Version",
@@ -160,8 +160,8 @@
         "removed": "Presence wurde entfernt.",
         "max_char_count_exceeded": "Der Text darf nicht mehr als 128 Zeichen lang sein!"
       },
-      "user": {
-        "atr": {
+      "user_info": {
+        "fields": {
           "id": "Id",
           "name": "Name",
           "discord_join": "Discord beigetreten am",
@@ -173,47 +173,27 @@
           "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 :("
-        }
+        "footer": ""
       }
     },
     "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": {

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_api.abc'
+__title__ = 'bot_api.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "dev70"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -16,10 +16,10 @@
     "LicenseName": "",
     "LicenseDescription": "",
     "Dependencies": [
-      "cpl-core==2022.12.0"
+      "cpl-core==2022.10.0.post7"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.0"
+      "cpl-cli==2022.10.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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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()).to_list())
+        return jsonify(result.select(lambda x: x.to_dict()))
 
     @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()).to_list()
+        result.result = result.result.select(lambda x: x.to_dict())
         return jsonify(result.to_dict())
 
     @Route.get(f'{BasePath}/users/get/<email>')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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()).to_list()
+        result = result.select(lambda x: x.to_dict())
         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()).to_list()
+        result = result.select(lambda x: x.to_dict())
         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()).to_list()
+        result.result = result.result.select(lambda x: x.to_dict())
         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).to_list()
+        result = await self._discord_service.get_server_by_id_async(id)
         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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_core.abc'
+__title__ = 'bot_core.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,49 +0,0 @@
-from abc import ABC, abstractmethod
-from typing import Callable
-
-from cpl_query.extension import List
-from discord.ext.commands import Context
-
-from bot_data.model.user import User
-from modules.base.configuration.base_server_settings import BaseServerSettings
-from bot_data.model.user import User
-
-
-
-class ClientUtilsABC(ABC):
-
-    @abstractmethod
-    def __init__(self): pass
-
-    @abstractmethod
-    def received_command(self, guild_id: int): pass
-
-    @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
-
-    @abstractmethod
-    def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-            self, created_at: datetime, user: User, settings: BaseServerSettings,
-            is_reaction: bool = False
-    ) -> bool: pass
-
-    @abstractmethod
-    def get_ontime_for_user(self, user: User) -> float: pass

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

@@ -0,0 +1,27 @@
+from abc import ABC, abstractmethod
+
+from discord.ext.commands import Context
+
+
+class ClientUtilsServiceABC(ABC):
+
+    @abstractmethod
+    def __init__(self): pass
+
+    @abstractmethod
+    def received_command(self, guild_id: int): pass
+
+    @abstractmethod
+    def moved_user(self, guild_id: 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

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

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Union, Optional
+from typing import Union
 
 import discord
 from cpl_query.extension import List
@@ -19,24 +19,13 @@ class MessageServiceABC(ABC):
     async def delete_message(self, message: discord.Message, without_tracking=False): pass
 
     @abstractmethod
-    async def send_channel_message(
-            self, channel: discord.TextChannel, message: Union[str, discord.Embed], without_tracking=True
-    ): pass
+    async def send_channel_message(self, channel: discord.TextChannel, message: Union[str, discord.Embed], without_tracking=True): pass
 
     @abstractmethod
-    async def send_dm_message(
-            self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member],
-            without_tracking=False
-    ): pass
+    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, is_public: bool = False, wait_before_delete: int = None, without_tracking=True
-    ) -> Optional[discord.Message]: pass
+    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
 
     @abstractmethod
-    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
+    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, **kwargs): pass

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

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0"
+      "Micro": "dev70"
     },
     "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==2022.12.0"
+      "cpl-core>=0.3.dev70"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.0"
+      "cpl-cli==2022.10.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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -3,7 +3,7 @@ from cpl_core.configuration import ConfigurationABC
 from cpl_core.dependency_injection import ServiceProviderABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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
@@ -23,7 +23,7 @@ class CoreExtension(ApplicationExtensionABC):
             return
 
         permissions: PermissionServiceABC = services.get_service(PermissionServiceABC)
-        client_utils: ClientUtilsABC = services.get_service(ClientUtilsABC)
+        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)

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

@@ -5,7 +5,7 @@ from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 
 
 class CoreExtensionOnReadyEvent(OnReadyABC):
@@ -14,7 +14,7 @@ class CoreExtensionOnReadyEvent(OnReadyABC):
             self,
             logger: LoggerABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             t: TranslatePipe
     ):
         OnReadyABC.__init__(self)

kdb-bot/src/bot_core/core_module.py

@@ -4,7 +4,7 @@ from cpl_core.environment import ApplicationEnvironmentABC
 from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
 from cpl_discord.service.discord_collection_abc import DiscordCollectionABC
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
 from bot_core.abc.module_abc import ModuleABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
@@ -24,7 +24,7 @@ class CoreModule(ModuleABC):
 
     def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
         services.add_transient(MessageServiceABC, MessageService)
-        services.add_transient(ClientUtilsABC, ClientUtilsService)
+        services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
 
         # pipes
         services.add_transient(DateTimeOffsetPipe)

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -3,7 +3,7 @@ from cpl_discord.events import OnReadyABC
 from cpl_discord.service import DiscordBotServiceABC
 from cpl_translation import TranslatePipe
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 
 
 class CoreOnReadyEvent(OnReadyABC):
@@ -12,7 +12,7 @@ class CoreOnReadyEvent(OnReadyABC):
             self,
             logger: LoggerABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             t: TranslatePipe,
     ):
         OnReadyABC.__init__(self)

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

@@ -1,26 +0,0 @@
-# -*- 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/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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -4,7 +4,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.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
@@ -12,7 +12,7 @@ from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 class CommandChecks:
     _permissions: Optional[PermissionServiceABC] = None
-    _client_utils: Optional[ClientUtilsABC] = None
+    _client_utils: Optional[ClientUtilsServiceABC] = None
     _message_service: Optional[MessageServiceABC] = None
     _t: Optional[TranslatePipe] = None
 
@@ -20,7 +20,7 @@ class CommandChecks:
     def init(
             cls,
             permissions: PermissionServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             message_service: MessageServiceABC,
             translate: TranslatePipe,
     ):

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

@@ -4,19 +4,19 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.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[ClientUtilsABC] = None
+    _client_utils: Optional[ClientUtilsServiceABC] = None
 
     @classmethod
     def init(
             cls,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
     ):
         cls._client_utils = client_utils
 

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,54 +1,40 @@
-from typing import Callable
-
 import discord
-from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from cpl_core.configuration import ConfigurationABC
 from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
-from cpl_core.time import TimeFormatSettings
+
 from cpl_discord.service import DiscordBotServiceABC
-from cpl_query.extension import List
 from cpl_translation import TranslatePipe
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
-from bot_data.model.user import User
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-from modules.base.configuration.base_server_settings import BaseServerSettings
 
 
-class ClientUtilsService(ClientUtilsABC):
+class ClientUtilsService(ClientUtilsServiceABC):
 
     def __init__(
             self,
             config: ConfigurationABC,
             logger: LoggerABC,
-            time_format: TimeFormatSettings,
             bot: DiscordBotServiceABC,
             servers: ServerRepositoryABC,
             clients: ClientRepositoryABC,
-            umcphs: UserMessageCountPerHourRepositoryABC,
-            user_joined_vc: UserJoinedVoiceChannelRepositoryABC,
             message_service: MessageServiceABC,
             db: DatabaseContextABC,
             t: TranslatePipe,
             feature_flags: FeatureFlagsSettings
     ):
-        ClientUtilsABC.__init__(self)
+        ClientUtilsServiceABC.__init__(self)
         self._config = config
         self._logger = logger
-        self._time_format = time_format
         self._bot = bot
         self._servers = servers
-        self._umcphs = umcphs
         self._clients = clients
-        self._user_joined_voice_channel = user_joined_vc
         self._message_service = message_service
         self._db = db
         self._t = t
@@ -68,13 +54,6 @@ class ClientUtilsService(ClientUtilsABC):
         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)
@@ -90,13 +69,7 @@ class ClientUtilsService(ClientUtilsABC):
     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)
-            await self._message_service.send_ctx_msg(
-                ctx,
-                self._t.transform('common.errors.bot_not_ready_yet'),
-                without_tracking=True
-            )
+            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.errors.bot_not_ready_yet'), without_tracking=True)
 
         return result
 
@@ -108,67 +81,3 @@ class ClientUtilsService(ClientUtilsABC):
         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)
-
-    def is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-            self,
-            created_at: datetime,
-            user: User,
-            settings: BaseServerSettings,
-            is_reaction: bool = False
-    ) -> bool:
-        umcph = None
-        try:
-            umcph = self._umcphs.find_user_message_count_per_hour_by_user_id_and_date(user.user_id, created_at)
-            if umcph is None:
-                self._umcphs.add_user_message_count_per_hour(UserMessageCountPerHour(
-                    created_at.strftime(self._time_format.date_time_format),
-                    created_at.hour,
-                    0,
-                    user
-                ))
-
-                self._db.save_changes()
-
-                umcph = self._umcphs.get_user_message_count_per_hour_by_user_id_and_date(
-                    user.user_id,
-                    created_at
-                )
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot add user message count per hour with id {umcph.id}', e)
-            return False
-
-        try:
-            if is_reaction:
-                umcph.xp_count += settings.xp_per_reaction
-            else:
-                umcph.xp_count += settings.xp_per_message
-
-            self._umcphs.update_user_message_count_per_hour(umcph)
-            self._db.save_changes()
-        except Exception as e:
-            self._logger.error(__name__, f'Cannot update user message count per hour with id {umcph.id}', e)
-            return False
-
-        if umcph.xp_count is None:
-            return False
-
-        return umcph.xp_count > settings.max_message_xp_per_hour
-
-    def get_ontime_for_user(self, user: User) -> float:
-        return 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))

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

@@ -1,5 +1,5 @@
 import asyncio
-from typing import Union, Optional
+from typing import Union
 
 import discord
 from cpl_core.configuration.configuration_abc import ConfigurationABC
@@ -18,8 +18,7 @@ from bot_data.abc.client_repository_abc import ClientRepositoryABC
 
 class MessageService(MessageServiceABC):
 
-    def __init__(self, config: ConfigurationABC, logger: MessageLogger, bot: DiscordBotServiceABC,
-                 clients: ClientRepositoryABC, db: DatabaseContextABC):
+    def __init__(self, config: ConfigurationABC, logger: MessageLogger, bot: DiscordBotServiceABC, clients: ClientRepositoryABC, db: DatabaseContextABC):
         self._config = config
         self._logger = logger
         self._bot = bot
@@ -35,16 +34,11 @@ class MessageService(MessageServiceABC):
         self._logger.debug(__name__, 'Deleting messages finished')
         
     async def delete_message(self, message: discord.Message, mass_delete=False, without_tracking=False):
-        guild_id = \
-            message.guild.id if message.guild is not None else \
-                message.channel.guild.id if message.channel is not None and message.channel.guild is not None else \
-                    message.reference.guild_id if message.reference is not None and message.reference.guild_id is not None \
-                        else None
-
-        server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{guild_id}')
+        server_st: ServerSettings = self._config.get_configuration(f'ServerSettings_{message.guild.id}')
         if not mass_delete:
             await asyncio.sleep(server_st.message_delete_timer)
         self._logger.debug(__name__, f'Try to delete message: {LogMessageHelper.get_log_string(message)}')
+        guild_id = message.guild.id
         try:
             await message.delete()
             await asyncio.sleep(server_st.message_delete_timer)
@@ -56,10 +50,7 @@ class MessageService(MessageServiceABC):
                 self._db.save_changes()
             self._logger.info(__name__, f'Deleted message {message}')
     
-    async def send_channel_message(
-            self, channel: discord.TextChannel, message: Union[str, discord.Embed], is_persistent: bool = False,
-            wait_before_delete: int = None, without_tracking=False
-    ):
+    async def send_channel_message(self, channel: discord.TextChannel, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
         self._logger.debug(__name__, f'Try to send message\n\t{message}\n\tto: {channel}')
         msg = None
         try:
@@ -83,10 +74,7 @@ class MessageService(MessageServiceABC):
 
             await self.delete_message(msg, without_tracking)
     
-    async def send_dm_message(
-            self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member],
-            without_tracking=False
-    ):
+    async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False):
         self._logger.debug(__name__, f'Try to send message\n\t{message}\n\tto: {receiver}')
         try:
             if isinstance(message, discord.Embed):
@@ -101,22 +89,19 @@ 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, is_public: bool = False, wait_before_delete: int = None, without_tracking=False
-    ) -> Optional[discord.Message]:
+    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):
         if ctx is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
-            return None
+            return
         
         self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {ctx.channel}')
         msg = None
         try:
             if isinstance(message, discord.Embed):
-                msg = await ctx.send(embed=message, file=file, ephemeral=not is_public)
+                msg = await ctx.send(embed=message, file=file)
             else:
-                msg = await ctx.send(message, file=file, ephemeral=not is_public)
+                msg = await ctx.send(message, file=file)
         except Exception as e:
             self._logger.error(__name__, f'Send message to channel {ctx.channel.id} failed', e)
         else:
@@ -129,17 +114,12 @@ class MessageService(MessageServiceABC):
                 await asyncio.sleep(wait_before_delete)
 
             if is_persistent:
-                return msg
+                return
 
             if ctx.guild is not None:
                 await self.delete_message(msg, without_tracking)
 
-        return msg
-
-    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
-    ):
+    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, **kwargs):
         if interaction is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
@@ -148,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, ephemeral=not is_public, **kwargs)
+                await interaction.response.send_message(embed=message, **kwargs)
             else:
-                await interaction.response.send_message(message, ephemeral=not is_public, **kwargs)
+                await interaction.response.send_message(message, **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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'bot_data.abc'
+__title__ = 'bot_data.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -35,6 +35,3 @@ 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/abc/user_message_count_per_hour_repository_abc.py

@@ -1,39 +0,0 @@
-from abc import ABC, abstractmethod
-from datetime import datetime
-from typing import Optional
-
-from cpl_query.extension import List
-
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-
-
-class UserMessageCountPerHourRepositoryABC(ABC):
-
-    @abstractmethod
-    def __init__(self): pass
-
-    @abstractmethod
-    def get_user_message_count_per_hours(self) -> List[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]: pass
-
-    @abstractmethod
-    def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def update_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def delete_user_message_count_per_hour(self, umcph: UserMessageCountPerHour): pass
-
-    @abstractmethod
-    def delete_user_message_count_per_hour_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": "0"
+      "Micro": "dev70"
     },
     "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==2022.12.0"
+      "cpl-core>=0.3.dev70"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.0"
+      "cpl-cli==2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/bot_data/data_module.py

@@ -13,8 +13,7 @@ from bot_data.abc.level_repository_abc import LevelRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.statistic_repository_abc import StatisticRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.service.auth_user_repository_service import AuthUserRepositoryService
 from bot_data.service.auto_role_repository_service import AutoRoleRepositoryService
@@ -25,8 +24,7 @@ from bot_data.service.seeder_service import SeederService
 from bot_data.service.server_repository_service import ServerRepositoryService
 from bot_data.service.statistic_repository_service import StatisticRepositoryService
 from bot_data.service.user_joined_server_repository_service import UserJoinedServerRepositoryService
-from bot_data.service.user_joined_voice_channel_repository_service import UserJoinedVoiceChannelRepositoryService
-from bot_data.service.user_message_count_per_hour_repository_service import UserMessageCountPerHourRepositoryService
+from bot_data.service.user_joined_voice_channel_service import UserJoinedVoiceChannelRepositoryService
 from bot_data.service.user_repository_service import UserRepositoryService
 
 
@@ -49,6 +47,5 @@ class DataModule(ModuleABC):
         services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
         services.add_transient(LevelRepositoryABC, LevelRepositoryService)
         services.add_transient(StatisticRepositoryABC, StatisticRepositoryService)
-        services.add_transient(UserMessageCountPerHourRepositoryABC, UserMessageCountPerHourRepositoryService)
 
         services.add_transient(SeederService)

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,29 +0,0 @@
-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/migration/user_message_count_per_hour_migration.py

@@ -1,35 +0,0 @@
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.migration_abc import MigrationABC
-from bot_data.db_context import DBContext
-
-
-class UserMessageCountPerHourMigration(MigrationABC):
-    name = '0.3.1_UserMessageCountPerHourMigration'
-
-    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"""
-            CREATE TABLE IF NOT EXISTS `UserMessageCountPerHour` (
-                `Id` BIGINT NOT NULL AUTO_INCREMENT,
-                `Date` DATETIME(6) NOT NULL,
-                `Hour` BIGINT,
-                `XPCount` BIGINT,
-                `UserId` BIGINT,
-                `CreatedAt` DATETIME(6),
-                `LastModifiedAt` DATETIME(6),
-                PRIMARY KEY(`Id`),
-                FOREIGN KEY (`UserId`) REFERENCES `Users`(`UserId`)
-            );
-            """)
-        )
-
-    def downgrade(self):
-        self._cursor.execute('DROP TABLE `UserMessageCountPerHour`;')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -6,10 +6,9 @@ from cpl_core.database import TableABC
 
 class AutoRole(TableABC):
 
-    def __init__(self, server_id: int, dc_channel_id: int, dc_message_id: int, created_at: datetime=None, modified_at: datetime=None, id=0):
+    def __init__(self, server_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)
@@ -24,10 +23,6 @@ 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
@@ -63,10 +58,9 @@ class AutoRole(TableABC):
     def insert_string(self) -> str:
         return str(f"""
             INSERT INTO `AutoRoles` (
-                `ServerId`, `DiscordChannelId`, `DiscordMessageId`, `CreatedAt`, `LastModifiedAt`
+                `ServerId`, `DiscordMessageId`, `CreatedAt`, `LastModifiedAt`
             ) VALUES (
                 {self._server_id},
-                {self._discord_channel_id},
                 {self._discord_message_id},
                 '{self._created_at}',
                 '{self._modified_at}'
@@ -78,7 +72,6 @@ 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/level.py

@@ -29,7 +29,6 @@ class Level(TableABC):
     
     @name.setter
     def name(self, value: str):
-        self._modified_at = datetime.now().isoformat()
         self._name = value
         
     @property
@@ -38,7 +37,6 @@ class Level(TableABC):
     
     @color.setter
     def color(self, value: str):
-        self._modified_at = datetime.now().isoformat()
         self._color = value
         
     @property
@@ -47,7 +45,6 @@ class Level(TableABC):
     
     @min_xp.setter
     def min_xp(self, value: int):
-        self._modified_at = datetime.now().isoformat()
         self._min_xp = value
     
     @property
@@ -56,7 +53,6 @@ class Level(TableABC):
     
     @permissions.setter
     def permissions(self, value: int):
-        self._modified_at = datetime.now().isoformat()
         self._permissions = value
     
     @property
@@ -65,7 +61,6 @@ class Level(TableABC):
     
     @server.setter
     def server(self, value: Server):
-        self._modified_at = datetime.now().isoformat()
         self._server = value
 
     @staticmethod

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

@@ -119,10 +119,3 @@ 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/model/user_message_count_per_hour.py

@@ -1,121 +0,0 @@
-from datetime import datetime
-
-from cpl_core.database import TableABC
-
-from bot_data.model.user import User
-
-
-class UserMessageCountPerHour(TableABC):
-
-    def __init__(
-            self,
-            date: str,
-            hour: int,
-            xp_count: int,
-            user: User,
-            created_at: datetime = None,
-            modified_at: datetime = None,
-            id=0):
-        self._id = id
-        self._date = date
-        self._hour = hour
-        self._xp_count = xp_count
-        self._user = user
-
-        TableABC.__init__(self)
-        self._created_at = created_at if created_at is not None else self._created_at
-        self._modified_at = modified_at if modified_at is not None else self._modified_at
-
-    @property
-    def id(self) -> int:
-        return self._id
-
-    @property
-    def date(self) -> datetime:
-        return self._date
-
-    @property
-    def hour(self) -> int:
-        return self._hour
-
-    @property
-    def xp_count(self) -> int:
-        return self._xp_count
-
-    @xp_count.setter
-    def xp_count(self, value: int):
-        self._modified_at = datetime.now().isoformat()
-        self._xp_count = value
-
-    @property
-    def user(self) -> User:
-        return self._user
-
-    @staticmethod
-    def get_select_all_string() -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`;
-        """)
-
-    @staticmethod
-    def get_select_by_id_string(id: int) -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `Id` = {id};
-        """)
-
-    @staticmethod
-    def get_select_by_user_id_string(id: int) -> str:
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `UserId` = {id};
-        """)
-
-    @staticmethod
-    def get_select_by_user_id_and_date_string(id: int, date: datetime) -> str:
-        date_str = f'{str(date.year).zfill(4)}-{str(date.month).zfill(2)}-{str(date.day).zfill(2)}%'
-
-        return str(f"""
-            SELECT * FROM `UserMessageCountPerHour`
-            WHERE `UserId` = {id}
-            AND `Date` LIKE '{date_str}'
-            AND `Hour` = {date.hour};
-        """)
-
-    @property
-    def insert_string(self) -> str:
-        return str(f"""
-            INSERT INTO `UserMessageCountPerHour` (
-                `UserId`, `Date`, `Hour`, `XPCount`, `CreatedAt`, `LastModifiedAt`
-            ) VALUES (
-                {self._user.user_id},
-                '{self._date}',
-                {self._hour},
-                {self._xp_count},
-                '{self._created_at}',
-                '{self._modified_at}'
-            );
-        """)
-
-    @property
-    def udpate_string(self) -> str:
-        return str(f"""
-            UPDATE `UserMessageCountPerHour`
-            SET `XPCount` = '{self._xp_count}',
-            `LastModifiedAt` = '{self._modified_at}'
-            WHERE `Id` = {self._id};
-        """)
-
-    @property
-    def delete_string(self) -> str:
-        return str(f"""
-            DELETE FROM `UserMessageCountPerHour`
-            WHERE `Id` = {self._id};
-        """)
-
-    @staticmethod
-    def delete_by_user_id_string(id: int) -> str:
-        return str(f"""
-            DELETE FROM `UserMessageCountPerHour`
-            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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

@@ -4,7 +4,7 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_query.extension import List
 
 from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.user_joined_voice_channel import UserJoinedVoiceChannel
 
@@ -94,7 +94,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
         )
 
     def find_active_user_joined_voice_channels_by_user_id(self, user_id: int) -> List[Optional[UserJoinedVoiceChannel]]:
-        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id)}')
+        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.get_select_by_user_id_string(user_id)}')
         result = List(UserJoinedVoiceChannel)
         db_results = self._context.select(UserJoinedVoiceChannel.get_select_active_by_user_id_string(user_id))
 
@@ -121,7 +121,3 @@ 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/bot_data/service/user_message_count_per_hour_repository_service.py

@@ -1,101 +0,0 @@
-from datetime import datetime
-from typing import Optional
-
-from cpl_core.database.context import DatabaseContextABC
-from cpl_query.extension import List
-
-from bot_core.logging.database_logger import DatabaseLogger
-from bot_data.abc.user_message_count_per_hour_repository_abc import UserMessageCountPerHourRepositoryABC
-from bot_data.abc.user_repository_abc import UserRepositoryABC
-from bot_data.model.user_message_count_per_hour import UserMessageCountPerHour
-
-
-class UserMessageCountPerHourRepositoryService(UserMessageCountPerHourRepositoryABC):
-
-    def __init__(
-            self,
-            logger: DatabaseLogger,
-            db_context: DatabaseContextABC,
-            users: UserRepositoryABC,
-    ):
-        UserMessageCountPerHourRepositoryABC.__init__(self)
-
-        self._logger = logger
-        self._context = db_context
-        self._users = users
-
-    @staticmethod
-    def _get_value_from_result(value: any) -> Optional[any]:
-        if isinstance(value, str) and 'NULL' in value:
-            return None
-
-        return value
-
-    def _from_result(self, result: tuple) -> UserMessageCountPerHour:
-        return UserMessageCountPerHour(
-            self._get_value_from_result(result[1]),
-            self._get_value_from_result(result[2]),
-            self._get_value_from_result(result[3]),
-            self._users.get_user_by_id(self._get_value_from_result(result[4])),
-            self._get_value_from_result(result[5]),
-            self._get_value_from_result(result[6]),
-            id=self._get_value_from_result(result[0])
-        )
-
-    def get_user_message_count_per_hours(self) -> List[UserMessageCountPerHour]:
-        umcphs = List(UserMessageCountPerHour)
-        self._logger.trace(__name__, f'Send SQL command: {UserMessageCountPerHour.get_select_all_string()}')
-        results = self._context.select(UserMessageCountPerHour.get_select_all_string())
-        for result in results:
-            self._logger.trace(__name__, f'Get user message count per hour with id {result[0]}')
-            umcphs.append(self._from_result(result))
-
-        return umcphs
-
-    def find_user_message_count_per_hour_by_user_id(self, user_id: int) -> List[Optional[UserMessageCountPerHour]]:
-        umcphs = List(UserMessageCountPerHour)
-        sql = UserMessageCountPerHour.get_select_by_user_id_string(user_id)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        results = self._context.select(sql)
-        if results is None or len(results) == 0:
-            return umcphs
-
-        for result in results:
-            self._logger.trace(__name__, f'Get user message count per hour with id {result[0]}')
-            umcphs.append(self._from_result(result))
-
-        return umcphs
-
-    def get_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            UserMessageCountPerHour:
-        sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        result = self._context.select(sql)[0]
-        return self._from_result(result)
-
-    def find_user_message_count_per_hour_by_user_id_and_date(self, user_id: int, date: datetime) -> \
-            Optional[UserMessageCountPerHour]:
-        sql = UserMessageCountPerHour.get_select_by_user_id_and_date_string(user_id, date)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        result = self._context.select(sql)
-        if result is None or len(result) == 0:
-            return None
-
-        return self._from_result(result[0])
-
-    def add_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.insert_string}')
-        self._context.cursor.execute(umcph.insert_string)
-
-    def update_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.udpate_string}')
-        self._context.cursor.execute(umcph.udpate_string)
-
-    def delete_user_message_count_per_hour(self, umcph: UserMessageCountPerHour):
-        self._logger.trace(__name__, f'Send SQL command: {umcph.delete_string}')
-        self._context.cursor.execute(umcph.delete_string)
-
-    def delete_user_message_count_per_hour_by_user_id(self, user_id: int):
-        sql = UserMessageCountPerHour.delete_by_user_id_string(user_id)
-        self._logger.trace(__name__, f'Send SQL command: {sql}')
-        self._context.cursor.execute(sql)

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,4 +1,4 @@
-from typing import List as TList, Optional, Any
+from typing import List as TList, Optional
 
 import discord
 from cpl_core.database.context import DatabaseContextABC
@@ -11,7 +11,7 @@ from discord import app_commands, Guild
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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
@@ -29,7 +29,7 @@ class AutoRoleGroup(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             servers: ServerRepositoryABC,
             auto_roles: AutoRoleRepositoryABC,
@@ -50,11 +50,6 @@ 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):
@@ -114,7 +109,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(channel.id), int(message_id)))
+        self._auto_roles.add_auto_role(AutoRole(server_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))
@@ -160,7 +155,9 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @remove.autocomplete('auto_role')
     async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        return await self._auto_role_auto_complete(interaction, current)
+        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]
 
     @auto_role.group()
     @commands.guild_only()
@@ -201,7 +198,9 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @list.autocomplete('auto_role')
     async def list_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        return await self._auto_role_auto_complete(interaction, current)
+        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]
 
     @rule.command()
     @commands.guild_only()
@@ -239,9 +238,8 @@ 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:
@@ -257,17 +255,19 @@ class AutoRoleGroup(DiscordCommandABC):
 
     @add.autocomplete('auto_role')
     async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        return await self._auto_role_auto_complete(interaction, current)
+        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]
 
     @add.autocomplete('emoji_name')
     async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        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)]
+        emojis = interaction.guild.emojis
+        return [app_commands.Choice(name=emoji.name, value=emoji.name) for emoji in emojis]
 
     @add.autocomplete('role_id')
     async def rule_add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
-        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)]
+        roles = interaction.guild.roles
+        return [app_commands.Choice(name=role.name, value=str(role.id)) for role in roles]
 
     @rule.command()
     @commands.guild_only()
@@ -294,10 +294,4 @@ 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 self._client_utils.get_auto_complete_list(rules, current, lambda r: r.auto_role_rule_id)
-        ]
+        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]

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'modules.base.abc'
+__title__ = 'modules.base.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -6,7 +6,7 @@ from discord import VoiceChannel
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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
@@ -21,7 +21,7 @@ class AFKCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

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

@@ -8,7 +8,7 @@ from discord import app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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
@@ -23,7 +23,7 @@ class HelpCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC
+            client_utils: ClientUtilsServiceABC
     ):
         DiscordCommandABC.__init__(self)
 
@@ -42,7 +42,7 @@ class HelpCommand(DiscordCommandABC):
         self._logger.debug(__name__, f'Received command help {ctx}:{persistent_flag}')
         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, is_public=True)
+        await self._message_service.send_ctx_msg(ctx, settings.help_command_reference_url, is_persistent=is_persistent)
         self._logger.trace(__name__, f'Finished help command')
 
     @help.autocomplete('persistent_flag')

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

@@ -9,7 +9,7 @@ from discord.ext import commands
 from discord.ext.commands import Context
 
 import bot
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+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
@@ -23,7 +23,7 @@ class InfoCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

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

@@ -10,7 +10,6 @@ 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):
@@ -21,14 +20,12 @@ class MassMoveCommand(DiscordCommandABC):
             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()
@@ -45,9 +42,7 @@ class MassMoveCommand(DiscordCommandABC):
             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))
 

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

@@ -5,7 +5,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.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
@@ -22,7 +22,7 @@ class PingCommand(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe,
             permissions: PermissionServiceABC,
             base_helper: BaseHelperABC,

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

@@ -6,7 +6,7 @@ from cpl_translation import TranslatePipe
 from discord.ext import commands
 from discord.ext.commands import Context
 
-from bot_core.abc.client_utils_abc import ClientUtilsABC
+from bot_core.abc.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
@@ -22,7 +22,7 @@ class PurgeCommand(DiscordCommandABC):
             config: ConfigurationABC,
             message_service: MessageServiceABC,
             permissions: PermissionServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             translate: TranslatePipe
     ):
         DiscordCommandABC.__init__(self)

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

@@ -1,25 +1,22 @@
-from typing import Optional, List
+from typing import Optional
 
 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 bot_core.abc.client_utils_abc import ClientUtilsABC
+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_repository_abc import UserJoinedVoiceChannelRepositoryABC
+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
 
 
@@ -31,16 +28,14 @@ class UserGroup(DiscordCommandABC):
             logger: CommandLogger,
             message_service: MessageServiceABC,
             bot: DiscordBotServiceABC,
-            client_utils: ClientUtilsABC,
+            client_utils: ClientUtilsServiceABC,
             permissions: PermissionServiceABC,
             servers: ServerRepositoryABC,
-            db: DatabaseContextABC,
             users: UserRepositoryABC,
             user_joined_servers: UserJoinedServerRepositoryABC,
             user_joined_voice_channel: UserJoinedVoiceChannelRepositoryABC,
             translate: TranslatePipe,
-            date: DateTimeOffsetPipe,
-            level: LevelService
+            date: DateTimeOffsetPipe
     ):
         DiscordCommandABC.__init__(self)
 
@@ -51,23 +46,14 @@ 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):
@@ -97,26 +83,26 @@ class UserGroup(DiscordCommandABC):
             color=int('ef9d0d', 16)
         )
 
-        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(self._client_utils.get_ontime_for_user(user)))
+        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))
+
+        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))
 
         roles = ''
         for role in member.roles:
             roles += f'{role.name}\n'
-        embed.add_field(name=self._t.transform('modules.base.user.atr.roles'), value=roles, inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.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.atr.joins'), value=joins_string)
+            embed.add_field(name=self._t.transform('modules.base.user_info.fields.joins'), value=joins_string)
 
         if is_mod or member == ctx.author:
             lefts_string = ''
@@ -127,143 +113,11 @@ class UserGroup(DiscordCommandABC):
                     continue
                 lefts_string += f'{self._date.transform(join.leaved_on)}\n'
 
-            embed.add_field(name=self._t.transform('modules.base.user.atr.lefts'), value=lefts_string)
+            embed.add_field(name=self._t.transform('modules.base.user_info.fields.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)
+            embed.add_field(name=self._t.transform('modules.base.user_info.fields.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(self._client_utils.get_ontime_for_user(user))
-
-        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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -14,7 +14,6 @@ class BaseServerSettings(ConfigurationModelABC):
         self._max_voice_state_hours: int = 0
         self._xp_per_message: int = 0
         self._xp_per_reaction: int = 0
-        self._max_message_xp_per_hour: int = 0
         self._xp_per_ontime_hour: int = 0
         self._afk_channel_ids: List[int] = List(int)
         self._afk_command_channel_id: int = 0
@@ -38,10 +37,6 @@ class BaseServerSettings(ConfigurationModelABC):
     def xp_per_reaction(self) -> int:
         return self._xp_per_reaction
 
-    @property
-    def max_message_xp_per_hour(self) -> int:
-        return self._max_message_xp_per_hour
-
     @property
     def xp_per_ontime_hour(self) -> int:
         return self._xp_per_ontime_hour
@@ -72,7 +67,6 @@ class BaseServerSettings(ConfigurationModelABC):
             self._max_voice_state_hours = int(settings['MaxVoiceStateHours'])
             self._xp_per_message = int(settings['XpPerMessage'])
             self._xp_per_reaction = int(settings['XpPerReaction'])
-            self._max_message_xp_per_hour = int(settings['MaxMessageXpPerHour'])
             self._xp_per_ontime_hour = int(settings['XpPerOntimeHour'])
             for index in settings['AFKChannelIds']:
                 self._afk_channel_ids.append(int(index))

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.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -8,7 +8,6 @@ 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_core.service.client_utils_service import ClientUtilsService
 from bot_data.abc.client_repository_abc import ClientRepositoryABC
 from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
@@ -23,7 +22,6 @@ class BaseOnMessageEvent(OnMessageABC):
             self,
             logger: MessageLogger,
             bhs: BaseHelperABC,
-            client_utils: ClientUtilsService,
             db: DatabaseContextABC,
             bot: DiscordBotServiceABC,
             users: UserRepositoryABC,
@@ -33,8 +31,6 @@ class BaseOnMessageEvent(OnMessageABC):
         OnMessageABC.__init__(self)
         self._logger = logger
         self._base_helper = bhs
-        self._client_utils = client_utils
-        self._bot = bot
         self._db = db
         self._bot = bot
         self._users = users
@@ -68,9 +64,6 @@ class BaseOnMessageEvent(OnMessageABC):
             return
 
         settings: BaseServerSettings = self._base_helper.get_config(message.guild.id)
-        if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(message.created_at, user, settings):
-            return
-
         old_xp = user.xp
         user.xp += settings.xp_per_message
         self._users.update_user(user)
@@ -78,8 +71,6 @@ 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')

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

@@ -7,12 +7,11 @@ from cpl_core.database.context import DatabaseContextABC
 from cpl_core.logging import LoggerABC
 from cpl_discord.events import OnVoiceStateUpdateABC
 
-from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 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
-from bot_data.abc.user_joined_voice_channel_repository_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
 from bot_data.model.server import Server
 from bot_data.model.user import User
@@ -33,7 +32,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             users: UserRepositoryABC,
             user_joins: UserJoinedServerRepositoryABC,
             user_joins_vc: UserJoinedVoiceChannelRepositoryABC,
-            client_utils: ClientUtilsServiceABC,
             db: DatabaseContextABC,
     ):
         OnVoiceStateUpdateABC.__init__(self)
@@ -45,7 +43,6 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
         self._users = users
         self._user_joins = user_joins
         self._user_joins_vc = user_joins_vc
-        self._client_utils = client_utils
         self._db = db
 
         self._logger.info(__name__, f'Module {type(self)} loaded')
@@ -75,7 +72,7 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             join.leaved_on = datetime.now()
 
             # ontime as hours
-            ontime = self._client_utils.get_ontime_for_user(user)
+            ontime = round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2)
             old_xp = user.xp
             user.xp += round(ontime * settings.xp_per_ontime_hour)
 
@@ -83,18 +80,12 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
             self._users.update_user(user)
             self._db.save_changes()
 
-            self._logger.debug(__name__,
-                               f'User {user} leaved_on {join.leaved_on}. Ontime: {ontime}h | xp: from {old_xp} to {user.xp}')
+            self._logger.debug(__name__, f'User {user} leaved_on {join.leaved_on}. Ontime: {ontime}h | xp: from {old_xp} to {user.xp}')
         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
-    ):
+    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}')
         settings: BaseServerSettings = self._base_helper.get_config(member.guild.id)
@@ -125,7 +116,5 @@ class BaseOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
 
                 else:
                     self._logger.trace(__name__, f'User {member.id} switched to {after.channel}')
-                    self._update_voice_state(False, member.id, before.channel.id, server)
-                    self._update_voice_state(True, member.id, after.channel.id, server)
         except Exception as e:
             self._logger.error(__name__, f'Cannot handle voice state for user {member.id}', e)

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

@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 
 """
 
-__title__ = 'modules.base.helper'
+__title__ = 'modules.auto_role.helper'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,12 +1,8 @@
-from datetime import datetime
-
 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_core.abc.client_utils_abc import ClientUtilsABC
-from bot_core.helper.log_message_helper import LogMessageHelper
 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
@@ -22,7 +18,6 @@ class BaseReactionHandler:
             servers: ServerRepositoryABC,
             users: UserRepositoryABC,
             base_helper: BaseHelperABC,
-            client_utils: ClientUtilsABC,
             db: DatabaseContextABC,
     ):
         self._logger = logger
@@ -30,7 +25,6 @@ class BaseReactionHandler:
         self._servers = servers
         self._users = users
         self._base_helper = base_helper
-        self._client_utils = client_utils
         self._db = db
 
     async def handle(self, payload: RawReactionActionEvent, r_type=None) -> None:
@@ -42,33 +36,11 @@ class BaseReactionHandler:
             self._logger.warn(__name__, f'User {payload.user_id} in {guild.name} not found - skipping')
             return
 
-        try:
-            log_msg = f'{member.name} reacted'
-            if payload.emoji.name is not None:
-                log_msg += f' with {payload.emoji.name}'
-            try:
-                channel = guild.get_channel(payload.channel_id)
-                message = await channel.fetch_message(payload.message_id)
-                self._logger.info(__name__, f'{log_msg} to message {LogMessageHelper.get_log_string(message)}')
-            except Exception as e:
-                self._logger.error(__name__, f'Getting message for reaction logging failed', e)
-                self._logger.info(__name__, f'{log_msg} to message {payload.message_id}')
-        except Exception as e:
-            self._logger.error(__name__, f'Reaction logging failed', e)
-
-        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':
-            if self._client_utils.is_message_xp_count_by_hour_higher_that_max_message_count_per_hour(
-                    datetime.now(), user, settings, is_reaction=True
-            ):
-                return
-
             user.xp += settings.xp_per_reaction
             self._users.update_user(user)
             self._db.save_changes()

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

@@ -15,7 +15,7 @@ __title__ = 'modules.base.service'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -1,26 +1 @@
-# -*- 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.thread'
-__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/boot_log/__init__.py

@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

kdb-bot/src/modules/boot_log/boot-log.json

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

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

@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -15,7 +15,7 @@ __title__ = 'modules.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0'
+__version__ = '0.3.dev25'
 
 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='0')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "database",
     "Version": {
-      "Major": "0",
-      "Minor": "3",
-      "Micro": "0"
+      "Major": "1",
+      "Minor": "0",
+      "Micro": "0.dev1"
     },
     "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==2022.12.0"
+      "cpl-core>=2022.10.0.post2"
     ],
     "DevDependencies": [
-      "cpl-cli==2022.12.0"
+      "cpl-cli==2022.10.0"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},