sh-edraft.de/sh_discord_bot
5
1
Fork 1
Code Issues 26 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

Compare commits

base: sh-edraft.de:1.1.0
Branches Tags
sh-edraft.de:master sh-edraft.de:staging sh-edraft.de:dev sh-edraft.de:#139
sh-edraft.de:1.2.5 sh-edraft.de:1.2.4 sh-edraft.de:1.2.3 sh-edraft.de:1.2.2 sh-edraft.de:1.2.1 sh-edraft.de:1.2.0 sh-edraft.de:1.1.10 sh-edraft.de:1.1.9 sh-edraft.de:1.1.8 sh-edraft.de:1.1.7 sh-edraft.de:1.1.6 sh-edraft.de:1.1.5 sh-edraft.de:1.1.4 sh-edraft.de:1.1.3 sh-edraft.de:1.1.2 sh-edraft.de:1.1.1 sh-edraft.de:1.1.0 sh-edraft.de:1.0.7 sh-edraft.de:1.0.6 sh-edraft.de:1.0.5 sh-edraft.de:1.0.4 sh-edraft.de:1.0.2 sh-edraft.de:1.0.1 sh-edraft.de:1.0.0 sh-edraft.de:0.3.1 sh-edraft.de:0.3 sh-edraft.de:0.2.3
..
compare: sh-edraft.de:1.1.2
Branches Tags
sh-edraft.de:master sh-edraft.de:staging sh-edraft.de:dev sh-edraft.de:#139
sh-edraft.de:1.2.5 sh-edraft.de:1.2.4 sh-edraft.de:1.2.3 sh-edraft.de:1.2.2 sh-edraft.de:1.2.1 sh-edraft.de:1.2.0 sh-edraft.de:1.1.10 sh-edraft.de:1.1.9 sh-edraft.de:1.1.8 sh-edraft.de:1.1.7 sh-edraft.de:1.1.6 sh-edraft.de:1.1.5 sh-edraft.de:1.1.4 sh-edraft.de:1.1.3 sh-edraft.de:1.1.2 sh-edraft.de:1.1.1 sh-edraft.de:1.1.0 sh-edraft.de:1.0.7 sh-edraft.de:1.0.6 sh-edraft.de:1.0.5 sh-edraft.de:1.0.4 sh-edraft.de:1.0.2 sh-edraft.de:1.0.1 sh-edraft.de:1.0.0 sh-edraft.de:0.3.1 sh-edraft.de:0.3 sh-edraft.de:0.2.3

18 Commits
1.1.0 ... 1.1.2

Author SHA1 Message Date
Sven Heidemann
e914c7d02b Fixed auth service 2023-09-24 10:39:27 +02:00
Sven Heidemann
b40f521212 Build version 2023-09-24 10:18:54 +02:00
Sven Heidemann
d40ca88cd5 Updated version 2023-09-24 10:17:24 +02:00
Sven Heidemann
1e63baed97 Merge pull request 'Fixed authUser to user link #358' (#359) from #358 into support 
Reviewed-on: sh-edraft.de/kd_discord_bot#359
 2023-09-24 10:04:41 +02:00
Sven Heidemann
cdfd151851 Fixed authUser to user link #358 2023-09-24 10:04:13 +02:00
Sven Heidemann
12fbc972d9 Fixed mail dev pw 2023-09-19 21:37:31 +02:00
Sven Heidemann
dca939f025 Merge pull request 'Added check with -xp to get_level' (#357) from fix_get_level_with_negative_xp into support 
Reviewed-on: sh-edraft.de/kd_discord_bot#357
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
 2023-09-10 22:23:33 +02:00
Sven Heidemann
ed9b893c12 Fixed negative xp check 2023-09-10 18:21:30 +02:00
Sven Heidemann
731f80bd5f Fixed negative xp check 2023-09-10 11:14:11 +02:00
Sven Heidemann
85852bf2f0 Added check with -xp to get_level 2023-09-10 11:07:37 +02:00
Sven Heidemann
2c3ef97a14 Updated to swarm 2023-09-03 15:48:40 +02:00
Sven Heidemann
9ec65689ba Merge pull request '1.1.1' (#355) from 1.1.1 into support 
Reviewed-on: sh-edraft.de/kd_discord_bot#355
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
 2023-08-25 14:15:54 +02:00
Sven Heidemann
44f5de32a5 Merge branch 'support' into 1.1.1 2023-08-25 14:15:38 +02:00
Sven Heidemann
c016d5fc84 Set new version 2023-08-24 17:59:03 +02:00
Sven Heidemann
306ce2664c Build new version 2023-08-24 17:59:03 +02:00
Sven Heidemann
3ce5471ef4 Fixed can user see element for achievements 2023-08-24 17:59:02 +02:00
Sven Heidemann
4cdd6c05bf Merge pull request '1.1.0' (#352) from 1.1.0 into master 
Reviewed-on: sh-edraft.de/kd_discord_bot#352
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
 2023-08-24 17:50:24 +02:00
Sven Heidemann
d364ea1b4c Fixed achievement voice state #353 2023-08-21 19:00:55 +02:00
98 changed files with 209 additions and 179 deletions
Expand all files Collapse all files

2
kdb-bot/docker

Submodule kdb-bot/docker updated: 3107817939...7ae4783874

4
kdb-bot/src/bot/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/bot/bot.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-bot/src/bot/extension/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot.extension"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/abc/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.abc"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/bot_api/bot-api.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/bot_api/config

Submodule kdb-bot/src/bot_api/config updated: 3d81c81c9e...b6ffed4da1

4
kdb-bot/src/bot_api/configuration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.configuration"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/controller/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.controller"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/event/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.event"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/exception/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.exception"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/filter/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/filter/discord/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/logging/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.logging"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/model/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.model"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/model/discord/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/route/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.route"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_api/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

9
kdb-bot/src/bot_api/service/auth_service.py
View File

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

4
kdb-bot/src/bot_api/transformer/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_api.transformer"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/abc/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.abc"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/bot_core/bot-core.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-bot/src/bot_core/configuration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.configuration"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/core_extension/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/exception/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.exception"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/helper/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.helper"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/logging/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.logging"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/pipes/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.pipes"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_core/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_core.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_data/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_data"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_data/abc/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_data.abc"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_data/abc/auth_user_repository_abc.py
View File

@@ -14,6 +14,10 @@ class AuthUserRepositoryABC(ABC):
def __init__(self):
pass
@abstractmethod
def get_auth_user_relation_ids(self, auth_user: AuthUser) -> List[int]:
pass
@abstractmethod
def get_all_auth_users(self) -> List[AuthUser]:
pass

2
kdb-bot/src/bot_data/bot-data.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-bot/src/bot_data/migration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_data.migration"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_data/model/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_data.model"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_data/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_data.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

21
kdb-bot/src/bot_data/service/auth_user_repository_service.py
View File

@@ -50,13 +50,7 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
auth_user_id=self._get_value_from_result(au_result[0]),
)
self._logger.trace(
__name__,
f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
)
results = self._context.select(auth_user.get_select_user_id_from_relations())
for result in results:
user_id = self._get_value_from_result(result[0])
for user_id in self.get_auth_user_relation_ids(auth_user):
if user_id is None:
continue
@@ -65,6 +59,19 @@ class AuthUserRepositoryService(AuthUserRepositoryABC):
return auth_user
def get_auth_user_relation_ids(self, auth_user: AuthUser) -> List[int]:
self._logger.trace(
__name__,
f"Send SQL command: {auth_user.get_select_user_id_from_relations()}",
)
relation_ids = List(int)
results = self._context.select(auth_user.get_select_user_id_from_relations())
for result in results:
self._logger.trace(__name__, f"Got auth user relation with id {result[0]}")
relation_ids.append(result[0])
return relation_ids
def get_all_auth_users(self) -> List[AuthUser]:
users = List(AuthUser)
self._logger.trace(__name__, f"Send SQL command: {AuthUser.get_select_all_string()}")

4
kdb-bot/src/bot_graphql/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_graphql/abc/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

13
kdb-bot/src/bot_graphql/abc/query_abc.py
View File

@@ -10,6 +10,7 @@ from bot_api.exception.service_error_code_enum import ServiceErrorCode
from bot_api.exception.service_exception import ServiceException
from bot_api.route.route import Route
from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum
from bot_data.model.achievement import Achievement
from bot_data.model.auth_role_enum import AuthRoleEnum
from bot_data.model.auth_user import AuthUser
from bot_data.model.auto_role import AutoRole
@@ -78,7 +79,17 @@ class QueryABC(ObjectType):
bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC)
access = False
if type(element) == AutoRole:
if type(element) == Achievement:
element: Achievement = element
for u in user.users:
u: User = u
guild = bot.get_guild(u.server.discord_id)
member = guild.get_member(u.discord_id)
if permissions.is_member_moderator(member) and u.server.id == element.server.id:
access = True
break
elif type(element) == AutoRole:
element: AutoRole = element
for u in user.users:
u: User = u

2
kdb-bot/src/bot_graphql/bot-graphql.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-bot/src/bot_graphql/filter/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_graphql/model/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.model"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_graphql/mutations/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_graphql/queries/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/bot_graphql/queries/discord/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/achievements/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.achievements"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

6
kdb-bot/src/modules/achievements/achievements.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"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>=1.1.0"
"cpl-core>=1.1.1"
],
"DevDependencies": [
"cpl-cli>=1.1.0"
"cpl-cli>=1.1.1"
],
"PythonVersion": ">=3.10.4",
"PythonPath": {},

4
kdb-bot/src/modules/achievements/commands/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/achievements/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/achievements/events/achievement_on_voice_state_update_event.py
View File

@@ -40,7 +40,7 @@ class AchievementOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC):
if member.guild is None:
return
if member.author.bot:
if member.bot:
return
server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{member.guild.id}")

4
kdb-bot/src/modules/achievements/model/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.achievements.model"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/auto_role/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/auto_role/auto-role.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

4
kdb-bot/src/modules/auto_role/command/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/auto_role/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/auto_role/helper/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/base/base.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

4
kdb-bot/src/modules/base/command/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.command"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/forms/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.forms"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/helper/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.helper"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/model/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.model"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/base/thread/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.base.thread"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/boot_log/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.boot_log"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/boot_log/boot-log.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

4
kdb-bot/src/modules/config/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.config"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

6
kdb-bot/src/modules/config/config.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",
@@ -16,10 +16,10 @@
"LicenseName": "",
"LicenseDescription": "",
"Dependencies": [
"cpl-core>=1.1.0"
"cpl-core>=1.1.1"
],
"DevDependencies": [
"cpl-cli>=1.1.0"
"cpl-cli>=1.1.1"
],
"PythonVersion": ">=3.10.4",
"PythonPath": {

4
kdb-bot/src/modules/config/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.config.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/config/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.config.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/database/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.database"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/database/database.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-bot/src/modules/level/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.level"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/level/command/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.level.command"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/level/configuration/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.level.configuration"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/level/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.level.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/level/level.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

4
kdb-bot/src/modules/level/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.level.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

3
kdb-bot/src/modules/level/service/level_service.py
View File

@@ -40,6 +40,9 @@ class LevelService:
def get_level(self, user: User) -> Level:
levels_by_server = self._levels.get_levels_by_server_id(user.server.id)
if user.xp < 0:
return levels_by_server.order_by(lambda l: l.min_xp).first()
levels = levels_by_server.order_by(lambda l: l.min_xp).where(lambda l: user.xp >= l.min_xp)
if levels.count() == 0:

4
kdb-bot/src/modules/permission/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.permission"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/permission/abc/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.permission.abc"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/permission/events/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.permission.events"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/permission/permission.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

4
kdb-bot/src/modules/permission/service/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.permission.service"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/technician/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.technician"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

4
kdb-bot/src/modules/technician/command/__init__.py
View File

@@ -15,7 +15,7 @@ __title__ = "modules.technician.command"
__author__ = "Sven Heidemann"
__license__ = "MIT"
__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
__version__ = "1.1.0"
__version__ = "1.1.2"
from collections import namedtuple
@@ -23,4 +23,4 @@ from collections import namedtuple
# imports:
VersionInfo = namedtuple("VersionInfo", "major minor micro")
version_info = VersionInfo(major="1", minor="1", micro="0")
version_info = VersionInfo(major="1", minor="1", micro="2")

2
kdb-bot/src/modules/technician/technician.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/tools/checks/checks.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/tools/get_version/get-version.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/tools/post_build/post-build.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/tools/set_version/set-version.json
View File

@@ -4,7 +4,7 @@
"Version": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "2"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

4
kdb-web/package.json
View File

@@ -1,9 +1,9 @@
{
"name": "kdb-web",
"version": "1.1.0",
"version": "1.1.1",
"scripts": {
"ng": "ng",
"update-version": "ts-node-esm update-version.ts",
"update-version": "ts-node update-version.ts",
"prestart": "npm run update-version",
"start": "ng serve",
"prebuild": "npm run update-version",

2
kdb-web/src/assets/version.json
View File

@@ -2,6 +2,6 @@
"WebVersion": {
"Major": "1",
"Minor": "1",
"Micro": "0"
"Micro": "1"
}
}