Fixed tests #139

.gitignore

@@ -143,4 +143,5 @@ PythonImportHelper-v2-Completion.json
 deploy/
 
 # idea
-.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

@@ -2,8 +2,7 @@
 FROM python:3.10.4-alpine
 
 WORKDIR /app
-COPY ./dist/bot/build/kdb-bot/ .
+COPY ./dist/bot/build/ .
-COPY ./dist/bot/build/requirements.txt .
 
 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.0rc1'
+__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.rc1')
+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.rc1"
+      "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-query==2022.10.0.post2",
-      "cpl-discord==2022.12.0",
+      "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",
+      "Flask-SocketIO==5.3.1",
-      "eventlet==0.33.2",
+      "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/translation/de.json

@@ -160,8 +160,8 @@
         "removed": "Presence wurde entfernt.",
         "max_char_count_exceeded": "Der Text darf nicht mehr als 128 Zeichen lang sein!"
       },
-      "user": {
+      "user_info": {
-        "atr": {
+        "fields": {
           "id": "Id",
           "name": "Name",
           "discord_join": "Discord beigetreten am",
@@ -173,27 +173,7 @@
           "lefts": "Abgänge",
           "warnings": "Verwarnungen"
         },
-        "info": {
+        "footer": ""
-          "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 konnte nicht als eine Ganzzahl interpretiert werden :("
-          }
-        },
-        "remove": {
-          "xp": "Die {} von {} wurden entfernt",
-          "ontime": "Die {} von {} wurden entfernt"
-        },
-        "error": {
-          "atr_not_found": "Das Attribut {} konnte nicht gefunden werden :("
-        }
       }
     },
     "boot_log": {

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

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

@@ -25,7 +25,7 @@ class MessageServiceABC(ABC):
     async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False): pass
 
     @abstractmethod
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True): pass
+    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, 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.rc1"
+      "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.0rc1'
+__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.rc1')
+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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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.0rc1'
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

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

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

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

@@ -89,7 +89,7 @@ class MessageService(MessageServiceABC):
                 self._db.save_changes()
             self._logger.info(__name__, f'Sent message to user {receiver.id}')
     
-    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False):
+    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
         if ctx is None:
             self._logger.warn(__name__, 'Message context is empty')
             self._logger.debug(__name__, f'Message: {message}')
@@ -99,9 +99,9 @@ class MessageService(MessageServiceABC):
         msg = None
         try:
             if isinstance(message, discord.Embed):
-                msg = await ctx.send(embed=message, file=file, 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:
@@ -119,7 +119,7 @@ class MessageService(MessageServiceABC):
             if ctx.guild is not None:
                 await self.delete_message(msg, without_tracking)
 
-    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, 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}')
@@ -128,9 +128,9 @@ class MessageService(MessageServiceABC):
         self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {interaction.channel}')
         try:
             if isinstance(message, discord.Embed):
-                await interaction.response.send_message(embed=message, 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.0rc1'
+__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.rc1')
+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.0rc1'
+__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.rc1')
+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/bot-data.json

@@ -4,7 +4,7 @@
     "Version": {
       "Major": "0",
       "Minor": "3",
-      "Micro": "0.rc1"
+      "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/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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

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

@@ -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/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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "auto-role",
     "Version": {
-      "Major": "0",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "base",
     "Version": {
-      "Major": "0",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

@@ -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/user_group.py

@@ -1,15 +1,12 @@
-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 mysql.connector.errors import DatabaseError
 
 from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 from bot_core.abc.message_service_abc import MessageServiceABC
@@ -20,7 +17,6 @@ from bot_data.abc.server_repository_abc import ServerRepositoryABC
 from bot_data.abc.user_joined_server_repository_abc import UserJoinedServerRepositoryABC
 from bot_data.abc.user_joined_voice_channel_abc import UserJoinedVoiceChannelRepositoryABC
 from bot_data.abc.user_repository_abc import UserRepositoryABC
-from modules.level.service.level_service import LevelService
 from modules.permission.abc.permission_service_abc import PermissionServiceABC
 
 
@@ -35,13 +31,11 @@ class UserGroup(DiscordCommandABC):
             client_utils: ClientUtilsServiceABC,
             permissions: PermissionServiceABC,
             servers: ServerRepositoryABC,
-            db: DatabaseContextABC,
             users: UserRepositoryABC,
             user_joined_servers: UserJoinedServerRepositoryABC,
             user_joined_voice_channel: UserJoinedVoiceChannelRepositoryABC,
             translate: TranslatePipe,
-            date: DateTimeOffsetPipe,
+            date: DateTimeOffsetPipe
-            level: LevelService
     ):
         DiscordCommandABC.__init__(self)
 
@@ -52,21 +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')
-        }
-
     @commands.hybrid_group()
     @commands.guild_only()
     async def user(self, ctx: Context):
@@ -96,28 +83,26 @@ class UserGroup(DiscordCommandABC):
             color=int('ef9d0d', 16)
         )
 
-        ontime = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id).sum(
+        ujvs = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
-            lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
+        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.atr.id'), value=member.id)
+        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.atr.name'), value=member.name)
+        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.atr.discord_join'),
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.discord_join'), value=self._date.transform(member.created_at), inline=False)
-                        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.atr.last_join'),
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.xp'), value=str(user.xp))
-                        value=self._date.transform(member.joined_at), inline=False)
+        embed.add_field(name=self._t.transform('modules.base.user_info.fields.ontime'), value=str(ontime))
-        embed.add_field(name=self._t.transform('modules.base.user.atr.xp'), value=str(user.xp))
-        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'), value=str(ontime))
 
         roles = ''
         for role in member.roles:
             roles += f'{role.name}\n'
-        embed.add_field(name=self._t.transform('modules.base.user.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 = ''
@@ -128,130 +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'),
+            embed.add_field(name=self._t.transform('modules.base.user_info.fields.warnings'), value=self._t.transform('common.not_implemented_yet'), inline=False)
-                            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 {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 == self._atr_dict["xp"]:
-            value = str(user.xp)
-
-        elif atr == self._atr_dict["ontime"]:
-            value = str(round(
-                self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
-                .sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
-                2
-            ))
-
-        else:
-            await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.error.atr_not_found').format(atr))
-            return
-
-        await self._message_service.send_interaction_msg(
-            ctx.interaction,
-            self._t.transform(f'modules.base.user.get.{atr}').format(member.mention, value)
-        )
-
-    @get.autocomplete('atr')
-    async def get_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
-        atr_list = [self._atr_dict["xp"], self._atr_dict["ontime"]]
-        return [app_commands.Choice(name=atr, value=atr) for atr in 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 {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 == self._atr_dict["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}').format(member.mention, value))
-
-    @set.autocomplete('atr')
-    async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
-        atr_list = [self._atr_dict["xp"]]
-        return [app_commands.Choice(name=atr, value=atr) for atr 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 {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 == self._atr_dict["xp"]:
-            user.xp = 0
-            self._users.update_user(user)
-            self._db.save_changes()
-            await self._level.check_level(member)
-
-        elif atr == self._atr_dict["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}').format(atr, member.mention)
-        )
-
-    @remove.autocomplete('atr')
-    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
-        atr_list = [self._atr_dict["xp"], self._atr_dict["ontime"]]
-        return [app_commands.Choice(name=atr, value=atr) for atr in 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.0rc1'
+__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.rc1')
+version_info = VersionInfo(major='0', minor='3', micro='dev25')

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

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

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.0rc1'
+__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.rc1')
+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.0rc1'
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

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

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "boot-log",
     "Version": {
-      "Major": "0",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -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.0rc1'
+__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.rc1')
+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.0rc1'
+__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.rc1')
+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",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "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": {},

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

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

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

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

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

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

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

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

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "level",
     "Version": {
-      "Major": "0",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "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.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

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

@@ -88,7 +88,7 @@ class LevelSeeder(DataSeederABC):
                 if levels.where(lambda l: l.name == role.name).count() == 0:
                     continue
 
-                new_position = position_above_levels - (levels.index_of(levels.where(lambda l: l.name == role.name).single()) + 1)
+                new_position = position_above_levels - (levels.index(levels.where(lambda l: l.name == role.name).single()) + 1)
                 if new_position <= 0:
                     new_position = 1
                 try:

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

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

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

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

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

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

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

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

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

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

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

@@ -2,9 +2,9 @@
   "ProjectSettings": {
     "Name": "permission",
     "Version": {
-      "Major": "0",
+      "Major": "1",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "Author": "",
     "AuthorEmail": "",
@@ -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/permission/service/__init__.py

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

kdb-bot/src/modules/stats/__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.stats'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports: 
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/stats/command/__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.stats.command'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/stats/model/__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.stats.model'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/stats/service/__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.stats.service'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

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

@@ -3,8 +3,8 @@
     "Name": "stats",
     "Version": {
       "Major": "0",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "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.1"
     ],
     "PythonVersion": ">=3.10.4",
     "PythonPath": {},

kdb-bot/src/modules/stats/ui/__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.stats.ui'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/technician/__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.technician'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
 # imports: 
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/technician/command/__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__ = 'modules.technician.command'
-__author__ = 'Sven Heidemann'
-__license__ = 'MIT'
-__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
-__version__ = '0.3.0rc1'
-
-from collections import namedtuple
-
-
-# imports:
-
-VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='0', minor='3', micro='0.rc1')

kdb-bot/src/modules/technician/command/log_command.py

@@ -110,7 +110,7 @@ class LogCommand(DiscordCommandABC):
         zip_file = ZipFile('logs.zip', 'w')
         files.for_each(lambda x: zip_file.write(x))
         zip_file.close()
-        await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.technician.log_message'), file=discord.File(zip_file.filename, 'logs.zip'))
+        await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.technician.log_message'), file=discord.File(zip_file.filename, 'logs.zip'), ephemeral=True)
         os.remove(zip_file.filename)
 
         self._logger.trace(__name__, f'Finished log command')

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

@@ -3,8 +3,8 @@
     "Name": "technician",
     "Version": {
       "Major": "0",
-      "Minor": "3",
+      "Minor": "0",
-      "Micro": "0.rc1"
+      "Micro": "0"
     },
     "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.6",
     "PythonPath": {},

kdb-bot/test/ui_tests/__init__.py

@@ -0,0 +1 @@
+# imports:

kdb-bot/test/ui_tests/config/appsettings.edrafts-pc.json

@@ -0,0 +1,16 @@
+{
+  "DatabaseSettings": {
+    "Host": "localhost",
+    "User": "kd_kdb",
+    "Password": "",
+    "Database": "keksdose_bot_dev",
+    "Charset": "utf8mb4",
+    "UseUnicode": "true",
+    "Buffered": "true",
+    "AuthPlugin": "mysql_native_password"
+  },
+  "DiscordBot": {
+    "Token": "",
+    "Prefix": "!kab-e "
+  }
+}

kdb-bot/test/ui_tests/config/appsettings.json

@@ -0,0 +1,54 @@
+{
+  "TimeFormatSettings": {
+    "DateFormat": "%Y-%m-%d",
+    "TimeFormat": "%H:%M:%S",
+    "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f",
+    "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S"
+  },
+  "LoggingSettings": {
+    "Path": "logs/$date_now/",
+    "Filename": "bot.log",
+    "ConsoleLogLevel": "ERROR",
+    "FileLogLevel": "WARN"
+  },
+  "BotLoggingSettings": {
+    "Api": {
+      "Path": "logs/$date_now/",
+      "Filename": "api.log",
+      "ConsoleLogLevel": "INFO",
+      "FileLogLevel": "DEBUG"
+    },
+    "Command": {
+      "Path": "logs/$date_now/",
+      "Filename": "commands.log",
+      "ConsoleLogLevel": "INFO",
+      "FileLogLevel": "DEBUG"
+    },
+    "Database": {
+      "Path": "logs/$date_now/",
+      "Filename": "database.log",
+      "ConsoleLogLevel": "INFO",
+      "FileLogLevel": "DEBUG"
+    },
+    "Message": {
+      "Path": "logs/$date_now/",
+      "Filename": "message.log",
+      "ConsoleLogLevel": "INFO",
+      "FileLogLevel": "DEBUG"
+    }
+  },
+  "Translation": {
+    "DefaultLanguage": "de",
+    "Languages": [
+      "de"
+    ]
+  },
+  "TestSettings": {
+    "LoginUrl": "https://discord.com/login",
+    "MePageUrl": "https://discord.com/channels/@me",
+    "CmdURL": "https://discord.com/channels/910199451145076828/911578636899987526",
+    "GuildId": 910199451145076828,
+    "BotId": 998159802393964594,
+    "TestUserId": 401941112010571777
+  }
+}

kdb-bot/test/ui_tests/main.py

@@ -0,0 +1,34 @@
+import asyncio
+
+from cpl_core.application import ApplicationABC
+from cpl_core.application import ApplicationBuilder
+
+from startup_test_extension import StartupTestExtension
+from ui_tests.startup import Startup
+from ui_tests_shared.declarations import Declarations
+
+try:
+    from test_application import TestApplication
+except ImportError:
+    from .test_application import TestApplication
+
+
+def get_app() -> ApplicationABC:
+    app_builder = ApplicationBuilder(TestApplication) \
+        .use_extension(StartupTestExtension) \
+        .use_startup(Startup)
+    app = app_builder.build()
+    Declarations.app = app
+    return app
+
+
+async def main():
+    app = get_app()
+    await app.run_async()
+
+
+if __name__ == '__main__':
+    import nest_asyncio
+
+    nest_asyncio.apply()
+    asyncio.run(main())

kdb-bot/test/ui_tests/startup.py

@@ -0,0 +1,118 @@
+import os
+from typing import Optional
+
+from cpl_core.application import StartupABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.database import DatabaseSettings
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_core.environment import ApplicationEnvironment
+from cpl_discord import get_discord_collection
+from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum
+from dotenv import load_dotenv
+
+from bot.startup_settings_extension import StartupSettingsExtension
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+from bot_core.abc.custom_file_logger_abc import CustomFileLoggerABC
+from bot_core.abc.message_service_abc import MessageServiceABC
+from bot_core.configuration.bot_logging_settings import BotLoggingSettings
+from bot_core.logging.command_logger import CommandLogger
+from bot_core.logging.database_logger import DatabaseLogger
+from bot_core.logging.message_logger import MessageLogger
+from bot_core.pipes.date_time_offset_pipe import DateTimeOffsetPipe
+from bot_core.service.client_utils_service import ClientUtilsService
+from bot_core.service.message_service import MessageService
+from bot_data.abc.auth_user_repository_abc import AuthUserRepositoryABC
+from bot_data.abc.auto_role_repository_abc import AutoRoleRepositoryABC
+from bot_data.abc.client_repository_abc import ClientRepositoryABC
+from bot_data.abc.known_user_repository_abc import KnownUserRepositoryABC
+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_abc import UserJoinedVoiceChannelRepositoryABC
+from bot_data.abc.user_repository_abc import UserRepositoryABC
+from bot_data.db_context import DBContext
+from bot_data.service.auth_user_repository_service import AuthUserRepositoryService
+from bot_data.service.auto_role_repository_service import AutoRoleRepositoryService
+from bot_data.service.client_repository_service import ClientRepositoryService
+from bot_data.service.known_user_repository_service import KnownUserRepositoryService
+from bot_data.service.level_repository_service import LevelRepositoryService
+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_service import UserJoinedVoiceChannelRepositoryService
+from bot_data.service.user_repository_service import UserRepositoryService
+from ui_tests.test_on_ready_event import TestOnReadyEvent
+
+
+class Startup(StartupABC):
+
+    def __init__(self):
+        StartupABC.__init__(self)
+
+        self._config: Optional[ConfigurationABC] = None
+
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironment) -> ConfigurationABC:
+        load_dotenv()
+        configuration.add_environment_variables('KDB_TEST_')
+        configuration.add_environment_variables('DISCORD_')
+
+        cwd = os.path.dirname(os.path.realpath(__file__))
+        configuration.add_json_file(f'{cwd}/config/appsettings.json', optional=False)
+        configuration.add_json_file(f'{cwd}/config/appsettings.{environment.host_name}.json', optional=True)
+
+        StartupSettingsExtension._configure_settings_with_sub_settings(configuration, BotLoggingSettings, lambda x: x.files, lambda x: x.key)
+
+        self._config = configuration
+        return configuration
+
+    def configure_services(self, services: ServiceCollectionABC, environment: ApplicationEnvironment) -> ServiceProviderABC:
+        services.add_logging()
+        services.add_singleton(CustomFileLoggerABC, CommandLogger)
+        services.add_singleton(CustomFileLoggerABC, DatabaseLogger)
+        services.add_singleton(CustomFileLoggerABC, MessageLogger)
+
+        services.add_translation()
+        db_settings: DatabaseSettings = self._config.get_configuration(DatabaseSettings)
+        db_settings_with_pw = DatabaseSettings()
+        pw = self._config.get_configuration('DB_PASSWORD')
+        db_settings_with_pw.from_dict({
+            "Host": db_settings.host,
+            "User": db_settings.user,
+            "Password": '' if pw is None else pw,
+            "Database": db_settings.database,
+            "Charset": db_settings.charset,
+            "UseUnicode": db_settings.use_unicode,
+            "Buffered": db_settings.buffered,
+            "AuthPlugin": db_settings.auth_plugin
+        })
+        services.add_db_context(DBContext, db_settings_with_pw)
+
+        services.add_discord()
+        dc = get_discord_collection(services)
+        dc.add_event(DiscordEventTypesEnum.on_ready.value, TestOnReadyEvent)
+
+        # bot_core stuff
+        services.add_transient(MessageServiceABC, MessageService)
+        services.add_transient(ClientUtilsServiceABC, ClientUtilsService)
+
+        # pipes
+        services.add_transient(DateTimeOffsetPipe)
+
+        # data stuff
+        services.add_transient(AuthUserRepositoryABC, AuthUserRepositoryService)
+        services.add_transient(ServerRepositoryABC, ServerRepositoryService)
+        services.add_transient(UserRepositoryABC, UserRepositoryService)
+        services.add_transient(ClientRepositoryABC, ClientRepositoryService)
+        services.add_transient(KnownUserRepositoryABC, KnownUserRepositoryService)
+        services.add_transient(UserJoinedServerRepositoryABC, UserJoinedServerRepositoryService)
+        services.add_transient(UserJoinedVoiceChannelRepositoryABC, UserJoinedVoiceChannelRepositoryService)
+        services.add_transient(AutoRoleRepositoryABC, AutoRoleRepositoryService)
+        services.add_transient(LevelRepositoryABC, LevelRepositoryService)
+        services.add_transient(StatisticRepositoryABC, StatisticRepositoryService)
+
+        services.add_transient(SeederService)
+
+        return services.build_service_provider()

kdb-bot/test/ui_tests/startup_test_extension.py

@@ -0,0 +1,20 @@
+import os
+
+from cpl_core.application import StartupExtensionABC
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceCollectionABC
+from cpl_core.environment import ApplicationEnvironmentABC
+
+
+class StartupTestExtension(StartupExtensionABC):
+
+    def __init__(self):
+        StartupExtensionABC.__init__(self)
+
+    def configure_configuration(self, configuration: ConfigurationABC, environment: ApplicationEnvironmentABC):
+        # this shit has to be done here because we need settings in subsequent startup extensions
+        environment.set_working_directory(os.path.dirname(os.path.realpath(__file__)))
+        environment.set_working_directory('../../src/bot/')
+
+    def configure_services(self, services: ServiceCollectionABC, env: ApplicationEnvironmentABC):
+        pass

kdb-bot/test/ui_tests/test_application.py

@@ -0,0 +1,64 @@
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_discord.application import DiscordBotApplicationABC
+from cpl_discord.configuration import DiscordBotSettings
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslationSettings, TranslationServiceABC
+
+from bot_core.configuration.bot_settings import BotSettings
+
+
+class TestApplication(DiscordBotApplicationABC):
+
+    def __init__(self, config: ConfigurationABC, services: ServiceProviderABC):
+        DiscordBotApplicationABC.__init__(self, config, services)
+
+        self._config = config
+        self._services = services
+
+        self._bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
+        self._translation: TranslationServiceABC = services.get_service(TranslationServiceABC)
+
+        discord_bot_settings: DiscordBotSettings = config.get_configuration(DiscordBotSettings)
+        self._discord_settings = self._get_settings(discord_bot_settings)
+
+    def _get_settings(self, settings_from_config: DiscordBotSettings) -> DiscordBotSettings:
+        new_settings = DiscordBotSettings()
+        token = None if settings_from_config is None else settings_from_config.token
+        prefix = None if settings_from_config is None else settings_from_config.prefix
+        env_token = self._config.get_configuration('TOKEN')
+        env_prefix = self._config.get_configuration('PREFIX')
+
+        new_settings.from_dict({
+            'Token': env_token if token is None or token == '' else token,
+            'Prefix': ('! ' if self._is_string_invalid(env_prefix) else env_prefix) if self._is_string_invalid(prefix) else prefix
+        })
+        if new_settings.token is None or new_settings.token == '':
+            raise Exception('You have to configure discord token by appsettings or environment variables')
+        return new_settings
+
+    @staticmethod
+    def _is_string_invalid(x):
+        return x is None or x == ''
+
+    @property
+    def config(self) -> ConfigurationABC:
+        return self._config
+
+    @property
+    def services(self) -> ServiceProviderABC:
+        return self._services
+
+    async def configure(self):
+        self._translation.load_by_settings(self._configuration.get_configuration(TranslationSettings))
+
+    async def main(self):
+        if self._config.get_configuration('IS_UNITTEST'):
+            await self._bot.login(self._discord_settings.token)
+            self._bot.loop.create_task(self._bot.connect())
+            return
+
+        await self._bot.start_async()
+
+    async def stop_async(self):
+        await self._bot.close()

kdb-bot/test/ui_tests/test_on_ready_event.py

@@ -0,0 +1,47 @@
+import os
+import unittest
+
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.console import Console, ForegroundColorEnum
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_core.logging import LoggerABC
+from cpl_discord.events import OnReadyABC
+from cpl_discord.service import DiscordBotServiceABC
+from cpl_translation import TranslatePipe
+
+from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
+
+
+class TestOnReadyEvent(OnReadyABC):
+
+    def __init__(
+            self,
+            config: ConfigurationABC,
+            bot: DiscordBotServiceABC,
+            services: ServiceProviderABC,
+            client_utils: ClientUtilsServiceABC,
+            t: TranslatePipe
+    ):
+        OnReadyABC.__init__(self)
+
+        self._config = config
+        self._bot = bot
+        self._services = services
+        self._client_utils = client_utils
+        self._t = t
+
+    async def on_ready(self):
+        if self._config.get_configuration('IS_UNITTEST'):
+            return
+
+        Console.write_line('\nStarting tests:\n')
+        loader = unittest.TestLoader()
+        path = f'{os.path.dirname(os.path.realpath(__file__))}/../'
+        tests = loader.discover(path, pattern='*_test_case.py')
+        runner = unittest.TextTestRunner()
+        runner.run(tests)
+        # for cls in CommandTestABC.__subclasses__():
+        #     service: CommandTestABC = self._services.get_service(cls)
+        #     await service.run(self._tests)
+
+        await self._bot.close()

kdb-bot/test/ui_tests/ui-tests.json

@@ -0,0 +1,49 @@
+{
+  "ProjectSettings": {
+    "Name": "ui-tests",
+    "Version": {
+      "Major": "0",
+      "Minor": "0",
+      "Micro": "0"
+    },
+    "Author": "",
+    "AuthorEmail": "",
+    "Description": "",
+    "LongDescription": "",
+    "URL": "",
+    "CopyrightDate": "",
+    "CopyrightName": "",
+    "LicenseName": "",
+    "LicenseDescription": "",
+    "Dependencies": [
+      "cpl-core>=2022.10.0.post9",
+      "PyNaCl==1.5.0",
+      "cffi==1.15.1",
+      "pycparser==2.21",
+      "selenium==4.6.1",
+      "webdriver-manager==3.8.5"
+    ],
+    "DevDependencies": [
+      "cpl-cli>=2022.10.0"
+    ],
+    "PythonVersion": ">=3.10.4",
+    "PythonPath": {},
+    "Classifiers": []
+  },
+  "BuildSettings": {
+    "ProjectType": "console",
+    "SourcePath": "",
+    "OutputPath": "../../dist",
+    "Main": "ui_tests_shared.main",
+    "EntryPoint": "ui-tests-shared",
+    "IncludePackageData": false,
+    "Included": [],
+    "Excluded": [
+      "*/__pycache__",
+      "*/logs",
+      "*/tests"
+    ],
+    "PackageData": {},
+    "ProjectReferences": []
+  }
+}