Compare commits
	
		
			41 Commits
		
	
	
		
			#139
			...
			ba5d897662
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ba5d897662 | |||
| 47415af868 | |||
| 6353c7ca86 | |||
| 440689653d | |||
| 33fb973f21 | |||
| 7646335d03 | |||
| 04c905d287 | |||
| c7d8508173 | |||
| f3eff97780 | |||
| 476db0ed33 | |||
| 9c369b911a | |||
| 6dfd476bce | |||
| f669410b2a | |||
| a46122243f | |||
| 3b7345b404 | |||
| 59d38f8f2a | |||
| 612430d3e0 | |||
| e01290db9b | |||
| 6273ce9cba | |||
| 5c923d8bd8 | |||
| 6c6169f7ee | |||
| ffd5105154 | |||
| 9040ab6fca | |||
| 9d89135b4c | |||
| 71899346b2 | |||
| d197a6e158 | |||
| 40e53de3f2 | |||
| 1b9553e63b | |||
| 5447d502cc | |||
| 5a4c2901f5 | |||
| bcf71a26f0 | |||
| b25b75e382 | |||
| f21b4f9881 | |||
| 8705904882 | |||
| cf610b770b | |||
| ec30069ff5 | |||
| 7026b3abac | |||
| 31464df3f6 | |||
| eb9f5b83d5 | |||
| fdd8357729 | |||
| 7c744f0e65 | 
@@ -20,13 +20,13 @@
 | 
			
		||||
    },
 | 
			
		||||
    "Scripts": {
 | 
			
		||||
      "sv": "cpl set-version $ARGS",
 | 
			
		||||
      "set-version": "cpl run set-version $ARGS; echo '';",
 | 
			
		||||
      "set-version": "cpl run set-version $ARGS --dev; echo '';",
 | 
			
		||||
 | 
			
		||||
      "gv": "cpl get-version",
 | 
			
		||||
      "get-version": "export VERSION=$(cpl run get-version); echo $VERSION;",
 | 
			
		||||
      "get-version": "export VERSION=$(cpl run get-version --dev); echo $VERSION;",
 | 
			
		||||
 | 
			
		||||
      "pre-build": "cpl set-version $ARGS",
 | 
			
		||||
      "post-build": "cpl run post-build",
 | 
			
		||||
      "post-build": "cpl run post-build --dev",
 | 
			
		||||
 | 
			
		||||
      "pre-prod": "cpl build",
 | 
			
		||||
      "prod": "export KDB_ENVIRONMENT=production; export KDB_NAME=KDB-Prod; cpl start;",
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,8 @@
 | 
			
		||||
FROM python:3.10.4-alpine
 | 
			
		||||
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
COPY ./dist/bot/build/ .
 | 
			
		||||
COPY ./dist/bot/build/kdb-bot/ .
 | 
			
		||||
COPY ./dist/bot/build/requirements.txt .
 | 
			
		||||
 | 
			
		||||
RUN python -m pip install --upgrade pip
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "dev25"
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "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.10.0.post9",
 | 
			
		||||
      "cpl-core==2022.12.0",
 | 
			
		||||
      "cpl-translation==2022.10.0.post2",
 | 
			
		||||
      "cpl-query==2022.10.0.post2",
 | 
			
		||||
      "cpl-discord==2022.10.0.post6",
 | 
			
		||||
      "cpl-query==2022.12.2",
 | 
			
		||||
      "cpl-discord==2022.12.0",
 | 
			
		||||
      "Flask==2.2.2",
 | 
			
		||||
      "Flask-Classful==0.14.2",
 | 
			
		||||
      "Flask-Cors==3.0.10",
 | 
			
		||||
      "PyJWT==2.6.0",
 | 
			
		||||
      "waitress==2.1.2",
 | 
			
		||||
      "Flask-SocketIO==5.3.1",
 | 
			
		||||
      "eventlet==0.33.1",
 | 
			
		||||
      "Flask-SocketIO==5.3.2",
 | 
			
		||||
      "eventlet==0.33.2",
 | 
			
		||||
      "requests-oauthlib==1.3.1",
 | 
			
		||||
      "icmplib==3.0.3"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
 Submodule kdb-bot/src/bot/config updated: c8983770f7...0b18f8e596
									
								
							@@ -6,7 +6,7 @@
 | 
			
		||||
    "not_implemented_yet": "Ey Alter, das kann ich noch nicht...",
 | 
			
		||||
    "presence": {
 | 
			
		||||
      "booting": "{} Ich fahre gerade hoch...",
 | 
			
		||||
      "running": "{} Behalte Ruhe und iss Kekse :D",
 | 
			
		||||
      "running": "{} Ich esse Kekse :D",
 | 
			
		||||
      "restart": "{} Muss neue Kekse holen...",
 | 
			
		||||
      "shutdown": "{} Ich werde bestimmt wieder kommen..."
 | 
			
		||||
    },
 | 
			
		||||
@@ -108,7 +108,7 @@
 | 
			
		||||
          "error": {
 | 
			
		||||
            "not_found": "Regel für auto-role {} nicht gefunden!",
 | 
			
		||||
            "emoji_not_found": "Emoji {} für auto-role Regel {} nicht gefunden!",
 | 
			
		||||
            "rule_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
 | 
			
		||||
            "role_not_found": "Rolle {} für auto-role Regel {} nicht gefunden!",
 | 
			
		||||
            "already_exists": "Regel für auto-role {} existiert bereits!"
 | 
			
		||||
          }
 | 
			
		||||
        },
 | 
			
		||||
@@ -127,17 +127,17 @@
 | 
			
		||||
      "purge_message": "Na gut..., ich lösche alle Nachrichten wenns sein muss."
 | 
			
		||||
    },
 | 
			
		||||
    "base": {
 | 
			
		||||
      "technician_error_message": "Es gab ein Fehler mit dem Event: {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.UUID: {}",
 | 
			
		||||
      "technician_command_error_message": "Es gab ein Fehler mit dem Befehl: {} ausgelöst von {} -> {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.UUID: {}",
 | 
			
		||||
      "welcome_message": "Hello There!\nIch heiße dich bei {} herzlichst willkommen!",
 | 
			
		||||
      "technician_error_message": "Es gab ein Fehler mit dem Event: {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.\nUUID: {}",
 | 
			
		||||
      "technician_command_error_message": "Es gab ein Fehler mit dem Befehl: {} ausgelöst von {} -> {}\nDatum und Zeit: {}\nSchau bitte ins log für Details.\nUUID: {}",
 | 
			
		||||
      "welcome_message": "Hello There!\nIch heiße dich bei {} herzlichst Willkommen!",
 | 
			
		||||
      "welcome_message_for_team": "{} hat gerade das Irrenhaus betreten.",
 | 
			
		||||
      "goodbye_message": "Schade das du uns so schnell verlässt :(",
 | 
			
		||||
      "goodbye_message": "Schade, dass du uns so schnell verlässt :(",
 | 
			
		||||
      "afk_command_channel_missing_message": "Zu unfähig einem Sprachkanal beizutreten?",
 | 
			
		||||
      "afk_command_move_message": "Ich verschiebe dich ja schon... (◔_◔)",
 | 
			
		||||
      "member_joined_help_voice_channel": "{} braucht hilfe, bitte kümmer dich drum :D",
 | 
			
		||||
      "pong": "Pong",
 | 
			
		||||
      "info": {
 | 
			
		||||
        "title": "Gismo",
 | 
			
		||||
        "title": "Krümmelmonster",
 | 
			
		||||
        "description": "Informationen über mich",
 | 
			
		||||
        "fields": {
 | 
			
		||||
          "version": "Version",
 | 
			
		||||
@@ -160,8 +160,8 @@
 | 
			
		||||
        "removed": "Presence wurde entfernt.",
 | 
			
		||||
        "max_char_count_exceeded": "Der Text darf nicht mehr als 128 Zeichen lang sein!"
 | 
			
		||||
      },
 | 
			
		||||
      "user_info": {
 | 
			
		||||
        "fields": {
 | 
			
		||||
      "user": {
 | 
			
		||||
        "atr": {
 | 
			
		||||
          "id": "Id",
 | 
			
		||||
          "name": "Name",
 | 
			
		||||
          "discord_join": "Discord beigetreten am",
 | 
			
		||||
@@ -173,27 +173,47 @@
 | 
			
		||||
          "lefts": "Abgänge",
 | 
			
		||||
          "warnings": "Verwarnungen"
 | 
			
		||||
        },
 | 
			
		||||
        "footer": ""
 | 
			
		||||
        "info": {
 | 
			
		||||
          "footer": ""
 | 
			
		||||
        },
 | 
			
		||||
        "get": {
 | 
			
		||||
          "xp": "{} hat {} xp",
 | 
			
		||||
          "ontime": "{} war insgesamt {} Stunden aktiv in einem Sprachkanal"
 | 
			
		||||
        },
 | 
			
		||||
        "set": {
 | 
			
		||||
          "xp": "{} hat nun {} xp",
 | 
			
		||||
          "error": {
 | 
			
		||||
            "value_type_not_numeric": "Der angegebende Wert ist keine Ganzzahl! :(",
 | 
			
		||||
            "type_error": "Der angegebene Wert ist keine Zahl! :("
 | 
			
		||||
          }
 | 
			
		||||
        },
 | 
			
		||||
        "remove": {
 | 
			
		||||
          "xp": "Die {} von {} wurden entfernt",
 | 
			
		||||
          "ontime": "Die {} von {} wurden entfernt"
 | 
			
		||||
        },
 | 
			
		||||
        "error": {
 | 
			
		||||
          "atr_not_found": "Das Attribut {} konnte nicht gefunden werden :("
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
    },
 | 
			
		||||
    "boot_log": {
 | 
			
		||||
      "login_message": "Ich bin on the line :D\nDer Scheiß hat {} Sekunden gedauert"
 | 
			
		||||
    },
 | 
			
		||||
    "level": {
 | 
			
		||||
      "new_level_message": "<@{}> ist nun Level {}",
 | 
			
		||||
      "seeding_started": "Levelsystem wird neu geladen.",
 | 
			
		||||
      "seeding_failed": "Levelsystem konnte nicht neu geladen werden.",
 | 
			
		||||
      "seeding_finished": "Levelsystem wurde Erfolgreich neu geladen.",
 | 
			
		||||
      "new_level_message": "{} ist nun Level {}",
 | 
			
		||||
      "seeding_started": "Levelsystem wird neu geladen...",
 | 
			
		||||
      "seeding_failed": "Levelsystem konnte nicht neu geladen werden :(",
 | 
			
		||||
      "seeding_finished": "Levelsystem wurde Erfolgreich neu geladen :)",
 | 
			
		||||
      "error": {
 | 
			
		||||
        "nothing_found": "Keine Level Einträge gefunden.",
 | 
			
		||||
        "level_with_name_already_exists": "Ein Level mit dem Namen {} existiert bereits!",
 | 
			
		||||
        "level_with_xp_already_exists": "Das Level {} hat bereits die Mindest XP {}!"
 | 
			
		||||
        "level_with_xp_already_exists": "Das Level {} hat bereits die Mindest-XP {}!"
 | 
			
		||||
      },
 | 
			
		||||
      "list": {
 | 
			
		||||
        "title": "Level:",
 | 
			
		||||
        "description": "Konfigurierte Level:",
 | 
			
		||||
        "name": "Name",
 | 
			
		||||
        "min_xp": "Mindest XP",
 | 
			
		||||
        "min_xp": "Mindest-XP",
 | 
			
		||||
        "permission_int": "Berechtigungen"
 | 
			
		||||
      },
 | 
			
		||||
      "create": {
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'bot_api.service'
 | 
			
		||||
__title__ = 'bot_api.abc'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "dev70"
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core==2022.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -46,14 +46,14 @@ class AuthController:
 | 
			
		||||
    @Route.authorize(role=AuthRoleEnum.admin)
 | 
			
		||||
    async def get_all_users(self) -> Response:
 | 
			
		||||
        result = await self._auth_service.get_all_auth_users_async()
 | 
			
		||||
        return jsonify(result.select(lambda x: x.to_dict()))
 | 
			
		||||
        return jsonify(result.select(lambda x: x.to_dict()).to_list())
 | 
			
		||||
 | 
			
		||||
    @Route.post(f'{BasePath}/users/get/filtered')
 | 
			
		||||
    @Route.authorize(role=AuthRoleEnum.admin)
 | 
			
		||||
    async def get_filtered_users(self) -> Response:
 | 
			
		||||
        dto: AuthUserSelectCriteria = JSONProcessor.process(AuthUserSelectCriteria, request.get_json(force=True, silent=True))
 | 
			
		||||
        result = await self._auth_service.get_filtered_auth_users_async(dto)
 | 
			
		||||
        result.result = result.result.select(lambda x: x.to_dict())
 | 
			
		||||
        result.result = result.result.select(lambda x: x.to_dict()).to_list()
 | 
			
		||||
        return jsonify(result.to_dict())
 | 
			
		||||
 | 
			
		||||
    @Route.get(f'{BasePath}/users/get/<email>')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.controller.discord'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -40,14 +40,14 @@ class ServerController:
 | 
			
		||||
    @Route.authorize(role=AuthRoleEnum.admin)
 | 
			
		||||
    async def get_all_servers(self) -> Response:
 | 
			
		||||
        result = await self._discord_service.get_all_servers()
 | 
			
		||||
        result = result.select(lambda x: x.to_dict())
 | 
			
		||||
        result = result.select(lambda x: x.to_dict()).to_list()
 | 
			
		||||
        return jsonify(result)
 | 
			
		||||
 | 
			
		||||
    @Route.get(f'{BasePath}/get/servers-by-user')
 | 
			
		||||
    @Route.authorize
 | 
			
		||||
    async def get_all_servers_by_user(self) -> Response:
 | 
			
		||||
        result = await self._discord_service.get_all_servers_by_user()
 | 
			
		||||
        result = result.select(lambda x: x.to_dict())
 | 
			
		||||
        result = result.select(lambda x: x.to_dict()).to_list()
 | 
			
		||||
        return jsonify(result)
 | 
			
		||||
 | 
			
		||||
    @Route.post(f'{BasePath}/get/filtered')
 | 
			
		||||
@@ -55,11 +55,11 @@ class ServerController:
 | 
			
		||||
    async def get_filtered_servers(self) -> Response:
 | 
			
		||||
        dto: ServerSelectCriteria = JSONProcessor.process(ServerSelectCriteria, request.get_json(force=True, silent=True))
 | 
			
		||||
        result = await self._discord_service.get_filtered_servers_async(dto)
 | 
			
		||||
        result.result = result.result.select(lambda x: x.to_dict())
 | 
			
		||||
        result.result = result.result.select(lambda x: x.to_dict()).to_list()
 | 
			
		||||
        return jsonify(result.to_dict())
 | 
			
		||||
 | 
			
		||||
    @Route.get(f'{BasePath}/get/<id>')
 | 
			
		||||
    @Route.authorize
 | 
			
		||||
    async def get_server_by_id(self, id: int) -> Response:
 | 
			
		||||
        result = await self._discord_service.get_server_by_id_async(id)
 | 
			
		||||
        result = await self._discord_service.get_server_by_id_async(id).to_list()
 | 
			
		||||
        return jsonify(result.to_dict())
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.event'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.exception'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.filter.discord'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.logging'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.model'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.model.discord'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.route'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_api.transformer'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'bot_core.service'
 | 
			
		||||
__title__ = 'bot_core.abc'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,7 @@
 | 
			
		||||
from abc import ABC, abstractmethod
 | 
			
		||||
from typing import Callable
 | 
			
		||||
 | 
			
		||||
from cpl_query.extension import List
 | 
			
		||||
from discord.ext.commands import Context
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -14,6 +16,9 @@ class ClientUtilsServiceABC(ABC):
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def moved_user(self, guild_id: int): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def moved_users(self, guild_id: int, count: int): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def get_client(self, dc_ic: int, guild_id: int): pass
 | 
			
		||||
 | 
			
		||||
@@ -25,3 +30,6 @@ class ClientUtilsServiceABC(ABC):
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    async def presence_game(self, t_key: str): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List: pass
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ class MessageServiceABC(ABC):
 | 
			
		||||
    async def send_dm_message(self, message: Union[str, discord.Embed], receiver: Union[discord.User, discord.Member], without_tracking=False): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, wait_before_delete: int = None, without_tracking=True): pass
 | 
			
		||||
    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=True, **kwargs): pass
 | 
			
		||||
    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=True, **kwargs): pass
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "dev70"
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "Sven Heidemann",
 | 
			
		||||
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "MIT",
 | 
			
		||||
    "LicenseDescription": "MIT, see LICENSE for more details.",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=0.3.dev70"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.core_extension'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.events'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'bot_core.exception'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.helper'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.logging'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.pipes'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_core.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,14 @@
 | 
			
		||||
from typing import Callable
 | 
			
		||||
 | 
			
		||||
import discord
 | 
			
		||||
from cpl_core.configuration import ConfigurationABC
 | 
			
		||||
from cpl_core.database.context import DatabaseContextABC
 | 
			
		||||
from cpl_core.logging import LoggerABC
 | 
			
		||||
 | 
			
		||||
from cpl_discord.service import DiscordBotServiceABC
 | 
			
		||||
from cpl_query.extension import List
 | 
			
		||||
from cpl_translation import TranslatePipe
 | 
			
		||||
from discord import app_commands
 | 
			
		||||
from discord.ext.commands import Context
 | 
			
		||||
 | 
			
		||||
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 | 
			
		||||
@@ -54,6 +58,13 @@ class ClientUtilsService(ClientUtilsServiceABC):
 | 
			
		||||
        self._clients.update_client(client)
 | 
			
		||||
        self._db.save_changes()
 | 
			
		||||
 | 
			
		||||
    def moved_users(self, guild_id: int, count: int):
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(guild_id)
 | 
			
		||||
        client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.server_id)
 | 
			
		||||
        client.moved_users_count += count
 | 
			
		||||
        self._clients.update_client(client)
 | 
			
		||||
        self._db.save_changes()
 | 
			
		||||
 | 
			
		||||
    def get_client(self, dc_ic: int, guild_id: int):
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(guild_id)
 | 
			
		||||
        client = self._clients.find_client_by_discord_id_and_server_id(self._bot.user.id, server.server_id)
 | 
			
		||||
@@ -81,3 +92,17 @@ class ClientUtilsService(ClientUtilsServiceABC):
 | 
			
		||||
        name = self._t.transform(t_key).format(bot.__version__)
 | 
			
		||||
        await self._bot.change_presence(activity=discord.Game(name=name))
 | 
			
		||||
        self._logger.info(__name__, f'Set presence {name}')
 | 
			
		||||
 | 
			
		||||
    def get_auto_complete_list(self, _l: List, current: str, select: Callable = None) -> List:
 | 
			
		||||
        if current != '':
 | 
			
		||||
            if select is None:
 | 
			
		||||
                select = lambda x: x
 | 
			
		||||
 | 
			
		||||
            sl = _l.select(select)
 | 
			
		||||
            sl = sl.where(lambda x: current in x)
 | 
			
		||||
            if current in sl:
 | 
			
		||||
                sl = sl.skip(sl.index_of(current))
 | 
			
		||||
 | 
			
		||||
            _l = _l.where(lambda x: x.name in sl)
 | 
			
		||||
 | 
			
		||||
        return _l.take(25)
 | 
			
		||||
 
 | 
			
		||||
@@ -89,7 +89,7 @@ class MessageService(MessageServiceABC):
 | 
			
		||||
                self._db.save_changes()
 | 
			
		||||
            self._logger.info(__name__, f'Sent message to user {receiver.id}')
 | 
			
		||||
    
 | 
			
		||||
    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False):
 | 
			
		||||
    async def send_ctx_msg(self, ctx: Context, message: Union[str, discord.Embed], file: discord.File = None, is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False):
 | 
			
		||||
        if ctx is None:
 | 
			
		||||
            self._logger.warn(__name__, 'Message context is empty')
 | 
			
		||||
            self._logger.debug(__name__, f'Message: {message}')
 | 
			
		||||
@@ -99,9 +99,9 @@ class MessageService(MessageServiceABC):
 | 
			
		||||
        msg = None
 | 
			
		||||
        try:
 | 
			
		||||
            if isinstance(message, discord.Embed):
 | 
			
		||||
                msg = await ctx.send(embed=message, file=file)
 | 
			
		||||
                msg = await ctx.send(embed=message, file=file, ephemeral=not is_public)
 | 
			
		||||
            else:
 | 
			
		||||
                msg = await ctx.send(message, file=file)
 | 
			
		||||
                msg = await ctx.send(message, file=file, ephemeral=not is_public)
 | 
			
		||||
        except Exception as e:
 | 
			
		||||
            self._logger.error(__name__, f'Send message to channel {ctx.channel.id} failed', e)
 | 
			
		||||
        else:
 | 
			
		||||
@@ -119,7 +119,7 @@ class MessageService(MessageServiceABC):
 | 
			
		||||
            if ctx.guild is not None:
 | 
			
		||||
                await self.delete_message(msg, without_tracking)
 | 
			
		||||
 | 
			
		||||
    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, wait_before_delete: int = None, without_tracking=False, **kwargs):
 | 
			
		||||
    async def send_interaction_msg(self, interaction: Interaction, message: Union[str, discord.Embed], is_persistent: bool = False, is_public: bool = False, wait_before_delete: int = None, without_tracking=False, **kwargs):
 | 
			
		||||
        if interaction is None:
 | 
			
		||||
            self._logger.warn(__name__, 'Message context is empty')
 | 
			
		||||
            self._logger.debug(__name__, f'Message: {message}')
 | 
			
		||||
@@ -128,9 +128,9 @@ class MessageService(MessageServiceABC):
 | 
			
		||||
        self._logger.debug(__name__, f'Try to send message\t\t{message}\n\tto: {interaction.channel}')
 | 
			
		||||
        try:
 | 
			
		||||
            if isinstance(message, discord.Embed):
 | 
			
		||||
                await interaction.response.send_message(embed=message, **kwargs)
 | 
			
		||||
                await interaction.response.send_message(embed=message, ephemeral=not is_public, **kwargs)
 | 
			
		||||
            else:
 | 
			
		||||
                await interaction.response.send_message(message, **kwargs)
 | 
			
		||||
                await interaction.response.send_message(message, ephemeral=not is_public, **kwargs)
 | 
			
		||||
        except Exception as e:
 | 
			
		||||
            self._logger.error(__name__, f'Send message to channel {interaction.channel.id} failed', e)
 | 
			
		||||
        else:
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_data'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'bot_data.service'
 | 
			
		||||
__title__ = 'bot_data.abc'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -35,3 +35,6 @@ class UserJoinedVoiceChannelRepositoryABC(ABC):
 | 
			
		||||
    
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel): pass
 | 
			
		||||
 | 
			
		||||
    @abstractmethod
 | 
			
		||||
    def delete_user_joined_voice_channel_by_user_id(self, user_id: int): pass
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "dev70"
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "Sven Heidemann",
 | 
			
		||||
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "MIT",
 | 
			
		||||
    "LicenseDescription": "MIT, see LICENSE for more details.",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=0.3.dev70"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_data.migration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_data.model'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -119,3 +119,10 @@ class UserJoinedVoiceChannel(TableABC):
 | 
			
		||||
            DELETE FROM `UserJoinedVoiceChannel`
 | 
			
		||||
            WHERE `JoinId` = {self._join_id};
 | 
			
		||||
        """)
 | 
			
		||||
 | 
			
		||||
    @staticmethod
 | 
			
		||||
    def delete_by_user_id_string(id: int) -> str:
 | 
			
		||||
        return str(f"""
 | 
			
		||||
            DELETE FROM `UserJoinedVoiceChannel`
 | 
			
		||||
            WHERE `UserId` = {id}
 | 
			
		||||
    """)
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'bot_data.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -121,3 +121,7 @@ class UserJoinedVoiceChannelRepositoryService(UserJoinedVoiceChannelRepositoryAB
 | 
			
		||||
    def delete_user_joined_voice_channel(self, user_joined_voice_channel: UserJoinedVoiceChannel):
 | 
			
		||||
        self._logger.trace(__name__, f'Send SQL command: {user_joined_voice_channel.delete_string}')
 | 
			
		||||
        self._context.cursor.execute(user_joined_voice_channel.delete_string)
 | 
			
		||||
 | 
			
		||||
    def delete_user_joined_voice_channel_by_user_id(self, user_id: int):
 | 
			
		||||
        self._logger.trace(__name__, f'Send SQL command: {UserJoinedVoiceChannel.delete_by_user_id_string}')
 | 
			
		||||
        self._context.cursor.execute(UserJoinedVoiceChannel.delete_by_user_id_string(user_id))
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "auto-role",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post5"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.command'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
from typing import List as TList, Optional
 | 
			
		||||
from typing import List as TList, Optional, Any
 | 
			
		||||
 | 
			
		||||
import discord
 | 
			
		||||
from cpl_core.database.context import DatabaseContextABC
 | 
			
		||||
@@ -50,6 +50,11 @@ class AutoRoleGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 | 
			
		||||
 | 
			
		||||
    async def _auto_role_auto_complete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
 | 
			
		||||
        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in self._client_utils.get_auto_complete_list(auto_roles, current)]
 | 
			
		||||
 | 
			
		||||
    @commands.hybrid_group(name="auto-role")
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    async def auto_role(self, ctx: Context):
 | 
			
		||||
@@ -155,9 +160,7 @@ class AutoRoleGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @remove.autocomplete('auto_role')
 | 
			
		||||
    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
 | 
			
		||||
        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
 | 
			
		||||
        return await self._auto_role_auto_complete(interaction, current)
 | 
			
		||||
 | 
			
		||||
    @auto_role.group()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
@@ -198,9 +201,7 @@ class AutoRoleGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @list.autocomplete('auto_role')
 | 
			
		||||
    async def list_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
 | 
			
		||||
        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
 | 
			
		||||
        return await self._auto_role_auto_complete(interaction, current)
 | 
			
		||||
 | 
			
		||||
    @rule.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
@@ -255,19 +256,17 @@ class AutoRoleGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @add.autocomplete('auto_role')
 | 
			
		||||
    async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
 | 
			
		||||
        return [app_commands.Choice(name=auto_role, value=auto_role) for auto_role in auto_roles]
 | 
			
		||||
        return await self._auto_role_auto_complete(interaction, current)
 | 
			
		||||
 | 
			
		||||
    @add.autocomplete('emoji_name')
 | 
			
		||||
    async def add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        emojis = interaction.guild.emojis
 | 
			
		||||
        return [app_commands.Choice(name=emoji.name, value=emoji.name) for emoji in emojis]
 | 
			
		||||
        emojis = List(discord.Emoji, interaction.guild.emojis)
 | 
			
		||||
        return [app_commands.Choice(name=emoji.name, value=emoji.name) for emoji in self._client_utils.get_auto_complete_list(emojis, current, lambda e: e.name)]
 | 
			
		||||
 | 
			
		||||
    @add.autocomplete('role_id')
 | 
			
		||||
    async def rule_add_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        roles = interaction.guild.roles
 | 
			
		||||
        return [app_commands.Choice(name=role.name, value=str(role.id)) for role in roles]
 | 
			
		||||
        roles = List(discord.Role, interaction.guild.roles)
 | 
			
		||||
        return [app_commands.Choice(name=role.name, value=str(role.id)) for role in self._client_utils.get_auto_complete_list(roles, current, lambda r: r.name)]
 | 
			
		||||
 | 
			
		||||
    @rule.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
@@ -294,4 +293,10 @@ class AutoRoleGroup(DiscordCommandABC):
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        auto_roles = self._auto_roles.get_auto_roles_by_server_id(server.server_id).select(lambda x: x.auto_role_id)
 | 
			
		||||
        rules = auto_roles.select_many(lambda ar: self._auto_roles.get_auto_role_rules_by_auto_role_id(ar))
 | 
			
		||||
        return [app_commands.Choice(name=f'{rule.auto_role_rule_id} {rule.emoji_name} {interaction.guild.get_role(int(rule.role_id))}', value=rule.auto_role_rule_id) for rule in rules]
 | 
			
		||||
        return [
 | 
			
		||||
            app_commands.Choice(
 | 
			
		||||
                name=f'{rule.auto_role_rule_id} {rule.emoji_name} {interaction.guild.get_role(int(rule.role_id))}',
 | 
			
		||||
                value=rule.auto_role_rule_id
 | 
			
		||||
            )
 | 
			
		||||
            for rule in self._client_utils.get_auto_complete_list(rules, current, lambda r: r.auto_role_rule_id)
 | 
			
		||||
        ]
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.events'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.auto_role.helper'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.base'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.base.service'
 | 
			
		||||
__title__ = 'modules.base.abc'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "base",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post2"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.base.command'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
        await self._message_service.send_ctx_msg(ctx, settings.help_command_reference_url, is_persistent=is_persistent, is_public=True)
 | 
			
		||||
        self._logger.trace(__name__, f'Finished help command')
 | 
			
		||||
 | 
			
		||||
    @help.autocomplete('persistent_flag')
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ from discord.ext.commands import Context
 | 
			
		||||
from bot_core.abc.message_service_abc import MessageServiceABC
 | 
			
		||||
from bot_core.helper.command_checks import CommandChecks
 | 
			
		||||
from bot_core.logging.command_logger import CommandLogger
 | 
			
		||||
from bot_core.service.client_utils_service import ClientUtilsService
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class MassMoveCommand(DiscordCommandABC):
 | 
			
		||||
@@ -20,12 +21,14 @@ class MassMoveCommand(DiscordCommandABC):
 | 
			
		||||
            message_service: MessageServiceABC,
 | 
			
		||||
            bot: DiscordBotServiceABC,
 | 
			
		||||
            translate: TranslatePipe,
 | 
			
		||||
            client_utils: ClientUtilsService
 | 
			
		||||
    ):
 | 
			
		||||
        DiscordCommandABC.__init__(self)
 | 
			
		||||
        self._logger = logger
 | 
			
		||||
        self._message_service = message_service
 | 
			
		||||
        self._bot = bot
 | 
			
		||||
        self._t = translate
 | 
			
		||||
        self._client_utils = client_utils
 | 
			
		||||
 | 
			
		||||
    @commands.hybrid_command(name='mass-move')
 | 
			
		||||
    @CommandChecks.check_is_ready()
 | 
			
		||||
@@ -42,7 +45,9 @@ class MassMoveCommand(DiscordCommandABC):
 | 
			
		||||
            channel_from = ctx.author.voice.channel
 | 
			
		||||
 | 
			
		||||
        moves = [member.move_to(channel_to) for member in channel_from.members]
 | 
			
		||||
        move_count = len(moves)
 | 
			
		||||
        await asyncio.gather(*moves)
 | 
			
		||||
        self._client_utils.moved_users(ctx.guild.id, move_count)
 | 
			
		||||
 | 
			
		||||
        await self._message_service.send_ctx_msg(ctx, self._t.transform('modules.base.mass_move.moved').format(channel_from.mention, channel_to.mention))
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,12 +1,15 @@
 | 
			
		||||
from typing import Optional
 | 
			
		||||
from typing import Optional, List
 | 
			
		||||
 | 
			
		||||
import discord
 | 
			
		||||
from cpl_core.configuration import ConfigurationABC
 | 
			
		||||
from cpl_core.database.context import DatabaseContextABC
 | 
			
		||||
from cpl_discord.command import DiscordCommandABC
 | 
			
		||||
from cpl_discord.service import DiscordBotServiceABC
 | 
			
		||||
from cpl_translation import TranslatePipe
 | 
			
		||||
from discord import app_commands
 | 
			
		||||
from discord.ext import commands
 | 
			
		||||
from discord.ext.commands import Context
 | 
			
		||||
from mysql.connector.errors import DatabaseError
 | 
			
		||||
 | 
			
		||||
from bot_core.abc.client_utils_service_abc import ClientUtilsServiceABC
 | 
			
		||||
from bot_core.abc.message_service_abc import MessageServiceABC
 | 
			
		||||
@@ -17,6 +20,7 @@ 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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -31,11 +35,13 @@ class UserGroup(DiscordCommandABC):
 | 
			
		||||
            client_utils: ClientUtilsServiceABC,
 | 
			
		||||
            permissions: PermissionServiceABC,
 | 
			
		||||
            servers: ServerRepositoryABC,
 | 
			
		||||
            db: DatabaseContextABC,
 | 
			
		||||
            users: UserRepositoryABC,
 | 
			
		||||
            user_joined_servers: UserJoinedServerRepositoryABC,
 | 
			
		||||
            user_joined_voice_channel: UserJoinedVoiceChannelRepositoryABC,
 | 
			
		||||
            translate: TranslatePipe,
 | 
			
		||||
            date: DateTimeOffsetPipe
 | 
			
		||||
            date: DateTimeOffsetPipe,
 | 
			
		||||
            level: LevelService
 | 
			
		||||
    ):
 | 
			
		||||
        DiscordCommandABC.__init__(self)
 | 
			
		||||
 | 
			
		||||
@@ -46,14 +52,23 @@ class UserGroup(DiscordCommandABC):
 | 
			
		||||
        self._client_utils = client_utils
 | 
			
		||||
        self._permissions = permissions
 | 
			
		||||
        self._servers = servers
 | 
			
		||||
        self._db = db
 | 
			
		||||
        self._users = users
 | 
			
		||||
        self._user_joined_servers = user_joined_servers
 | 
			
		||||
        self._user_joined_voice_channel = user_joined_voice_channel
 | 
			
		||||
        self._t = translate
 | 
			
		||||
        self._date = date
 | 
			
		||||
        self._level = level
 | 
			
		||||
 | 
			
		||||
        self._logger.trace(__name__, f'Loaded command service: {type(self).__name__}')
 | 
			
		||||
 | 
			
		||||
        self._atr_dict = {
 | 
			
		||||
            "xp": self._t.transform('modules.base.user.atr.xp'),
 | 
			
		||||
            'ontime': self._t.transform('modules.base.user.atr.ontime')
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        self._atr_list = [(key, self._atr_dict[key]) for key in self._atr_dict]
 | 
			
		||||
 | 
			
		||||
    @commands.hybrid_group()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    async def user(self, ctx: Context):
 | 
			
		||||
@@ -83,26 +98,29 @@ class UserGroup(DiscordCommandABC):
 | 
			
		||||
            color=int('ef9d0d', 16)
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
        ujvs = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
 | 
			
		||||
        ontime = ujvs.sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
 | 
			
		||||
        ontime = self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)\
 | 
			
		||||
            .where(lambda x: x is not None)\
 | 
			
		||||
            .sum(lambda join: round((join.leaved_on - join.joined_on).total_seconds() / 3600, 2))
 | 
			
		||||
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.id'), value=member.id)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.name'), value=member.name)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.discord_join'), value=self._date.transform(member.created_at), inline=False)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.last_join'), value=self._date.transform(member.joined_at), inline=False)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.xp'), value=str(user.xp))
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.ontime'), value=str(ontime))
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.id'), value=member.id)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.name'), value=member.name)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.discord_join'),
 | 
			
		||||
                        value=self._date.transform(member.created_at), inline=False)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.last_join'),
 | 
			
		||||
                        value=self._date.transform(member.joined_at), inline=False)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.xp'), value=str(user.xp))
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.ontime'), value=str(ontime))
 | 
			
		||||
 | 
			
		||||
        roles = ''
 | 
			
		||||
        for role in member.roles:
 | 
			
		||||
            roles += f'{role.name}\n'
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user_info.fields.roles'), value=roles, inline=False)
 | 
			
		||||
        embed.add_field(name=self._t.transform('modules.base.user.atr.roles'), value=roles, inline=False)
 | 
			
		||||
 | 
			
		||||
        if is_mod or member == ctx.author:
 | 
			
		||||
            joins_string = ''
 | 
			
		||||
            for join in joins:
 | 
			
		||||
                joins_string += f'{self._date.transform(join.joined_on)}\n'
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user_info.fields.joins'), value=joins_string)
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user.atr.joins'), value=joins_string)
 | 
			
		||||
 | 
			
		||||
        if is_mod or member == ctx.author:
 | 
			
		||||
            lefts_string = ''
 | 
			
		||||
@@ -113,11 +131,128 @@ class UserGroup(DiscordCommandABC):
 | 
			
		||||
                    continue
 | 
			
		||||
                lefts_string += f'{self._date.transform(join.leaved_on)}\n'
 | 
			
		||||
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user_info.fields.lefts'), value=lefts_string)
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user.atr.lefts'), value=lefts_string)
 | 
			
		||||
 | 
			
		||||
        if is_mod or member == ctx.author:
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user_info.fields.warnings'), value=self._t.transform('common.not_implemented_yet'), inline=False)
 | 
			
		||||
            embed.add_field(name=self._t.transform('modules.base.user.atr.warnings'),
 | 
			
		||||
                            value=self._t.transform('common.not_implemented_yet'), inline=False)
 | 
			
		||||
 | 
			
		||||
        # send to interaction because of sensitive data
 | 
			
		||||
        await self._message_service.send_interaction_msg(ctx.interaction, embed, wait_before_delete=wait)
 | 
			
		||||
        self._logger.trace(__name__, f'Finished user-info command')
 | 
			
		||||
 | 
			
		||||
    @user.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    @CommandChecks.check_is_ready()
 | 
			
		||||
    async def get(self, ctx: Context, atr: str, member: discord.Member = None):
 | 
			
		||||
        self._logger.debug(__name__, f'Received command user-get {atr} {ctx}:{member}')
 | 
			
		||||
 | 
			
		||||
        is_mod = self._permissions.is_member_moderator(ctx.author)
 | 
			
		||||
        if member is not None and not is_mod:
 | 
			
		||||
            await self._message_service.send_ctx_msg(ctx, self._t.transform('common.no_permission_message'))
 | 
			
		||||
            return
 | 
			
		||||
 | 
			
		||||
        if member is None or not isinstance(member, discord.Member):
 | 
			
		||||
            member = ctx.author
 | 
			
		||||
 | 
			
		||||
        server = self._servers.find_server_by_discord_id(ctx.guild.id)
 | 
			
		||||
        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
 | 
			
		||||
 | 
			
		||||
        if atr == 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.lower()}').format(member.mention, value)
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    @get.autocomplete('atr')
 | 
			
		||||
    async def get_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
 | 
			
		||||
        return [app_commands.Choice(name=key, value=value) for key, value in self._atr_list]
 | 
			
		||||
 | 
			
		||||
    @user.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    @CommandChecks.check_is_ready()
 | 
			
		||||
    @CommandChecks.check_is_member_moderator()
 | 
			
		||||
    async def set(self, ctx: Context, atr: str, value: str, member: discord.Member = None):
 | 
			
		||||
        self._logger.debug(__name__, f'Received command user-set {atr} {ctx}:{member}')
 | 
			
		||||
 | 
			
		||||
        if member is None or not isinstance(member, discord.Member):
 | 
			
		||||
            member = ctx.author
 | 
			
		||||
 | 
			
		||||
        server = self._servers.find_server_by_discord_id(ctx.guild.id)
 | 
			
		||||
        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
 | 
			
		||||
 | 
			
		||||
        if atr == 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.lower()}').format(member.mention, value))
 | 
			
		||||
 | 
			
		||||
    @set.autocomplete('atr')
 | 
			
		||||
    async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
 | 
			
		||||
        atr_list = [('xp', self._atr_dict['xp'])]
 | 
			
		||||
        return [app_commands.Choice(name=key, value=value) for key, value in atr_list]
 | 
			
		||||
 | 
			
		||||
    @user.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    @CommandChecks.check_is_ready()
 | 
			
		||||
    @CommandChecks.check_is_member_moderator()
 | 
			
		||||
    async def remove(self, ctx: Context, atr: str, member: discord.Member = None):
 | 
			
		||||
        self._logger.debug(__name__, f'Received command user-remove {atr} {ctx}:{member}')
 | 
			
		||||
 | 
			
		||||
        if member is None or not isinstance(member, discord.Member):
 | 
			
		||||
            member = ctx.author
 | 
			
		||||
 | 
			
		||||
        server = self._servers.find_server_by_discord_id(ctx.guild.id)
 | 
			
		||||
        user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
 | 
			
		||||
 | 
			
		||||
        if atr == 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.lower()}').format(atr, member.mention)
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
    @remove.autocomplete('atr')
 | 
			
		||||
    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> List[app_commands.Choice[str]]:
 | 
			
		||||
        return [app_commands.Choice(name=value, value=key) for key, value in self._atr_list]
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.base.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.base.events'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.auto_role.helper'
 | 
			
		||||
__title__ = 'modules.base.helper'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.base.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.base.thread'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "boot-log",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post2"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.boot_log.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.database'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "database",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0.dev1"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "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.10.0.post2"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.level'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.level.command'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev29'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
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='dev29')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -93,6 +93,11 @@ class LevelGroup(DiscordCommandABC):
 | 
			
		||||
            self._logger.error(__name__, f'Level seeding failed', e)
 | 
			
		||||
            await self._message_service.send_channel_message(channel, self._t.transform('modules.level.seeding_failed'))
 | 
			
		||||
 | 
			
		||||
    async def _level_auto_complete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
 | 
			
		||||
        return [app_commands.Choice(name=level, value=level) for level in self._client_utils.get_auto_complete_list(levels, current)]
 | 
			
		||||
 | 
			
		||||
    @commands.hybrid_group()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
    async def level(self, ctx: Context):
 | 
			
		||||
@@ -240,9 +245,7 @@ class LevelGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @edit.autocomplete('level')
 | 
			
		||||
    async def edit_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
 | 
			
		||||
        return [app_commands.Choice(name=level, value=level) for level in levels]
 | 
			
		||||
        return await self._level_auto_complete(interaction, current)
 | 
			
		||||
 | 
			
		||||
    @edit.autocomplete('color')
 | 
			
		||||
    async def edit_color_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
@@ -283,9 +286,7 @@ class LevelGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @remove.autocomplete('level')
 | 
			
		||||
    async def remove_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
 | 
			
		||||
        return [app_commands.Choice(name=level, value=level) for level in levels]
 | 
			
		||||
        return await self._level_auto_complete(interaction, current)
 | 
			
		||||
 | 
			
		||||
    @level.command()
 | 
			
		||||
    @commands.guild_only()
 | 
			
		||||
@@ -392,6 +393,4 @@ class LevelGroup(DiscordCommandABC):
 | 
			
		||||
 | 
			
		||||
    @set.autocomplete('level')
 | 
			
		||||
    async def set_autocomplete(self, interaction: discord.Interaction, current: str) -> TList[app_commands.Choice[str]]:
 | 
			
		||||
        server = self._servers.get_server_by_discord_id(interaction.guild.id)
 | 
			
		||||
        levels = self._levels.get_levels_by_server_id(server.server_id).select(lambda l: l.name)
 | 
			
		||||
        return [app_commands.Choice(name=level, value=level) for level in levels]
 | 
			
		||||
        return await self._level_auto_complete(interaction, current)
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.level.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.level.events'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "level",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli>=2022.10.1"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -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(levels.where(lambda l: l.name == role.name).single()) + 1)
 | 
			
		||||
                new_position = position_above_levels - (levels.index_of(levels.where(lambda l: l.name == role.name).single()) + 1)
 | 
			
		||||
                if new_position <= 0:
 | 
			
		||||
                    new_position = 1
 | 
			
		||||
                try:
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.level.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -76,7 +76,7 @@ class LevelService:
 | 
			
		||||
        level_settings: LevelServerSettings = self._config.get_configuration(f'LevelServerSettings_{guild.id}')
 | 
			
		||||
        await self._message_service.send_channel_message(
 | 
			
		||||
            self._bot.get_channel(level_settings.changed_level_notification_channel),
 | 
			
		||||
            self._t.transform('modules.level.new_level_message').format(member.id, level.name),
 | 
			
		||||
            self._t.transform('modules.level.new_level_message').format(member.mention, level.name),
 | 
			
		||||
            is_persistent=True
 | 
			
		||||
        )
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.permission'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -11,11 +11,11 @@ Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.permission.service'
 | 
			
		||||
__title__ = 'modules.permission.abc'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.permission.configuration'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.permission.events'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "permission",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post2"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,7 @@ __title__ = 'modules.permission.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.dev25'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
@@ -23,4 +23,4 @@ from collections import namedtuple
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='dev25')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.stats'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.stats.command'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.stats.model'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.stats.service'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -3,8 +3,8 @@
 | 
			
		||||
    "Name": "stats",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli>=2022.10.1"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.stats.ui'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.technician'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports: 
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -0,0 +1,26 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
bot Keksdose bot
 | 
			
		||||
~~~~~~~~~~~~~~~~~~~
 | 
			
		||||
 | 
			
		||||
Discord bot  for the Keksdose discord Server
 | 
			
		||||
 | 
			
		||||
:copyright: (c) 2022 sh-edraft.de
 | 
			
		||||
:license: MIT, see LICENSE for more details.
 | 
			
		||||
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
__title__ = 'modules.technician.command'
 | 
			
		||||
__author__ = 'Sven Heidemann'
 | 
			
		||||
__license__ = 'MIT'
 | 
			
		||||
__copyright__ = 'Copyright (c) 2022 sh-edraft.de'
 | 
			
		||||
__version__ = '0.3.0rc2'
 | 
			
		||||
 | 
			
		||||
from collections import namedtuple
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# imports:
 | 
			
		||||
 | 
			
		||||
VersionInfo = namedtuple('VersionInfo', 'major minor micro')
 | 
			
		||||
version_info = VersionInfo(major='0', minor='3', micro='0.rc2')
 | 
			
		||||
 
 | 
			
		||||
@@ -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'), ephemeral=True)
 | 
			
		||||
        await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.technician.log_message'), file=discord.File(zip_file.filename, 'logs.zip'))
 | 
			
		||||
        os.remove(zip_file.filename)
 | 
			
		||||
 | 
			
		||||
        self._logger.trace(__name__, f'Finished log command')
 | 
			
		||||
 
 | 
			
		||||
@@ -3,8 +3,8 @@
 | 
			
		||||
    "Name": "technician",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "",
 | 
			
		||||
    "AuthorEmail": "",
 | 
			
		||||
@@ -16,10 +16,10 @@
 | 
			
		||||
    "LicenseName": "",
 | 
			
		||||
    "LicenseDescription": "",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core>=2022.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli>=2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.6",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "get-version",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "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.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "post-build",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "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.10.0.post7"
 | 
			
		||||
      "cpl-core==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli>=2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,9 @@
 | 
			
		||||
  "ProjectSettings": {
 | 
			
		||||
    "Name": "set-version",
 | 
			
		||||
    "Version": {
 | 
			
		||||
      "Major": "1",
 | 
			
		||||
      "Minor": "0",
 | 
			
		||||
      "Micro": "0"
 | 
			
		||||
      "Major": "0",
 | 
			
		||||
      "Minor": "3",
 | 
			
		||||
      "Micro": "0.rc2"
 | 
			
		||||
    },
 | 
			
		||||
    "Author": "Sven Heidemann",
 | 
			
		||||
    "AuthorEmail": "sven.heidemann@sh-edraft.de",
 | 
			
		||||
@@ -16,11 +16,11 @@
 | 
			
		||||
    "LicenseName": "MIT",
 | 
			
		||||
    "LicenseDescription": "MIT, see LICENSE for more details.",
 | 
			
		||||
    "Dependencies": [
 | 
			
		||||
      "cpl-core==2022.10.0.post7",
 | 
			
		||||
      "cpl-core==2022.12.0",
 | 
			
		||||
      "GitPython==3.1.27"
 | 
			
		||||
    ],
 | 
			
		||||
    "DevDependencies": [
 | 
			
		||||
      "cpl-cli==2022.10.0"
 | 
			
		||||
      "cpl-cli==2022.12.0"
 | 
			
		||||
    ],
 | 
			
		||||
    "PythonVersion": ">=3.10.4",
 | 
			
		||||
    "PythonPath": {},
 | 
			
		||||
 
 | 
			
		||||
@@ -1,13 +0,0 @@
 | 
			
		||||
import { NgModule } from "@angular/core";
 | 
			
		||||
import { RouterModule, Routes } from "@angular/router";
 | 
			
		||||
import { MembersComponent } from "./component/members/members.component";
 | 
			
		||||
 | 
			
		||||
const routes: Routes = [
 | 
			
		||||
  { path: '', component: MembersComponent },
 | 
			
		||||
];
 | 
			
		||||
 | 
			
		||||
@NgModule({
 | 
			
		||||
  imports: [RouterModule.forChild(routes)],
 | 
			
		||||
  exports: [RouterModule]
 | 
			
		||||
})
 | 
			
		||||
export class MembersRoutingModule { }
 | 
			
		||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user