Merge pull request '1.1.0.rc4' (#345) from 1.1.0.rc4 into 1.1.0
Reviewed-on: sh-edraft.de/kd_discord_bot#345 Closes #344
This commit is contained in:
		| @@ -15,7 +15,7 @@ __title__ = "bot" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "Sven Heidemann", | ||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot.extension" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.abc" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "", | ||||
|     "AuthorEmail": "", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.configuration" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.controller" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.event" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.exception" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.filter" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.logging" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.model" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.route" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.service" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.transformer" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.abc" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "Sven Heidemann", | ||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.configuration" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.events" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.exception" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.helper" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.logging" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.pipes" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.service" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.abc" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "Sven Heidemann", | ||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.migration" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.model" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.service" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "Sven Heidemann", | ||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
							
								
								
									
										53
									
								
								kdb-bot/src/bot_graphql/graphql/discord.gql
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										53
									
								
								kdb-bot/src/bot_graphql/graphql/discord.gql
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,53 @@ | ||||
| type Discord { | ||||
|     guilds(filter: GuildFilter): [Guild] | ||||
|     users(filter: DiscordUserFilter): [DiscordUser] | ||||
| } | ||||
|  | ||||
| type Guild { | ||||
|     id: ID | ||||
|     name: String | ||||
|  | ||||
|     channels(filter: ChannelFilter): [Channel] | ||||
|     roles: [Role] | ||||
|     emojis: [Emoji] | ||||
| } | ||||
|  | ||||
| input GuildFilter { | ||||
|     id: ID | ||||
|     name: String | ||||
| } | ||||
|  | ||||
| type Channel { | ||||
|     id: String | ||||
|     name: String | ||||
|     type: String | ||||
| } | ||||
|  | ||||
| input ChannelFilter { | ||||
|     id: String | ||||
|     name: String | ||||
|     type: String | ||||
| } | ||||
|  | ||||
| type Role { | ||||
|     id: String | ||||
|     name: String | ||||
| } | ||||
|  | ||||
| type DiscordUser { | ||||
|     id: String | ||||
|     name: String | ||||
|     bot: Boolean | ||||
| } | ||||
|  | ||||
| input DiscordUserFilter { | ||||
|     id: ID | ||||
|     name: String | ||||
|     bot: Boolean | ||||
| } | ||||
|  | ||||
| type Emoji { | ||||
|     id: String | ||||
|     name: String | ||||
|     url: String | ||||
| } | ||||
| @@ -38,7 +38,6 @@ type Query { | ||||
|     achievementOperators: [String] | ||||
| 
 | ||||
|     technicianConfig: TechnicianConfig | ||||
| 
 | ||||
|     guilds(filter: GuildFilter): [Guild] | ||||
|     possibleFeatureFlags: [String] | ||||
|     discord: Discord | ||||
| } | ||||
| @@ -37,6 +37,12 @@ from bot_graphql.queries.auto_role_rule_history_query import AutoRoleRuleHistory | ||||
| from bot_graphql.queries.auto_role_rule_query import AutoRoleRuleQuery | ||||
| from bot_graphql.queries.client_history_query import ClientHistoryQuery | ||||
| from bot_graphql.queries.client_query import ClientQuery | ||||
| from bot_graphql.queries.discord.channel_query import ChannelQuery | ||||
| from bot_graphql.queries.discord.discord_query import DiscordQuery | ||||
| from bot_graphql.queries.discord.discord_user_query import DiscordUserQuery | ||||
| from bot_graphql.queries.discord.emoji_query import EmojiQuery | ||||
| from bot_graphql.queries.discord.guild_query import GuildQuery | ||||
| from bot_graphql.queries.discord.role_query import RoleQuery | ||||
| from bot_graphql.queries.game_server_query import GameServerQuery | ||||
| from bot_graphql.queries.known_user_history_query import KnownUserHistoryQuery | ||||
| from bot_graphql.queries.known_user_query import KnownUserQuery | ||||
| @@ -105,6 +111,13 @@ class GraphQLModule(ModuleABC): | ||||
|         services.add_transient(QueryABC, UserJoinedGameServerHistoryQuery) | ||||
|         services.add_transient(QueryABC, UserJoinedGameServerQuery) | ||||
|  | ||||
|         services.add_transient(QueryABC, DiscordQuery) | ||||
|         services.add_transient(QueryABC, GuildQuery) | ||||
|         services.add_transient(QueryABC, ChannelQuery) | ||||
|         services.add_transient(QueryABC, RoleQuery) | ||||
|         services.add_transient(QueryABC, EmojiQuery) | ||||
|         services.add_transient(QueryABC, DiscordUserQuery) | ||||
|  | ||||
|         # filters | ||||
|         services.add_transient(FilterABC, AutoRoleFilter) | ||||
|         services.add_transient(FilterABC, AutoRoleRuleFilter) | ||||
|   | ||||
							
								
								
									
										1
									
								
								kdb-bot/src/bot_graphql/model/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								kdb-bot/src/bot_graphql/model/__init__.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | ||||
| # imports | ||||
| @@ -1,29 +0,0 @@ | ||||
| type Guild { | ||||
|     id: ID | ||||
|     name: String | ||||
|  | ||||
|     channels: [Channel] | ||||
|     roles: [Role] | ||||
|     emojis: [Emoji] | ||||
| } | ||||
|  | ||||
| input GuildFilter { | ||||
|     id: ID | ||||
| } | ||||
|  | ||||
| type Channel { | ||||
|     id: String | ||||
|     name: String | ||||
|     type: String | ||||
| } | ||||
|  | ||||
| type Role { | ||||
|     id: String | ||||
|     name: String | ||||
| } | ||||
|  | ||||
| type Emoji { | ||||
|     id: String | ||||
|     name: String | ||||
|     url: String | ||||
| } | ||||
							
								
								
									
										16
									
								
								kdb-bot/src/bot_graphql/model/discord.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								kdb-bot/src/bot_graphql/model/discord.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,16 @@ | ||||
| from cpl_query.extension import List | ||||
| from discord import Guild, User | ||||
|  | ||||
|  | ||||
| class Discord: | ||||
|     def __init__(self, guilds: List[Guild], users: List[User]): | ||||
|         self._guilds = guilds | ||||
|         self._users = users | ||||
|  | ||||
|     @property | ||||
|     def guilds(self) -> List[Guild]: | ||||
|         return self._guilds | ||||
|  | ||||
|     @property | ||||
|     def users(self) -> List[User]: | ||||
|         return self._users | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -1,10 +1,10 @@ | ||||
| from bot_graphql.abc.data_query_abc import DataQueryABC | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class ChannelQuery(DataQueryABC): | ||||
| class ChannelQuery(QueryABC): | ||||
|     def __init__(self): | ||||
|         DataQueryABC.__init__(self, "Channel") | ||||
|         QueryABC.__init__(self, "Channel") | ||||
|  | ||||
|         self.set_field("id", lambda c, *_: c.id) | ||||
|         self.set_field("name", lambda c, *_: c.name) | ||||
|         self.set_field("type", lambda c, *_: type(c)) | ||||
|         self.set_field("type", lambda c, *_: type(c).__name__) | ||||
|   | ||||
							
								
								
									
										48
									
								
								kdb-bot/src/bot_graphql/queries/discord/discord_query.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										48
									
								
								kdb-bot/src/bot_graphql/queries/discord/discord_query.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,48 @@ | ||||
| from cpl_discord.service import DiscordBotServiceABC | ||||
| from cpl_query.extension import List | ||||
|  | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class DiscordQuery(QueryABC): | ||||
|     def __init__( | ||||
|         self, | ||||
|         bot: DiscordBotServiceABC, | ||||
|     ): | ||||
|         QueryABC.__init__(self, "Discord") | ||||
|  | ||||
|         self._bot = bot | ||||
|  | ||||
|         self.set_field("guilds", self._resolve_guilds) | ||||
|         self.set_field("users", self._resolve_users) | ||||
|  | ||||
|     def _resolve_guilds(self, *_, filter=None): | ||||
|         guilds = self._bot.guilds | ||||
|  | ||||
|         if filter is None: | ||||
|             return guilds | ||||
|  | ||||
|         if "id" in filter: | ||||
|             guilds = self._bot.guilds.where(lambda g: g.id == int(filter["id"])) | ||||
|  | ||||
|         if "name" in filter: | ||||
|             guilds = self._bot.guilds.where(lambda g: g.name == filter["name"]) | ||||
|  | ||||
|         return guilds | ||||
|  | ||||
|     def _resolve_users(self, *_, filter=None): | ||||
|         users = List(any).extend(self._bot.users) | ||||
|  | ||||
|         if filter is None: | ||||
|             return users | ||||
|  | ||||
|         if "id" in filter: | ||||
|             users = users.where(lambda g: g.id == int(filter["id"])) | ||||
|  | ||||
|         if "name" in filter: | ||||
|             users = users.where(lambda g: g.name == filter["name"]) | ||||
|  | ||||
|         if "bot" in filter: | ||||
|             users = users.where(lambda g: g.bot == bool(filter["bot"])) | ||||
|  | ||||
|         return users | ||||
| @@ -0,0 +1,10 @@ | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class DiscordUserQuery(QueryABC): | ||||
|     def __init__(self): | ||||
|         QueryABC.__init__(self, "DiscordUser") | ||||
|  | ||||
|         self.set_field("id", lambda r, *_: r.id) | ||||
|         self.set_field("name", lambda r, *_: r.name) | ||||
|         self.set_field("bot", lambda r, *_: r.bot) | ||||
| @@ -1,9 +1,9 @@ | ||||
| from bot_graphql.abc.data_query_abc import DataQueryABC | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class RoleQuery(DataQueryABC): | ||||
| class EmojiQuery(QueryABC): | ||||
|     def __init__(self): | ||||
|         DataQueryABC.__init__(self, "Emoji") | ||||
|         QueryABC.__init__(self, "Emoji") | ||||
|  | ||||
|         self.set_field("id", lambda e, *_: e.id) | ||||
|         self.set_field("name", lambda e, *_: e.name) | ||||
|   | ||||
| @@ -1,12 +1,38 @@ | ||||
| from bot_graphql.abc.data_query_abc import DataQueryABC | ||||
| from cpl_discord.service import DiscordBotServiceABC | ||||
| from cpl_query.extension import List | ||||
| from discord import Guild | ||||
|  | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class GuildQuery(DataQueryABC): | ||||
|     def __init__(self): | ||||
|         DataQueryABC.__init__(self, "Guild") | ||||
| class GuildQuery(QueryABC): | ||||
|     def __init__( | ||||
|         self, | ||||
|         bot: DiscordBotServiceABC, | ||||
|     ): | ||||
|         QueryABC.__init__(self, "Guild") | ||||
|  | ||||
|         self._bot = bot | ||||
|  | ||||
|         self.set_field("id", lambda g, *_: g.id) | ||||
|         self.set_field("name", lambda g, *_: g.name) | ||||
|         self.set_field("channels", lambda g, *_: g.channels) | ||||
|         self.set_field("channels", self._resolve_channels) | ||||
|         self.set_field("roles", lambda g, *_: g.roles) | ||||
|         self.set_field("emojis", lambda g, *_: g.emojis) | ||||
|  | ||||
|     def _resolve_channels(self, g: Guild, *_, filter=None): | ||||
|         users = List(any).extend(g.channels) | ||||
|  | ||||
|         if filter is None: | ||||
|             return users | ||||
|  | ||||
|         if "id" in filter: | ||||
|             users = users.where(lambda c: c.id == int(filter["id"])) | ||||
|  | ||||
|         if "name" in filter: | ||||
|             users = users.where(lambda c: c.id == filter["name"]) | ||||
|  | ||||
|         if "type" in filter: | ||||
|             users = users.where(lambda c: type(c).__name__ == filter["type"]) | ||||
|  | ||||
|         return users | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| from bot_graphql.abc.data_query_abc import DataQueryABC | ||||
| from bot_graphql.abc.query_abc import QueryABC | ||||
|  | ||||
|  | ||||
| class RoleQuery(DataQueryABC): | ||||
| class RoleQuery(QueryABC): | ||||
|     def __init__(self): | ||||
|         DataQueryABC.__init__(self, "Role") | ||||
|         QueryABC.__init__(self, "Role") | ||||
|  | ||||
|         self.set_field("id", lambda r, *_: r.id) | ||||
|         self.set_field("name", lambda r, *_: r.name) | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| from cpl_discord.service import DiscordBotServiceABC | ||||
| from cpl_query.extension import List | ||||
|  | ||||
| from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum | ||||
| from bot_data.abc.achievement_repository_abc import AchievementRepositoryABC | ||||
| @@ -24,6 +25,7 @@ from bot_graphql.filter.user_filter import UserFilter | ||||
| from bot_graphql.filter.user_joined_game_server_filter import UserJoinedGameServerFilter | ||||
| from bot_graphql.filter.user_joined_server_filter import UserJoinedServerFilter | ||||
| from bot_graphql.filter.user_joined_voice_channel_filter import UserJoinedVoiceChannelFilter | ||||
| from bot_graphql.model.discord import Discord | ||||
| from modules.achievements.achievement_service import AchievementService | ||||
|  | ||||
|  | ||||
| @@ -47,8 +49,6 @@ class Query(QueryABC): | ||||
|     ): | ||||
|         QueryABC.__init__(self, "Query") | ||||
|  | ||||
|         self._bot = bot | ||||
|  | ||||
|         self.add_collection("autoRole", lambda *_: auto_roles.get_auto_roles(), AutoRoleFilter) | ||||
|         self.add_collection("autoRoleRule", lambda *_: auto_roles.get_auto_role_rules(), AutoRoleRuleFilter) | ||||
|         self.add_collection("client", lambda *_: clients.get_clients(), ClientFilter) | ||||
| @@ -73,13 +73,7 @@ class Query(QueryABC): | ||||
|         self.add_collection("achievement", lambda *_: achievements.get_achievements(), AchievementFilter) | ||||
|         self.set_field("technicianConfig", lambda *_: technician_config.get_technician_config()) | ||||
|  | ||||
|         self.set_field("guilds", self._resolve_guilds) | ||||
|         self.set_field("achievementAttributes", lambda x, *_: achievement_service.get_attributes()) | ||||
|         self.set_field("achievementOperators", lambda x, *_: achievement_service.get_operators()) | ||||
|         self.set_field("possibleFeatureFlags", lambda x, *_: [e.value for e in FeatureFlagsEnum]) | ||||
|  | ||||
|     def _resolve_guilds(self, *_, filter=None): | ||||
|         if filter is None or "id" not in filter: | ||||
|             return self._bot.guilds | ||||
|  | ||||
|         return self._bot.guilds.where(lambda g: g.id == int(filter["id"])) | ||||
|         self.set_field("achievementAttributes", lambda *_: achievement_service.get_attributes()) | ||||
|         self.set_field("achievementOperators", lambda *_: achievement_service.get_operators()) | ||||
|         self.set_field("possibleFeatureFlags", lambda *_: [e.value for e in FeatureFlagsEnum]) | ||||
|         self.set_field("discord", lambda *_: Discord(bot.guilds, List(any).extend(bot.users))) | ||||
|   | ||||
| @@ -10,7 +10,7 @@ from bot_graphql.query import Query | ||||
|  | ||||
| class Schema: | ||||
|     def __init__(self, query: Query, mutation: Mutation, queries: list[QueryABC]): | ||||
|         type_defs = load_schema_from_path(os.path.join(os.path.dirname(os.path.realpath(__file__)), "model/")) | ||||
|         type_defs = load_schema_from_path(os.path.join(os.path.dirname(os.path.realpath(__file__)), "graphql/")) | ||||
|         self._schema = make_executable_schema(type_defs, query, mutation, *queries) | ||||
|  | ||||
|     @property | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "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.rc3" | ||||
|       "cpl-core>=1.1.0.rc4" | ||||
|     ], | ||||
|     "DevDependencies": [ | ||||
|       "cpl-cli>=1.1.0.rc3" | ||||
|       "cpl-cli>=1.1.0.rc4" | ||||
|     ], | ||||
|     "PythonVersion": ">=3.10.4", | ||||
|     "PythonPath": {}, | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.events" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -53,7 +53,7 @@ class AchievementOnReactionAddEvent(OnReactionAddABC): | ||||
|             return | ||||
|  | ||||
|         server = self._servers.get_server_by_discord_id(user.guild.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(user.author.id, server.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(user.id, server.id) | ||||
|  | ||||
|         user.reaction_count += 1 | ||||
|         self._db.save_changes() | ||||
|   | ||||
| @@ -53,7 +53,7 @@ class AchievementOnReactionRemoveEvent(OnReactionRemoveABC): | ||||
|             return | ||||
|  | ||||
|         server = self._servers.get_server_by_discord_id(user.guild.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(user.author.id, server.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(user.id, server.id) | ||||
|  | ||||
|         user.reaction_count -= 1 | ||||
|         self._db.save_changes() | ||||
|   | ||||
| @@ -50,6 +50,6 @@ class AchievementOnVoiceStateUpdateEvent(OnVoiceStateUpdateABC): | ||||
|             return | ||||
|  | ||||
|         server = self._servers.get_server_by_discord_id(member.guild.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(member.author.id, server.id) | ||||
|         user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id) | ||||
|  | ||||
|         await self._achievements.validate_achievements_for_user(user) | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.model" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.auto_role" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "", | ||||
|     "AuthorEmail": "", | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -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.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "", | ||||
|     "AuthorEmail": "", | ||||
|   | ||||
| @@ -10,6 +10,7 @@ from modules.base.command.afk_command import AFKCommand | ||||
| from modules.base.command.game_server_group import GameServerGroup | ||||
| from modules.base.command.help_command import HelpCommand | ||||
| from modules.base.command.info_command import InfoCommand | ||||
| from modules.base.command.make_coffee_command import MakeCoffeeCommand | ||||
| from modules.base.command.mass_move_command import MassMoveCommand | ||||
| from modules.base.command.ping_command import PingCommand | ||||
| from modules.base.command.presence_command import PresenceCommand | ||||
| @@ -67,6 +68,7 @@ class BaseModule(ModuleABC): | ||||
|         self._dc.add_command(MassMoveCommand) | ||||
|         self._dc.add_command(PingCommand) | ||||
|         self._dc.add_command(PresenceCommand) | ||||
|         self._dc.add_command(MakeCoffeeCommand) | ||||
|  | ||||
|         self._dc.add_command(PurgeCommand) | ||||
|         self._dc.add_command(UserGroup) | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.command" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
							
								
								
									
										17
									
								
								kdb-bot/src/modules/base/command/make_coffee_command.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								kdb-bot/src/modules/base/command/make_coffee_command.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | ||||
| from cpl_core.logging import LoggerABC | ||||
| from cpl_discord.command import DiscordCommandABC | ||||
| from cpl_discord.service import DiscordBotServiceABC | ||||
| from discord.ext import commands | ||||
| from discord.ext.commands import Context | ||||
|  | ||||
|  | ||||
| class MakeCoffeeCommand(DiscordCommandABC): | ||||
|     def __init__(self, logger: LoggerABC, bot: DiscordBotServiceABC): | ||||
|         DiscordCommandABC.__init__(self) | ||||
|  | ||||
|         self._logger = logger | ||||
|         self._bot = bot | ||||
|  | ||||
|     @commands.hybrid_command(name="make-coffee") | ||||
|     async def make_coffee(self, ctx: Context): | ||||
|         await ctx.send("https://media.giphy.com/media/M4ecx9P2jI4tq/giphy.gif") | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.events" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.forms" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.helper" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.model" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.service" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.thread" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.boot_log" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "", | ||||
|     "AuthorEmail": "", | ||||
|   | ||||
| @@ -15,7 +15,7 @@ __title__ = "modules.config" | ||||
| __author__ = "Sven Heidemann" | ||||
| __license__ = "MIT" | ||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||
| __version__ = "1.1.0rc3" | ||||
| __version__ = "1.1.0rc4" | ||||
|  | ||||
| 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.rc3") | ||||
| version_info = VersionInfo(major="1", minor="1", micro="0.rc4") | ||||
|   | ||||
| @@ -4,7 +4,7 @@ | ||||
|     "Version": { | ||||
|       "Major": "1", | ||||
|       "Minor": "1", | ||||
|       "Micro": "0.rc3" | ||||
|       "Micro": "0.rc4" | ||||
|     }, | ||||
|     "Author": "", | ||||
|     "AuthorEmail": "", | ||||
| @@ -16,10 +16,10 @@ | ||||
|     "LicenseName": "", | ||||
|     "LicenseDescription": "", | ||||
|     "Dependencies": [ | ||||
|       "cpl-core>=1.1.0.rc3" | ||||
|       "cpl-core>=1.1.0.rc4" | ||||
|     ], | ||||
|     "DevDependencies": [ | ||||
|       "cpl-cli>=1.1.0.rc3" | ||||
|       "cpl-cli>=1.1.0.rc4" | ||||
|     ], | ||||
|     "PythonVersion": ">=3.10.4", | ||||
|     "PythonPath": { | ||||
|   | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user