Merge pull request 'dev into staging' (#414) from dev into staging

Reviewed-on: #414

.gitea/issue_template.md

@@ -0,0 +1,17 @@
+#### Beschreibung
+
+Als Produktmanager muss ich nun dieses Ticket ausfüllen.
+
+#### Aktuelles Verhalten
+
+* Was macht die Software aktuell?
+
+#### Gewünschtes Verhalten
+
+* Was soll die Software anders machen?
+
+#### Akzeptanzkriterien
+
+* Was muss erfüllt sein, damit das Ticket als abgeschlossen angesehen werden kann?
+
+#### Anmerkungen

.gitea/pull_request_template.md

@@ -0,0 +1,7 @@
+#### Ticket Referenz:
+
+#1
+
+#### Gibt es etwas beim Review zu beachten?
+
+Nein

.gitea/workflows/deploy_dev.yaml

@@ -0,0 +1,77 @@
+name: Deploy dev on push
+run-name: Deploy dev on push
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  on-push-deploy_sh-edraft:
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Prepare bot build
+        run: |
+          cd bot
+          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cpl i
+
+      - name: Setup node
+        uses: https://github.com/actions/setup-node@v3
+
+      - name: Prepare web build
+        run: |
+          cd web
+          npm install -g ts-node
+          npm ci
+
+      - name: Shutdown stack
+        run: docker stack rm sdb_dev
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-dev .
+
+      - name: Build docker web
+        run: |
+          cd web
+          docker image prune -f
+          cp src/favicon.dev.ico src/favicon.ico
+          npm run build
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-dev .
+
+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-dev sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-dev
+
+      - name: Deploy Stack to sh-edraft.de
+        uses: https://github.com/kgierke/portainer-stack-deployment@v1
+        with:
+          portainer-url: "https://docker.sh-edraft.de"
+          portainer-username: "gitea_job"
+          portainer-password: "${{ secrets.docker_job }}"
+          portainer-endpoint: 2
+          name: sdb_dev
+          file: bot/docker/docker-compose.dev.yml
+          variables: '{}'

.gitea/workflows/deploy_prod.yaml

@@ -0,0 +1,76 @@
+name: Deploy prod on push
+run-name: Deploy prod on push
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  on-push-deploy_sh-edraft:
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Prepare bot build
+        run: |
+          cd bot
+          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cpl i
+
+      - name: Setup node
+        uses: https://github.com/actions/setup-node@v3
+
+      - name: Prepare web build
+        run: |
+          cd web
+          npm install -g ts-node
+          npm ci
+
+      - name: Shutdown stack
+        run: docker stack rm sdb_prod
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .
+
+      - name: Build docker web
+        run: |
+          cd web
+          docker image prune -f
+          npm run build
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv) .
+
+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv) sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)
+
+      - name: Deploy Stack to sh-edraft.de
+        uses: https://github.com/kgierke/portainer-stack-deployment@v1
+        with:
+          portainer-url: "https://docker.sh-edraft.de"
+          portainer-username: "gitea_job"
+          portainer-password: "${{ secrets.docker_job }}"
+          portainer-endpoint: 2
+          name: sdb_prod
+          file: bot/docker/docker-compose.yml
+          variables: '{}'

.gitea/workflows/deploy_staging.yaml

@@ -0,0 +1,77 @@
+name: Deploy staging on push
+run-name: Deploy staging on push
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  on-push-deploy_sh-edraft:
+    runs-on: [ dobby.sh-edraft.de, ubuntu-latest ]
+    container: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Setup Python 3.10
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.10.12"
+      - run: python -v
+
+      - name: Setup docker
+        uses: https://github.com/papodaca/install-docker-action@main
+      - run: docker -v
+
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+          submodules: true
+
+      - name: Prepare bot build
+        run: |
+          cd bot
+          pip install --extra-index-url https://pip.sh-edraft.de cpl-cli
+          cpl i
+
+      - name: Setup node
+        uses: https://github.com/actions/setup-node@v3
+
+      - name: Prepare web build
+        run: |
+          cd web
+          npm install -g ts-node
+          npm ci
+
+      - name: Shutdown stack
+        run: docker stack rm sdb_staging
+
+      - name: Build docker bot
+        run: |
+          cd bot
+          docker image prune -f
+          cpl build
+          docker build -t sh-edraft.de/sdb-bot:$(cpl gv)-staging .
+
+      - name: Build docker web
+        run: |
+          cd web
+          docker image prune -f
+          cp src/favicon.staging.ico src/favicon.ico
+          npm run build
+          docker build -t sh-edraft.de/sdb-web:$(npm run -s gv)-staging .
+
+      - name: Set version
+        run: |
+          cd bot/docker
+          chmod +x ./set-docker-compose-image-version.sh
+          ./set-docker-compose-image-version.sh sh-edraft.de/sdb-bot:$(cd ../; cpl gv)-staging sh-edraft.de/sdb-web:$(cd ../../web; npm run -s gv;)-staging
+
+      - name: Deploy Stack to sh-edraft.de
+        uses: https://github.com/kgierke/portainer-stack-deployment@v1
+        with:
+          portainer-url: "https://docker.sh-edraft.de"
+          portainer-username: "gitea_job"
+          portainer-password: "${{ secrets.docker_job }}"
+          portainer-endpoint: 2
+          name: sdb_staging
+          file: bot/docker/docker-compose.staging.yml
+          variables: '{}'

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "kdb-bot/src/bot/config"]
-	path = kdb-bot/src/bot/config
-	url = https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot.config.git
-[submodule "kdb-bot/src/bot_api/config"]
-	path = kdb-bot/src/bot_api/config
-	url = https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot.api.config.git
-[submodule "kdb-bot/docker"]
-	path = kdb-bot/docker
-	url = https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot.docker.git
+[submodule "bot/src/bot/config"]
+	path = bot/src/bot/config
+	url = https://git.sh-edraft.de/sh-edraft.de/sh_discord_bot.config.git
+[submodule "bot/src/bot_api/config"]
+	path = bot/src/bot_api/config
+	url = https://git.sh-edraft.de/sh-edraft.de/sh_discord_bot.api.config.git
+[submodule "bot/docker"]
+	path = bot/docker
+	url = https://git.sh-edraft.de/sh-edraft.de/sh_discord_bot.docker.git

bot/cpl-workspace.json

@@ -16,6 +16,8 @@
       "level": "src/modules/level/level.json",
       "permission": "src/modules/permission/permission.json",
       "technician": "src/modules/technician/technician.json",
+      "short-role-name": "src/modules/short_role_name/short-role-name.json",
+      "special-offers": "src/modules/special_offers/special-offers.json",
       "checks": "tools/checks/checks.json",
       "get-version": "tools/get_version/get-version.json",
       "post-build": "tools/post_build/post-build.json",
@@ -30,12 +32,12 @@
       "pre-build": "cpl set-version $ARGS; black ./;",
       "post-build": "cpl run post-build --dev; black ./;",
       "pre-prod": "cpl build",
-      "prod": "export KDB_ENVIRONMENT=production; export KDB_NAME=KDB-Prod; cpl start;",
+      "prod": "export SDB_ENVIRONMENT=production; export SDB_NAME=SDB-Prod; cpl start;",
       "pre-stage": "cpl build",
-      "stage": "export KDB_ENVIRONMENT=staging; export KDB_NAME=KDB-Stage; cpl start;",
+      "stage": "export SDB_ENVIRONMENT=staging; export SDB_NAME=SDB-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) .;",
+      "dev": "export SDB_ENVIRONMENT=development; export SDB_NAME=SDB-Dev; cpl start;",
+      "docker-build": "cpl build $ARGS; docker build -t sh-edraft.de/sdb-bot:$(cpl gv) .;",
       "dc-up": "docker-compose up -d",
       "dc-down": "docker-compose down",
       "docker": "cpl dc-down; cpl docker-build; cpl dc-up;"

bot/dockerfile

@@ -2,7 +2,7 @@
 FROM python:3.10.4-alpine
 
 WORKDIR /app
-COPY ./dist/bot/build/kdb-bot/ .
+COPY ./dist/bot/build/bot/ .
 COPY ./dist/bot/build/requirements.txt .
 
 RUN python -m pip install --upgrade pip

bot/src/bot/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot/application.py

@@ -8,6 +8,7 @@ from cpl_discord.service import DiscordBotServiceABC, DiscordBotService
 from cpl_translation import TranslatePipe, TranslationServiceABC, TranslationSettings
 
 from bot_api.api_thread import ApiThread
+from bot_core.abc.task_abc import TaskABC
 from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
 from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 from bot_core.service.data_integrity_service import DataIntegrityService
@@ -29,6 +30,8 @@ class Application(DiscordBotApplicationABC):
         # cpl-translation
         self._translation: TranslationServiceABC = services.get_service(TranslationServiceABC)
         self._t: TranslatePipe = services.get_service(TranslatePipe)
+        # internal stuff
+        self._tasks = services.get_services(TaskABC)
 
         self._feature_flags: FeatureFlagsSettings = config.get_configuration(FeatureFlagsSettings)
 
@@ -55,6 +58,9 @@ class Application(DiscordBotApplicationABC):
                 return
 
             self._logger.info(__name__, f"Try to start {DiscordBotService.__name__}")
+            for task in self._tasks:
+                await self._bot.add_cog(task)
+
             await self._bot.start_async()
             await self._bot.stop_async()
         except Exception as e:

bot/src/bot/bot.json

@@ -3,35 +3,37 @@
     "Name": "bot",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "2",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
-    "Description": "Keksdose bot",
-    "LongDescription": "Discord bot  for the Keksdose discord Server",
+    "Description": "sh-edraft.de Discord bot",
+    "LongDescription": "Discord bot for customers of sh-edraft.de",
     "URL": "https://www.sh-edraft.de",
     "CopyrightDate": "2022 - 2023",
     "CopyrightName": "sh-edraft.de",
     "LicenseName": "MIT",
     "LicenseDescription": "MIT, see LICENSE for more details.",
     "Dependencies": [
-      "cpl-core==2023.4.0.post5",
+      "cpl-core==2023.10.0",
       "cpl-translation==2023.4.0.post1",
-      "cpl-query==2023.4.0.post1",
-      "cpl-discord==2023.4.0.post3",
-      "Flask==2.3.2",
-      "Flask-Classful==0.14.2",
+      "cpl-query==2023.10.0",
+      "cpl-discord==2023.10.0.post1",
+      "Flask==3.0.0",
+      "Flask-Classful==0.16.0",
       "Flask-Cors==4.0.0",
       "PyJWT==2.8.0",
       "waitress==2.1.2",
-      "Flask-SocketIO==5.3.4",
+      "Flask-SocketIO==5.3.6",
       "eventlet==0.33.3",
       "requests-oauthlib==1.3.1",
-      "icmplib==3.0.3",
+      "icmplib==3.0.4",
       "ariadne==0.20.1",
-      "cryptography==41.0.2",
-      "discord>=2.3.2"
+      "cryptography==41.0.4",
+      "discord==2.3.2",
+      "bs4==0.0.1",
+      "lxml==4.9.3"
     ],
     "DevDependencies": [
       "cpl-cli==2023.4.0.post3",
@@ -68,6 +70,8 @@
       "../modules/database/database.json",
       "../modules/level/level.json",
       "../modules/permission/permission.json",
+      "../modules/short_role_name/short-role-name.json",
+      "../modules/special_offers/special-offers.json",
       "../modules/technician/technician.json"
     ]
   }

bot/src/bot/extension/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot.extension"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot/module_list.py

@@ -13,6 +13,8 @@ from modules.config.config_module import ConfigModule
 from modules.database.database_module import DatabaseModule
 from modules.level.level_module import LevelModule
 from modules.permission.permission_module import PermissionModule
+from modules.short_role_name.short_role_name_module import ShortRoleNameModule
+from modules.special_offers.special_offers_module import SteamSpecialOffersModule
 from modules.technician.technician_module import TechnicianModule
 
 
@@ -35,6 +37,8 @@ class ModuleList:
                 ApiModule,
                 TechnicianModule,
                 AchievementsModule,
+                ShortRoleNameModule,
+                SteamSpecialOffersModule,
                 # has to be last!
                 BootLogModule,
                 CoreExtensionModule,

bot/src/bot/startup.py

@@ -16,6 +16,7 @@ from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings
 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.logging.task_logger import TaskLogger
 from bot_data.db_context import DBContext
 
 
@@ -43,6 +44,7 @@ class Startup(StartupABC):
             services.add_singleton(CustomFileLoggerABC, CommandLogger)
             services.add_singleton(CustomFileLoggerABC, DatabaseLogger)
             services.add_singleton(CustomFileLoggerABC, MessageLogger)
+            services.add_singleton(CustomFileLoggerABC, TaskLogger)
 
         if self._feature_flags.get_flag(FeatureFlagsEnum.api_module):
             services.add_singleton(CustomFileLoggerABC, ApiLogger)

bot/src/bot/startup_migration_extension.py

@@ -9,14 +9,27 @@ from bot_data.migration.api_key_migration import ApiKeyMigration
 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.config_feature_flags_migration import ConfigFeatureFlagsMigration
+from bot_data.migration.birthday_migration import BirthdayMigration
+from bot_data.migration.config_feature_flags_migration import (
+    ConfigFeatureFlagsMigration,
+)
 from bot_data.migration.config_migration import ConfigMigration
 from bot_data.migration.db_history_migration import DBHistoryMigration
+from bot_data.migration.default_role_migration import DefaultRoleMigration
+from bot_data.migration.fix_updates_migration import FixUpdatesMigration
+from bot_data.migration.fix_user_history_migration import FixUserHistoryMigration
 from bot_data.migration.initial_migration import InitialMigration
 from bot_data.migration.level_migration import LevelMigration
 from bot_data.migration.remove_stats_migration import RemoveStatsMigration
+from bot_data.migration.short_role_name_migration import ShortRoleNameMigration
+from bot_data.migration.short_role_name_only_highest_migration import (
+    ShortRoleNameOnlyHighestMigration,
+)
 from bot_data.migration.stats_migration import StatsMigration
-from bot_data.migration.user_joined_game_server_migration import UserJoinedGameServerMigration
+from bot_data.migration.steam_special_offer_migration import SteamSpecialOfferMigration
+from bot_data.migration.user_joined_game_server_migration import (
+    UserJoinedGameServerMigration,
+)
 from bot_data.migration.user_message_count_per_hour_migration import (
     UserMessageCountPerHourMigration,
 )
@@ -48,3 +61,10 @@ class StartupMigrationExtension(StartupExtensionABC):
         services.add_transient(MigrationABC, AchievementsMigration)  # 14.06.2023 #268 - 1.1.0
         services.add_transient(MigrationABC, ConfigMigration)  # 19.07.2023 #127 - 1.1.0
         services.add_transient(MigrationABC, ConfigFeatureFlagsMigration)  # 15.08.2023 #334 - 1.1.0
+        services.add_transient(MigrationABC, DefaultRoleMigration)  # 24.09.2023 #360 - 1.1.3
+        services.add_transient(MigrationABC, ShortRoleNameMigration)  # 28.09.2023 #378 - 1.1.7
+        services.add_transient(MigrationABC, FixUpdatesMigration)  # 28.09.2023 #378 - 1.1.7
+        services.add_transient(MigrationABC, ShortRoleNameOnlyHighestMigration)  # 02.10.2023 #391 - 1.1.9
+        services.add_transient(MigrationABC, FixUserHistoryMigration)  # 10.10.2023 #401 - 1.2.0
+        services.add_transient(MigrationABC, BirthdayMigration)  # 10.10.2023 #401 - 1.2.0
+        services.add_transient(MigrationABC, SteamSpecialOfferMigration)  # 10.10.2023 #188 - 1.2.0

bot/src/bot/startup_settings_extension.py

@@ -17,7 +17,7 @@ class StartupSettingsExtension(StartupExtensionABC):
     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__)))
-        configuration.add_environment_variables("KDB_")
+        configuration.add_environment_variables("SDB_")
         configuration.add_environment_variables("DISCORD_")
 
         configuration.add_json_file(f"config/appsettings.json", optional=False)

bot/src/bot/translation/de.json

@@ -82,6 +82,7 @@
       "unexpected_quote_error": "Fehler: Unerwarteter Fehler beim Anführungszeichen!",
       "user_input_error": "Fehler: Eingabefehler!"
     },
+    "feature_not_activated": "Diese Funktion ist deaktiviert",
     "hello_world": "Hallo Welt",
     "no_permission_message": "Nein!\nIch höre nicht auf dich ¯\\_(ツ)_/¯",
     "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
@@ -93,11 +94,16 @@
     }
   },
   "modules": {
+    "special_offers": {
+      "price": "Preis",
+      "discount": "Rabatt",
+      "discount_price": "Neuer Preis"
+    },
     "achievements": {
-      "got_new_achievement": "{} hat die Errungenschaft {} freigeschaltet :D",
       "commands": {
         "check": "Alles klar, ich schaue eben nach... nom nom"
-      }
+      },
+      "got_new_achievement": "{} hat die Errungenschaft {} freigeschaltet :D"
     },
     "auto_role": {
       "add": {
@@ -122,6 +128,9 @@
         },
         "success": "auto-role {} wurde entfernt :D"
       },
+      "react": {
+        "success": "Alle Reaktionen wurden hinzugefügt"
+      },
       "rule": {
         "add": {
           "error": {
@@ -151,33 +160,37 @@
       }
     },
     "base": {
-      "member_left_message": "{} hat uns leider verlassen :(",
-      "complaints": {
-        "title": "Beschwerde einreichen",
-        "label": "Beschwerde",
-        "message": "{} hat eine Beschwerde eingereicht:\n{}",
-        "response": "Danke für deine Beschwerde"
-      },
-      "bug": {
-        "title": "Bug melden",
-        "label": "Bug",
-        "message": "{} meldet einen Bug:\n{}",
-        "response": "Danke für dein Feedback :D"
-      },
       "afk_command_channel_missing_message": "Zu unfähig einem Sprachkanal beizutreten?",
       "afk_command_move_message": "Ich verschiebe dich ja schon... (◔_◔)",
+      "bug": {
+        "label": "Bug",
+        "message": "{} meldet einen Bug:\n{}",
+        "response": "Danke für dein Feedback :D",
+        "title": "Bug melden"
+      },
+      "complaints": {
+        "label": "Beschwerde",
+        "message": "{} hat eine Beschwerde eingereicht:\n{}",
+        "response": "Danke für deine Beschwerde",
+        "title": "Beschwerde einreichen"
+      },
       "game_server": {
+        "add": {
+          "success": "Gameserver {} wurde hinzugefügt :)"
+        },
         "error": {
           "nothing_found": "Keine Gameserver gefunden."
         },
         "list": {
-          "title": "Gameserver",
+          "api_key": "API Key",
           "description": "Konfigurierte Gameserver:",
           "name": "Name",
-          "api_key": "API Key"
+          "title": "Gameserver"
         },
-        "add": {
-          "success": "Gameserver {} wurde hinzugefügt :)"
+        "list_members": {
+          "description": "Konfigurierte Mitglieder:",
+          "title": "Mitglieder",
+          "users": "Mitglieder"
         },
         "remove": {
           "success": "Gameserver wurde entfernt :D"
@@ -204,6 +217,7 @@
         "moved": "Alle Personen aus {} wurden nach {} verschoben."
       },
       "member_joined_help_voice_channel": "{} braucht Hilfe, bitte kümmere dich drum :D",
+      "member_left_message": "{} hat uns leider verlassen :(",
       "pong": "Pong",
       "presence": {
         "changed": "Presence wurde geändert.",
@@ -220,6 +234,11 @@
         "success": "Verlinkung wurde entfernt :D"
       },
       "user": {
+        "birthday": {
+          "has_birthday": "Alles Gute zum Geburtag {} :D",
+          "success": "Dein Geburtstag wurde eingetragen.",
+          "success_team": "{} hat seinen Geburtstag eingetragen: {}"
+        },
         "add": {
           "xp": "Die {} von {} wurden um {} erhöht"
         },
@@ -340,6 +359,9 @@
     "moderator": {
       "purge_message": "Na gut..., ich lösche alle Nachrichten wenns sein muss."
     },
+    "short_role_name": {
+      "checked_message": "Die Rollen Kürzel wurden überprüft"
+    },
     "technician": {
       "api_key": {
         "add": {
@@ -353,7 +375,8 @@
       },
       "log_message": "Hier sind deine Logdateien! :)",
       "restart_message": "Bin gleich wieder da :D",
-      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, euer Freund. Lebt lange und in Frieden :)"
+      "shutdown_message": "Trauert nicht um mich, es war eine logische Entscheidung. Das Wohl von Vielen, es wiegt schwerer als das Wohl von Wenigen oder eines Einzelnen. Ich war es und ich werde es immer sein, euer Freund. Lebt lange und in Frieden :)",
+      "synced_message": "Der Sync wurde abgeschlossen."
     }
   }
 }

bot/src/bot_api/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/abc/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/api.py

@@ -149,7 +149,10 @@ class Api(Flask):
         return response
 
     def start(self):
-        self._logger.info(__name__, f"Starting API {self._api_settings.host}:{self._api_settings.port}")
+        self._logger.info(
+            __name__,
+            f"Starting API {self._api_settings.host}:{self._api_settings.port}",
+        )
         self._register_routes()
         self.secret_key = CredentialManager.decrypt(self._auth_settings.secret_key)
         # from waitress import serve

bot/src/bot_api/api_module.py

@@ -48,4 +48,4 @@ class ApiModule(ModuleABC):
         services.add_transient(GraphQLController)
 
         # cpl-discord
-        self._dc.add_event(DiscordEventTypesEnum.on_ready.value, BotApiOnReadyEvent)
+        services.add_transient(DiscordEventTypesEnum.on_ready.value, BotApiOnReadyEvent)

bot/src/bot_api/bot-api.json

@@ -3,7 +3,7 @@
     "Name": "bot-api",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "2",
       "Micro": "0"
     },
     "Author": "",

bot/src/bot_api/configuration/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/controller/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/event/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/exception/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/filter/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/logging/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/model/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

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

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/model/token_dto.py

@@ -27,4 +27,8 @@ class TokenDTO(DtoABC):
         self._first_login = values["firstLogin"]
 
     def to_dict(self) -> dict:
-        return {"token": self._token, "refreshToken": self._refresh_token, "firstLogin": self._first_login}
+        return {
+            "token": self._token,
+            "refreshToken": self._refresh_token,
+            "firstLogin": self._first_login,
+        }

bot/src/bot_api/route/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/route/route.py

@@ -25,7 +25,12 @@ class Route:
 
     @classmethod
     @ServiceProviderABC.inject
-    def init_authorize(cls, env: ApplicationEnvironmentABC, auth_users: AuthUserRepositoryABC, auth: AuthServiceABC):
+    def init_authorize(
+        cls,
+        env: ApplicationEnvironmentABC,
+        auth_users: AuthUserRepositoryABC,
+        auth: AuthServiceABC,
+    ):
         cls._auth_users = auth_users
         cls._auth = auth
         cls._env = env.environment_name
@@ -52,7 +57,13 @@ class Route:
         return user
 
     @classmethod
-    def authorize(cls, f: Callable = None, role: AuthRoleEnum = None, skip_in_dev=False, by_api_key=False):
+    def authorize(
+        cls,
+        f: Callable = None,
+        role: AuthRoleEnum = None,
+        skip_in_dev=False,
+        by_api_key=False,
+    ):
         if f is None:
             return functools.partial(cls.authorize, role=role, skip_in_dev=skip_in_dev, by_api_key=by_api_key)
 

bot/src/bot_api/service/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_api/service/auth_service.py

@@ -494,8 +494,13 @@ class AuthService(AuthServiceABC):
             added_user = True
 
         db_user = self._auth_users.get_auth_user_by_email(user_dto.email)
-        if db_user.users.count() == 0:
-            members.for_each(lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x)))
+        user_ids = db_user.users.select(lambda x: x.id)
+
+        for user in self._users.get_users_by_discord_id(dc_id):
+            if user.id in user_ids:
+                continue
+
+            self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, user))
 
         if db_user.confirmation_id is not None and not added_user:
             raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")

bot/src/bot_api/transformer/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_core/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_core/abc/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_core/abc/client_utils_abc.py

@@ -1,6 +1,6 @@
 from abc import ABC, abstractmethod
 from datetime import datetime
-from typing import Callable
+from typing import Callable, Union
 
 import discord
 from cpl_query.extension import List
@@ -64,6 +64,14 @@ class ClientUtilsABC(ABC):
 
     @abstractmethod
     async def react_to_message_by_auto_role_rule(
-        self, discord_channel_id: int, discord_message_id: int, rule: AutoRoleRule, guild: discord.Guild
+        self,
+        discord_channel_id: int,
+        discord_message_id: int,
+        rule: AutoRoleRule,
+        guild: discord.Guild,
     ):
         pass
+
+    @abstractmethod
+    async def check_default_role(self, member: Union[discord.User, discord.Member]):
+        pass

bot/src/bot_core/abc/task_abc.py

@@ -0,0 +1,28 @@
+import asyncio
+from abc import abstractmethod
+
+from cpl_core.configuration import ConfigurationABC
+from cpl_core.dependency_injection import ServiceProviderABC
+from cpl_discord.service import DiscordBotServiceABC
+from discord.ext import commands
+
+from bot_core.logging.task_logger import TaskLogger
+
+
+class TaskABC(commands.Cog):
+    @abstractmethod
+    def __init__(self):
+        commands.Cog.__init__(self)
+
+    @ServiceProviderABC.inject
+    async def _wait_until_ready(self, config: ConfigurationABC, logger: TaskLogger, bot: DiscordBotServiceABC):
+        logger.debug(__name__, f"Waiting before {type(self).__name__}")
+        await bot.wait_until_ready()
+
+        async def wait():
+            is_ready = config.get_configuration("IS_READY")
+            if is_ready != "true":
+                await asyncio.sleep(1)
+                await wait()
+
+        await wait()

bot/src/bot_core/bot-core.json

@@ -3,7 +3,7 @@
     "Name": "bot-core",
     "Version": {
       "Major": "1",
-      "Minor": "1",
+      "Minor": "2",
       "Micro": "0"
     },
     "Author": "Sven Heidemann",

bot/src/bot_core/configuration/__init__.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 
 """
-bot Keksdose bot
+bot sh-edraft.de Discord bot
 ~~~~~~~~~~~~~~~~~~~
 
-Discord bot  for the Keksdose discord Server
+Discord bot for customers of sh-edraft.de
 
 :copyright: (c) 2022 - 2023 sh-edraft.de
 :license: MIT, see LICENSE for more details.
@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
 __author__ = "Sven Heidemann"
 __license__ = "MIT"
 __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.1.0"
+__version__ = "1.2.0"
 
 from collections import namedtuple
 
@@ -23,4 +23,4 @@ from collections import namedtuple
 # imports:
 
 VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="1", micro="0")
+version_info = VersionInfo(major="1", minor="2", micro="0")

bot/src/bot_core/configuration/feature_flags_enum.py

@@ -16,7 +16,14 @@ class FeatureFlagsEnum(Enum):
     level_module = "LevelModule"
     moderator_module = "ModeratorModule"
     permission_module = "PermissionModule"
+    short_role_name_module = "ShortRoleNameModule"
+    steam_special_offers_module = "SteamSpecialOffersModule"
     # features
     api_only = "ApiOnly"
     presence = "Presence"
     version_in_presence = "VersionInPresence"
+    game_server = "GameServer"
+    sync_xp = "SyncXp"
+    short_role_name = "ShortRoleName"
+    technician_full_access = "TechnicianFullAccess"
+    steam_special_offers = "SteamSpecialOffers"

bot/src/bot_core/configuration/feature_flags_settings.py

@@ -18,10 +18,17 @@ class FeatureFlagsSettings(ConfigurationModelABC):
         FeatureFlagsEnum.moderator_module.value: False,  # 02.10.2022 #48
         FeatureFlagsEnum.permission_module.value: True,  # 02.10.2022 #48
         FeatureFlagsEnum.config_module.value: True,  # 19.07.2023 #127
+        FeatureFlagsEnum.short_role_name_module.value: True,  # 28.09.2023 #378
+        FeatureFlagsEnum.steam_special_offers_module.value: True,  # 11.10.2023 #188
         # features
         FeatureFlagsEnum.api_only.value: False,  # 13.10.2022 #70
         FeatureFlagsEnum.presence.value: True,  # 03.10.2022 #56
         FeatureFlagsEnum.version_in_presence.value: False,  # 21.03.2023 #253
+        FeatureFlagsEnum.game_server.value: False,  # 25.09.2023 #366
+        FeatureFlagsEnum.sync_xp.value: False,  # 25.09.2023 #366
+        FeatureFlagsEnum.short_role_name.value: False,  # 28.09.2023 #378
+        FeatureFlagsEnum.technician_full_access.value: False,  # 03.10.2023 #393
+        FeatureFlagsEnum.steam_special_offers.value: False,  # 11.10.2023 #188
     }
 
     def __init__(self, **kwargs: dict):