Compare commits
	
		
			25 Commits
		
	
	
		
			1.1.8
			...
			7d5733fa5c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 7d5733fa5c | |||
| 5c87a7a919 | |||
| 682c0034b0 | |||
| 34d83a472c | |||
| 3fd25418bf | |||
| b175b07e35 | |||
| 06e6d7a0cf | |||
| ec8f15fd72 | |||
| 65a09c428d | |||
| 1125c83d13 | |||
| 76d94c0f60 | |||
| eb3eb24e81 | |||
| aba6e48e2b | |||
| 73848c3141 | |||
| 33d6015088 | |||
| 7e962e05f6 | |||
| c73c6876b2 | |||
| 8e949c3e1a | |||
| 472a76d563 | |||
| f5d88ec94c | |||
| 2182c021b9 | |||
| a9c9880fd4 | |||
| d91c76467d | |||
| 2f10ace27f | |||
| 0ed93c56d0 | 
| @@ -5,8 +5,8 @@ volumes: | |||||||
|  |  | ||||||
| services: | services: | ||||||
|   kdb_bot_staging_1: |   kdb_bot_staging_1: | ||||||
|     image: sh-edraft.de/kdb-bot:1.1.8 |     image: sh-edraft.de/kdb-bot:1.1.9 | ||||||
|     container_name: kdb_bot_staging_1 |     restart: unless-stopped | ||||||
|     depends_on: |     depends_on: | ||||||
|       - kdb_db_staging_1 |       - kdb_db_staging_1 | ||||||
|     networks: |     networks: | ||||||
| @@ -25,15 +25,14 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|         constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         reservations: |         reservations: | ||||||
|           cpus: "0.5" |           cpus: "0.5" | ||||||
|           memory: 1024M |           memory: 1024M | ||||||
|  |  | ||||||
|   kdb_web_staging_1: |   kdb_web_staging_1: | ||||||
|     image: sh-edraft.de/kdb-web:1.1.8 |     image: sh-edraft.de/kdb-web:1.1.9 | ||||||
|     container_name: kdb_web_staging_1 |  | ||||||
|     depends_on: |     depends_on: | ||||||
|       - kdb_bot_staging_1 |       - kdb_bot_staging_1 | ||||||
|     networks: |     networks: | ||||||
| @@ -47,7 +46,7 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|         constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         limits: |         limits: | ||||||
|           cpus: "0.4" |           cpus: "0.4" | ||||||
| @@ -58,7 +57,6 @@ services: | |||||||
|  |  | ||||||
|   kdb_db_staging_1: |   kdb_db_staging_1: | ||||||
|     image: mysql:latest |     image: mysql:latest | ||||||
|     container_name: kdb_db_staging_1 |  | ||||||
|     command: mysqld --default-authentication-plugin=mysql_native_password --log_bin_trust_function_creators=1 |     command: mysqld --default-authentication-plugin=mysql_native_password --log_bin_trust_function_creators=1 | ||||||
|     networks: |     networks: | ||||||
|       - kdb_test |       - kdb_test | ||||||
| @@ -75,7 +73,7 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|         constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         reservations: |         reservations: | ||||||
|           cpus: "0.1" |           cpus: "0.1" | ||||||
|   | |||||||
| @@ -5,7 +5,8 @@ volumes: | |||||||
|  |  | ||||||
| services: | services: | ||||||
|   kdb_bot_prod_1: |   kdb_bot_prod_1: | ||||||
|         image: sh-edraft.de/kdb-bot:1.1.8 |     image: sh-edraft.de/kdb-bot:1.1.9 | ||||||
|  |     restart: unless-stopped | ||||||
|     depends_on: |     depends_on: | ||||||
|       - kdb_db_prod_1 |       - kdb_db_prod_1 | ||||||
|     networks: |     networks: | ||||||
| @@ -23,14 +24,14 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|             constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         reservations: |         reservations: | ||||||
|           cpus: "0.5" |           cpus: "0.5" | ||||||
|           memory: 1024M |           memory: 1024M | ||||||
|  |  | ||||||
|   kdb_web_prod_1: |   kdb_web_prod_1: | ||||||
|         image: sh-edraft.de/kdb-web:1.1.8 |     image: sh-edraft.de/kdb-web:1.1.9 | ||||||
|     depends_on: |     depends_on: | ||||||
|       - kdb_bot_prod_1 |       - kdb_bot_prod_1 | ||||||
|     networks: |     networks: | ||||||
| @@ -44,7 +45,7 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|             constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         limits: |         limits: | ||||||
|           cpus: "0.4" |           cpus: "0.4" | ||||||
| @@ -72,7 +73,7 @@ services: | |||||||
|       mode: replicated |       mode: replicated | ||||||
|       replicas: 1 |       replicas: 1 | ||||||
|       placement: |       placement: | ||||||
|             constraints: [ node.role == manager ] |         constraints: [node.role == manager] | ||||||
|       resources: |       resources: | ||||||
|         reservations: |         reservations: | ||||||
|           cpus: "0.1" |           cpus: "0.1" | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot.extension" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -18,6 +18,7 @@ from bot_data.migration.initial_migration import InitialMigration | |||||||
| from bot_data.migration.level_migration import LevelMigration | from bot_data.migration.level_migration import LevelMigration | ||||||
| from bot_data.migration.remove_stats_migration import RemoveStatsMigration | from bot_data.migration.remove_stats_migration import RemoveStatsMigration | ||||||
| from bot_data.migration.short_role_name_migration import ShortRoleNameMigration | from bot_data.migration.short_role_name_migration import ShortRoleNameMigration | ||||||
|  | from bot_data.migration.short_role_name_only_highest_migration import ShortRoleNameOnlyHighestMigration | ||||||
| from bot_data.migration.stats_migration import StatsMigration | from bot_data.migration.stats_migration import StatsMigration | ||||||
| from bot_data.migration.user_joined_game_server_migration import UserJoinedGameServerMigration | from bot_data.migration.user_joined_game_server_migration import UserJoinedGameServerMigration | ||||||
| from bot_data.migration.user_message_count_per_hour_migration import ( | from bot_data.migration.user_message_count_per_hour_migration import ( | ||||||
| @@ -54,3 +55,4 @@ class StartupMigrationExtension(StartupExtensionABC): | |||||||
|         services.add_transient(MigrationABC, DefaultRoleMigration)  # 24.09.2023 #360 - 1.1.3 |         services.add_transient(MigrationABC, DefaultRoleMigration)  # 24.09.2023 #360 - 1.1.3 | ||||||
|         services.add_transient(MigrationABC, ShortRoleNameMigration)  # 28.09.2023 #378 - 1.1.7 |         services.add_transient(MigrationABC, ShortRoleNameMigration)  # 28.09.2023 #378 - 1.1.7 | ||||||
|         services.add_transient(MigrationABC, FixUpdatesMigration)  # 28.09.2023 #378 - 1.1.7 |         services.add_transient(MigrationABC, FixUpdatesMigration)  # 28.09.2023 #378 - 1.1.7 | ||||||
|  |         services.add_transient(MigrationABC, ShortRoleNameOnlyHighestMigration)  # 02.10.2023 #391 - 1.1.9 | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.abc" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.configuration" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.controller" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.event" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.exception" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.filter" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.filter.discord" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.logging" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.model" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.model.discord" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.route" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_api.transformer" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.abc" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.configuration" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -24,3 +24,4 @@ class FeatureFlagsEnum(Enum): | |||||||
|     game_server = "GameServer" |     game_server = "GameServer" | ||||||
|     sync_xp = "SyncXp" |     sync_xp = "SyncXp" | ||||||
|     short_role_name = "ShortRoleName" |     short_role_name = "ShortRoleName" | ||||||
|  |     technician_full_access = "TechnicianFullAccess" | ||||||
|   | |||||||
| @@ -26,6 +26,7 @@ class FeatureFlagsSettings(ConfigurationModelABC): | |||||||
|         FeatureFlagsEnum.game_server.value: False,  # 25.09.2023 #366 |         FeatureFlagsEnum.game_server.value: False,  # 25.09.2023 #366 | ||||||
|         FeatureFlagsEnum.sync_xp.value: False,  # 25.09.2023 #366 |         FeatureFlagsEnum.sync_xp.value: False,  # 25.09.2023 #366 | ||||||
|         FeatureFlagsEnum.short_role_name.value: False,  # 28.09.2023 #378 |         FeatureFlagsEnum.short_role_name.value: False,  # 28.09.2023 #378 | ||||||
|  |         FeatureFlagsEnum.technician_full_access.value: False,  # 02.10.2023 #393 | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     def __init__(self, **kwargs: dict): |     def __init__(self, **kwargs: dict): | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.core_extension" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.exception" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.helper" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.logging" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.pipes" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_core.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -8,7 +8,6 @@ from bot_data.model.server import Server | |||||||
| from bot_data.model.technician_config import TechnicianConfig | from bot_data.model.technician_config import TechnicianConfig | ||||||
| from bot_data.service.server_config_seeder import ServerConfigSeeder | from bot_data.service.server_config_seeder import ServerConfigSeeder | ||||||
| from bot_data.service.technician_config_seeder import TechnicianConfigSeeder | from bot_data.service.technician_config_seeder import TechnicianConfigSeeder | ||||||
| from modules.permission.abc.permission_service_abc import PermissionServiceABC |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class ConfigService: | class ConfigService: | ||||||
| @@ -45,6 +44,3 @@ class ConfigService: | |||||||
|         self._config.add_configuration( |         self._config.add_configuration( | ||||||
|             f"{type(server_config).__name__}_{server_config.server.discord_id}", server_config |             f"{type(server_config).__name__}_{server_config.server.discord_id}", server_config | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|         permissions: PermissionServiceABC = self._services.get_service(PermissionServiceABC) |  | ||||||
|         permissions.on_ready() |  | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.abc" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.migration" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,6 +15,7 @@ CREATE TABLE IF NOT EXISTS `CFG_ServerHistory` | |||||||
|     `TeamChannelId`               BIGINT      NOT NULL, |     `TeamChannelId`               BIGINT      NOT NULL, | ||||||
|     `LoginMessageChannelId`       BIGINT      NOT NULL, |     `LoginMessageChannelId`       BIGINT      NOT NULL, | ||||||
|     `DefaultRoleId`               BIGINT      NULL, |     `DefaultRoleId`               BIGINT      NULL, | ||||||
|  |     `ShortRoleNameSetOnlyHighest` BOOLEAN     NOT NULL DEFAULT FALSE, | ||||||
|     `FeatureFlags`                JSON        NULL     DEFAULT ('{}'), |     `FeatureFlags`                JSON        NULL     DEFAULT ('{}'), | ||||||
|     `ServerId`                    BIGINT      NOT NULL, |     `ServerId`                    BIGINT      NOT NULL, | ||||||
|     `Deleted`                     BOOL                 DEFAULT FALSE, |     `Deleted`                     BOOL                 DEFAULT FALSE, | ||||||
| @@ -44,6 +45,7 @@ BEGIN | |||||||
|                                      `TeamChannelId`, |                                      `TeamChannelId`, | ||||||
|                                      `LoginMessageChannelId`, |                                      `LoginMessageChannelId`, | ||||||
|                                      `DefaultRoleId`, |                                      `DefaultRoleId`, | ||||||
|  |                                      `ShortRoleNameSetOnlyHighest`, | ||||||
|                                      `FeatureFlags`, |                                      `FeatureFlags`, | ||||||
|                                      `ServerId`, |                                      `ServerId`, | ||||||
|                                      `DateFrom`, |                                      `DateFrom`, | ||||||
| @@ -63,6 +65,7 @@ BEGIN | |||||||
|             OLD.TeamChannelId, |             OLD.TeamChannelId, | ||||||
|             OLD.LoginMessageChannelId, |             OLD.LoginMessageChannelId, | ||||||
|             OLD.DefaultRoleId, |             OLD.DefaultRoleId, | ||||||
|  |             OLD.ShortRoleNameSetOnlyHighest, | ||||||
|             OLD.FeatureFlags, |             OLD.FeatureFlags, | ||||||
|             OLD.ServerId, |             OLD.ServerId, | ||||||
|             OLD.LastModifiedAt, |             OLD.LastModifiedAt, | ||||||
| @@ -91,6 +94,7 @@ BEGIN | |||||||
|                                      `TeamChannelId`, |                                      `TeamChannelId`, | ||||||
|                                      `LoginMessageChannelId`, |                                      `LoginMessageChannelId`, | ||||||
|                                      `DefaultRoleId`, |                                      `DefaultRoleId`, | ||||||
|  |                                      `ShortRoleNameSetOnlyHighest`, | ||||||
|                                      `ServerId`, |                                      `ServerId`, | ||||||
|                                      `FeatureFlags`, |                                      `FeatureFlags`, | ||||||
|                                      `Deleted`, |                                      `Deleted`, | ||||||
| @@ -111,6 +115,7 @@ BEGIN | |||||||
|             OLD.TeamChannelId, |             OLD.TeamChannelId, | ||||||
|             OLD.LoginMessageChannelId, |             OLD.LoginMessageChannelId, | ||||||
|             OLD.DefaultRoleId, |             OLD.DefaultRoleId, | ||||||
|  |             OLD.ShortRoleNameSetOnlyHighest, | ||||||
|             OLD.FeatureFlags, |             OLD.FeatureFlags, | ||||||
|             OLD.ServerId, |             OLD.ServerId, | ||||||
|             TRUE, |             TRUE, | ||||||
|   | |||||||
| @@ -0,0 +1,51 @@ | |||||||
|  | from bot_core.logging.database_logger import DatabaseLogger | ||||||
|  | from bot_data.abc.migration_abc import MigrationABC | ||||||
|  | from bot_data.db_context import DBContext | ||||||
|  |  | ||||||
|  |  | ||||||
|  | class ShortRoleNameOnlyHighestMigration(MigrationABC): | ||||||
|  |     name = "1.1.9_ShortRoleNameOnlyHighestMigration" | ||||||
|  |  | ||||||
|  |     def __init__(self, logger: DatabaseLogger, db: DBContext): | ||||||
|  |         MigrationABC.__init__(self) | ||||||
|  |         self._logger = logger | ||||||
|  |         self._db = db | ||||||
|  |         self._cursor = db.cursor | ||||||
|  |  | ||||||
|  |     def upgrade(self): | ||||||
|  |         self._logger.debug(__name__, "Running upgrade") | ||||||
|  |  | ||||||
|  |         self._cursor.execute( | ||||||
|  |             str( | ||||||
|  |                 f""" | ||||||
|  |                     ALTER TABLE CFG_Server | ||||||
|  |                     ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; | ||||||
|  |                 """ | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |  | ||||||
|  |         self._cursor.execute( | ||||||
|  |             str( | ||||||
|  |                 f""" | ||||||
|  |                     ALTER TABLE CFG_ServerHistory | ||||||
|  |                     ADD ShortRoleNameSetOnlyHighest BOOLEAN NOT NULL DEFAULT FALSE AFTER DefaultRoleId; | ||||||
|  |                 """ | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |         self._exec(__file__, "config/server.sql") | ||||||
|  |  | ||||||
|  |     def downgrade(self): | ||||||
|  |         self._cursor.execute( | ||||||
|  |             str( | ||||||
|  |                 f""" | ||||||
|  |                     ALTER TABLE CFG_Server DROP COLUMN ShortRoleNameSetOnlyHighest; | ||||||
|  |                 """ | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
|  |         self._cursor.execute( | ||||||
|  |             str( | ||||||
|  |                 f""" | ||||||
|  |                     ALTER TABLE CFG_ServerHistory DROP COLUMN ShortRoleNameSetOnlyHighest; | ||||||
|  |                 """ | ||||||
|  |             ) | ||||||
|  |         ) | ||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.model" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -29,6 +29,7 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|         team_channel_id: int, |         team_channel_id: int, | ||||||
|         login_message_channel_id: int, |         login_message_channel_id: int, | ||||||
|         default_role_id: Optional[int], |         default_role_id: Optional[int], | ||||||
|  |         short_role_name_only_set_highest_role: bool, | ||||||
|         feature_flags: dict[FeatureFlagsEnum], |         feature_flags: dict[FeatureFlagsEnum], | ||||||
|         server: Server, |         server: Server, | ||||||
|         afk_channel_ids: List[int], |         afk_channel_ids: List[int], | ||||||
| @@ -52,6 +53,8 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|         self._team_channel_id = team_channel_id |         self._team_channel_id = team_channel_id | ||||||
|         self._login_message_channel_id = login_message_channel_id |         self._login_message_channel_id = login_message_channel_id | ||||||
|         self._default_role_id = default_role_id |         self._default_role_id = default_role_id | ||||||
|  |         self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role | ||||||
|  |  | ||||||
|         self._feature_flags = feature_flags |         self._feature_flags = feature_flags | ||||||
|         self._server = server |         self._server = server | ||||||
|         self._afk_channel_ids = afk_channel_ids |         self._afk_channel_ids = afk_channel_ids | ||||||
| @@ -78,6 +81,7 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|             guild.system_channel.id, |             guild.system_channel.id, | ||||||
|             guild.system_channel.id, |             guild.system_channel.id, | ||||||
|             None, |             None, | ||||||
|  |             False, | ||||||
|             {}, |             {}, | ||||||
|             server, |             server, | ||||||
|             List(int), |             List(int), | ||||||
| @@ -200,6 +204,14 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|     def default_role_id(self, value: int): |     def default_role_id(self, value: int): | ||||||
|         self._default_role_id = value |         self._default_role_id = value | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def short_role_name_only_set_highest_role(self) -> bool: | ||||||
|  |         return self._short_role_name_only_set_highest_role | ||||||
|  |  | ||||||
|  |     @short_role_name_only_set_highest_role.setter | ||||||
|  |     def short_role_name_only_set_highest_role(self, value: bool): | ||||||
|  |         self._short_role_name_only_set_highest_role = value | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def feature_flags(self) -> dict[FeatureFlagsEnum]: |     def feature_flags(self) -> dict[FeatureFlagsEnum]: | ||||||
|         return self._feature_flags |         return self._feature_flags | ||||||
| @@ -273,6 +285,7 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|                     `TeamChannelId`, |                     `TeamChannelId`, | ||||||
|                     `LoginMessageChannelId`, |                     `LoginMessageChannelId`, | ||||||
|                     `DefaultRoleId`, |                     `DefaultRoleId`, | ||||||
|  |                     `ShortRoleNameSetOnlyHighest`, | ||||||
|                     `FeatureFlags`, |                     `FeatureFlags`, | ||||||
|                     `ServerId` |                     `ServerId` | ||||||
|                 ) VALUES ( |                 ) VALUES ( | ||||||
| @@ -290,6 +303,7 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|                     {self._team_channel_id}, |                     {self._team_channel_id}, | ||||||
|                     {self._login_message_channel_id}, |                     {self._login_message_channel_id}, | ||||||
|                     {"NULL" if self._default_role_id is None else self._default_role_id}, |                     {"NULL" if self._default_role_id is None else self._default_role_id}, | ||||||
|  |                     {self._short_role_name_only_set_highest_role}, | ||||||
|                     '{json.dumps(self._feature_flags)}', |                     '{json.dumps(self._feature_flags)}', | ||||||
|                     {self._server.id} |                     {self._server.id} | ||||||
|                 ); |                 ); | ||||||
| @@ -315,6 +329,7 @@ class ServerConfig(TableABC, ConfigurationModelABC): | |||||||
|                 `TeamChannelId` = {self._team_channel_id}, |                 `TeamChannelId` = {self._team_channel_id}, | ||||||
|                 `LoginMessageChannelId` = {self._login_message_channel_id}, |                 `LoginMessageChannelId` = {self._login_message_channel_id}, | ||||||
|                 `DefaultRoleId` = {"NULL" if self._default_role_id is None else self._default_role_id}, |                 `DefaultRoleId` = {"NULL" if self._default_role_id is None else self._default_role_id}, | ||||||
|  |                 `ShortRoleNameSetOnlyHighest` = {self._short_role_name_only_set_highest_role}, | ||||||
|                 `FeatureFlags` = '{json.dumps(self._feature_flags)}', |                 `FeatureFlags` = '{json.dumps(self._feature_flags)}', | ||||||
|                 `ServerId` = {self._server.id} |                 `ServerId` = {self._server.id} | ||||||
|                 WHERE `Id` = {self._id}; |                 WHERE `Id` = {self._id}; | ||||||
|   | |||||||
| @@ -18,6 +18,7 @@ class ServerConfigHistory(HistoryTableABC): | |||||||
|         team_channel_id: int, |         team_channel_id: int, | ||||||
|         login_message_channel_id: int, |         login_message_channel_id: int, | ||||||
|         default_role_id: int, |         default_role_id: int, | ||||||
|  |         short_role_name_only_set_highest_role: bool, | ||||||
|         feature_flags: dict[str], |         feature_flags: dict[str], | ||||||
|         server_id: int, |         server_id: int, | ||||||
|         deleted: bool, |         deleted: bool, | ||||||
| @@ -42,6 +43,8 @@ class ServerConfigHistory(HistoryTableABC): | |||||||
|         self._team_channel_id = team_channel_id |         self._team_channel_id = team_channel_id | ||||||
|         self._login_message_channel_id = login_message_channel_id |         self._login_message_channel_id = login_message_channel_id | ||||||
|         self._default_role_id = default_role_id |         self._default_role_id = default_role_id | ||||||
|  |         self._short_role_name_only_set_highest_role = short_role_name_only_set_highest_role | ||||||
|  |  | ||||||
|         self._feature_flags = feature_flags |         self._feature_flags = feature_flags | ||||||
|         self._server_id = server_id |         self._server_id = server_id | ||||||
|  |  | ||||||
| @@ -105,6 +108,10 @@ class ServerConfigHistory(HistoryTableABC): | |||||||
|     def default_role_id(self) -> int: |     def default_role_id(self) -> int: | ||||||
|         return self._default_role_id |         return self._default_role_id | ||||||
|  |  | ||||||
|  |     @property | ||||||
|  |     def short_role_name_only_set_highest_role(self) -> bool: | ||||||
|  |         return self._short_role_name_only_set_highest_role | ||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def feature_flags(self) -> dict[str]: |     def feature_flags(self) -> dict[str]: | ||||||
|         return self._feature_flags |         return self._feature_flags | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_data.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -65,12 +65,13 @@ class ServerConfigRepositoryService(ServerConfigRepositoryABC): | |||||||
|             result[12], |             result[12], | ||||||
|             result[13], |             result[13], | ||||||
|             result[14], |             result[14], | ||||||
|             json.loads(result[15]), |             result[15], | ||||||
|             self._servers.get_server_by_id(result[16]), |             json.loads(result[16]), | ||||||
|             self._get_afk_channel_ids(result[16]), |             self._servers.get_server_by_id(result[17]), | ||||||
|             self._get_team_role_ids(result[16]), |             self._get_afk_channel_ids(result[17]), | ||||||
|             result[17], |             self._get_team_role_ids(result[17]), | ||||||
|             result[18], |             result[18], | ||||||
|  |             result[19], | ||||||
|             id=result[0], |             id=result[0], | ||||||
|         ) |         ) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.abc" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -1,6 +1,7 @@ | |||||||
| from typing import Callable | from typing import Callable | ||||||
|  |  | ||||||
| from ariadne import ObjectType | from ariadne import ObjectType | ||||||
|  | from cpl_core.configuration import ConfigurationABC | ||||||
| from cpl_core.dependency_injection import ServiceProviderABC | from cpl_core.dependency_injection import ServiceProviderABC | ||||||
| from cpl_core.type import T | from cpl_core.type import T | ||||||
| from cpl_discord.service import DiscordBotServiceABC | from cpl_discord.service import DiscordBotServiceABC | ||||||
| @@ -10,6 +11,7 @@ from bot_api.exception.service_error_code_enum import ServiceErrorCode | |||||||
| from bot_api.exception.service_exception import ServiceException | from bot_api.exception.service_exception import ServiceException | ||||||
| from bot_api.route.route import Route | from bot_api.route.route import Route | ||||||
| from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum | from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum | ||||||
|  | from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings | ||||||
| from bot_data.model.achievement import Achievement | from bot_data.model.achievement import Achievement | ||||||
| from bot_data.model.auth_role_enum import AuthRoleEnum | from bot_data.model.auth_role_enum import AuthRoleEnum | ||||||
| from bot_data.model.auth_user import AuthUser | from bot_data.model.auth_user import AuthUser | ||||||
| @@ -75,7 +77,12 @@ class QueryABC(ObjectType): | |||||||
|         def get_services(services: ServiceProviderABC) -> ServiceProviderABC: |         def get_services(services: ServiceProviderABC) -> ServiceProviderABC: | ||||||
|             return services |             return services | ||||||
|  |  | ||||||
|  |         @ServiceProviderABC.inject | ||||||
|  |         def get_config(config: ConfigurationABC) -> ConfigurationABC: | ||||||
|  |             return config | ||||||
|  |  | ||||||
|         services = get_services() |         services = get_services() | ||||||
|  |         config = get_config() | ||||||
|         permissions: PermissionService = services.get_service(PermissionService) |         permissions: PermissionService = services.get_service(PermissionService) | ||||||
|         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC) |         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC) | ||||||
|  |  | ||||||
| @@ -84,6 +91,13 @@ class QueryABC(ObjectType): | |||||||
|  |  | ||||||
|         for u in user.users: |         for u in user.users: | ||||||
|             guild = bot.get_guild(u.server.discord_id) |             guild = bot.get_guild(u.server.discord_id) | ||||||
|  |  | ||||||
|  |             settings: ServerConfig = config.get_configuration(f"ServerConfig_{guild.id}") | ||||||
|  |             if not FeatureFlagsSettings.get_flag_from_dict( | ||||||
|  |                 settings.feature_flags, FeatureFlagsEnum.technician_full_access | ||||||
|  |             ): | ||||||
|  |                 continue | ||||||
|  |  | ||||||
|             if permissions.is_member_technician(guild.get_member(u.discord_id)): |             if permissions.is_member_technician(guild.get_member(u.discord_id)): | ||||||
|                 return True |                 return True | ||||||
|  |  | ||||||
| @@ -216,23 +230,40 @@ class QueryABC(ObjectType): | |||||||
|  |  | ||||||
|     @ServiceProviderABC.inject |     @ServiceProviderABC.inject | ||||||
|     def _can_user_mutate_data(self, server: Server, permission: UserRoleEnum, services: ServiceProviderABC): |     def _can_user_mutate_data(self, server: Server, permission: UserRoleEnum, services: ServiceProviderABC): | ||||||
|  |         @ServiceProviderABC.inject | ||||||
|  |         def get_config(config: ConfigurationABC) -> ConfigurationABC: | ||||||
|  |             return config | ||||||
|  |  | ||||||
|  |         config = get_config() | ||||||
|         permissions: PermissionService = services.get_service(PermissionService) |         permissions: PermissionService = services.get_service(PermissionService) | ||||||
|         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC) |         bot: DiscordBotServiceABC = services.get_service(DiscordBotServiceABC) | ||||||
|  |  | ||||||
|         auth_user = Route.get_user() |         auth_user = Route.get_user() | ||||||
|         if auth_user == "system" or auth_user.auth_role == AuthRoleEnum.admin: |         if auth_user == "system": | ||||||
|             return |             return | ||||||
|  |  | ||||||
|         member = bot.get_guild(server.discord_id).get_member( |         member = bot.get_guild(server.discord_id).get_member( | ||||||
|             auth_user.users.where(lambda x: x.server.id == server.id).single().discord_id |             auth_user.users.where(lambda x: x.server.id == server.id).single().discord_id | ||||||
|         ) |         ) | ||||||
|  |         settings: ServerConfig = config.get_configuration(f"ServerConfig_{member.guild.id}") | ||||||
|  |         technician_full_access_flag = FeatureFlagsSettings.get_flag_from_dict( | ||||||
|  |             settings.feature_flags, FeatureFlagsEnum.technician_full_access | ||||||
|  |         ) | ||||||
|  |  | ||||||
|         check_perm = lambda x: True |         check_perm = lambda x: False | ||||||
|         match permission: |         match permission: | ||||||
|             case UserRoleEnum.moderator: |             case UserRoleEnum.moderator: | ||||||
|                 check_perm = lambda x: permissions.is_member_moderator(x) |                 check_perm = ( | ||||||
|  |                     lambda x: technician_full_access_flag | ||||||
|  |                     and permissions.is_member_technician(x) | ||||||
|  |                     or permissions.is_member_moderator(x) | ||||||
|  |                 ) | ||||||
|             case UserRoleEnum.admin: |             case UserRoleEnum.admin: | ||||||
|                 check_perm = lambda x: permissions.is_member_admin(x) |                 check_perm = ( | ||||||
|  |                     lambda x: technician_full_access_flag | ||||||
|  |                     and permissions.is_member_technician(x) | ||||||
|  |                     or permissions.is_member_admin(x) | ||||||
|  |                 ) | ||||||
|             case UserRoleEnum.technician: |             case UserRoleEnum.technician: | ||||||
|                 check_perm = lambda x: permissions.is_member_technician(x) |                 check_perm = lambda x: permissions.is_member_technician(x) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.filter" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -14,6 +14,7 @@ type ServerConfig implements TableWithHistoryQuery { | |||||||
|     teamChannelId: String |     teamChannelId: String | ||||||
|     loginMessageChannelId: String |     loginMessageChannelId: String | ||||||
|     defaultRoleId: String |     defaultRoleId: String | ||||||
|  |     shortRoleNameOnlySetHighestRole: Boolean | ||||||
|     featureFlagCount: Int |     featureFlagCount: Int | ||||||
|     featureFlags: [FeatureFlag] |     featureFlags: [FeatureFlag] | ||||||
|  |  | ||||||
| @@ -45,6 +46,7 @@ type ServerConfigHistory implements HistoryTableQuery { | |||||||
|     teamChannelId: String |     teamChannelId: String | ||||||
|     loginMessageChannelId: String |     loginMessageChannelId: String | ||||||
|     defaultRoleId: String |     defaultRoleId: String | ||||||
|  |     shortRoleNameOnlySetHighestRole: Boolean | ||||||
|     featureFlagCount: Int |     featureFlagCount: Int | ||||||
|     featureFlags: [FeatureFlag] |     featureFlags: [FeatureFlag] | ||||||
|  |  | ||||||
| @@ -94,6 +96,7 @@ input ServerConfigInput { | |||||||
|     teamChannelId: String |     teamChannelId: String | ||||||
|     loginMessageChannelId: String |     loginMessageChannelId: String | ||||||
|     defaultRoleId: String |     defaultRoleId: String | ||||||
|  |     shortRoleNameOnlySetHighestRole: Boolean | ||||||
|     featureFlags: [FeatureFlagInput] |     featureFlags: [FeatureFlagInput] | ||||||
|  |  | ||||||
|     afkChannelIds: [String] |     afkChannelIds: [String] | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.model" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.mutations" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -92,6 +92,11 @@ class ServerConfigMutation(QueryABC): | |||||||
|         server_config.default_role_id = ( |         server_config.default_role_id = ( | ||||||
|             input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id |             input["defaultRoleId"] if "defaultRoleId" in input else server_config.default_role_id | ||||||
|         ) |         ) | ||||||
|  |         server_config.short_role_name_only_set_highest_role = ( | ||||||
|  |             input["shortRoleNameOnlySetHighestRole"] | ||||||
|  |             if "shortRoleNameOnlySetHighestRole" in input | ||||||
|  |             else server_config.short_role_name_only_set_highest_role | ||||||
|  |         ) | ||||||
|         server_config.feature_flags = ( |         server_config.feature_flags = ( | ||||||
|             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]])) |             dict(zip([x["key"] for x in input["featureFlags"]], [x["value"] for x in input["featureFlags"]])) | ||||||
|             if "featureFlags" in input |             if "featureFlags" in input | ||||||
| @@ -178,4 +183,3 @@ class ServerConfigMutation(QueryABC): | |||||||
|             self._server_configs.add_server_team_role_id_config(role_id) |             self._server_configs.add_server_team_role_id_config(role_id) | ||||||
|  |  | ||||||
|         self._bot.loop.create_task(self._config_service.reload_server_config(new_config.server)) |         self._bot.loop.create_task(self._config_service.reload_server_config(new_config.server)) | ||||||
|         self._permissions.on_ready() |  | ||||||
|   | |||||||
| @@ -12,7 +12,6 @@ from bot_data.model.technician_id_config import TechnicianIdConfig | |||||||
| from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig | from bot_data.model.technician_ping_url_config import TechnicianPingUrlConfig | ||||||
| from bot_data.model.user_role_enum import UserRoleEnum | from bot_data.model.user_role_enum import UserRoleEnum | ||||||
| from bot_graphql.abc.query_abc import QueryABC | from bot_graphql.abc.query_abc import QueryABC | ||||||
| from modules.permission.abc.permission_service_abc import PermissionServiceABC |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class TechnicianConfigMutation(QueryABC): | class TechnicianConfigMutation(QueryABC): | ||||||
| @@ -23,7 +22,6 @@ class TechnicianConfigMutation(QueryABC): | |||||||
|         servers: ServerRepositoryABC, |         servers: ServerRepositoryABC, | ||||||
|         technician_configs: TechnicianConfigRepositoryABC, |         technician_configs: TechnicianConfigRepositoryABC, | ||||||
|         db: DatabaseContextABC, |         db: DatabaseContextABC, | ||||||
|         permissions: PermissionServiceABC, |  | ||||||
|         config_service: ConfigService, |         config_service: ConfigService, | ||||||
|     ): |     ): | ||||||
|         QueryABC.__init__(self, "TechnicianConfigMutation") |         QueryABC.__init__(self, "TechnicianConfigMutation") | ||||||
| @@ -33,7 +31,6 @@ class TechnicianConfigMutation(QueryABC): | |||||||
|         self._servers = servers |         self._servers = servers | ||||||
|         self._technician_configs = technician_configs |         self._technician_configs = technician_configs | ||||||
|         self._db = db |         self._db = db | ||||||
|         self._permissions = permissions |  | ||||||
|         self._config_service = config_service |         self._config_service = config_service | ||||||
|  |  | ||||||
|         self.set_field("updateTechnicianConfig", self.resolve_update_technician_config) |         self.set_field("updateTechnicianConfig", self.resolve_update_technician_config) | ||||||
| @@ -114,4 +111,3 @@ class TechnicianConfigMutation(QueryABC): | |||||||
|             self._technician_configs.add_technician_id_config(TechnicianIdConfig(technician_id)) |             self._technician_configs.add_technician_id_config(TechnicianIdConfig(technician_id)) | ||||||
|  |  | ||||||
|         self._bot.loop.create_task(self._config_service.reload_technician_config()) |         self._bot.loop.create_task(self._config_service.reload_technician_config()) | ||||||
|         self._permissions.on_ready() |  | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "bot_graphql.queries.discord" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -25,6 +25,9 @@ class ServerConfigQuery(DataQueryWithHistoryABC): | |||||||
|         self.set_field("teamChannelId", lambda config, *_: config.team_channel_id) |         self.set_field("teamChannelId", lambda config, *_: config.team_channel_id) | ||||||
|         self.set_field("loginMessageChannelId", lambda config, *_: config.login_message_channel_id) |         self.set_field("loginMessageChannelId", lambda config, *_: config.login_message_channel_id) | ||||||
|         self.set_field("defaultRoleId", lambda config, *_: config.default_role_id) |         self.set_field("defaultRoleId", lambda config, *_: config.default_role_id) | ||||||
|  |         self.set_field( | ||||||
|  |             "shortRoleNameOnlySetHighestRole", lambda config, *_: config.short_role_name_only_set_highest_role | ||||||
|  |         ) | ||||||
|         self.add_collection( |         self.add_collection( | ||||||
|             "featureFlag", |             "featureFlag", | ||||||
|             lambda config, *_: List(any, [{"key": x, "value": config.feature_flags[x]} for x in config.feature_flags]), |             lambda config, *_: List(any, [{"key": x, "value": config.feature_flags[x]} for x in config.feature_flags]), | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.commands" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.achievements.model" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.auto_role" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.command" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.auto_role.helper" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.command" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.forms" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.helper" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.model" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.base.thread" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.boot_log" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.config" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.config.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.config.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.database" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "Sven Heidemann", |     "Author": "Sven Heidemann", | ||||||
|     "AuthorEmail": "sven.heidemann@sh-edraft.de", |     "AuthorEmail": "sven.heidemann@sh-edraft.de", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.level" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.level.command" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.level.configuration" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.level.events" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.level.service" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.permission" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports: | # imports: | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ __title__ = "modules.permission.abc" | |||||||
| __author__ = "Sven Heidemann" | __author__ = "Sven Heidemann" | ||||||
| __license__ = "MIT" | __license__ = "MIT" | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" | ||||||
| __version__ = "1.1.8" | __version__ = "1.1.9" | ||||||
|  |  | ||||||
| from collections import namedtuple | from collections import namedtuple | ||||||
|  |  | ||||||
| @@ -23,4 +23,4 @@ from collections import namedtuple | |||||||
| # imports | # imports | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") | VersionInfo = namedtuple("VersionInfo", "major minor micro") | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") | version_info = VersionInfo(major="1", minor="1", micro="9") | ||||||
|   | |||||||
| @@ -8,42 +8,14 @@ class PermissionServiceABC(ABC): | |||||||
|     def __init__(self): |     def __init__(self): | ||||||
|         pass |         pass | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def on_ready(self): |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def on_member_update(self, before: discord.Member, after: discord.Member): |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def get_admin_role_ids(self, g_id: int) -> list[int]: |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def get_admin_roles(self, g_id: int) -> list[discord.Role]: |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |     @abstractmethod | ||||||
|     def get_admins(self, g_id: int) -> list[discord.Member]: |     def get_admins(self, g_id: int) -> list[discord.Member]: | ||||||
|         pass |         pass | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def get_moderator_role_ids(self, g_id: int) -> list[int]: |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def get_moderator_roles(self, g_id: int) -> list[discord.Role]: |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |     @abstractmethod | ||||||
|     def get_moderators(self, g_id: int) -> list[discord.Member]: |     def get_moderators(self, g_id: int) -> list[discord.Member]: | ||||||
|         pass |         pass | ||||||
|  |  | ||||||
|     @abstractmethod |  | ||||||
|     def get_technicians(self) -> list[discord.Member]: |  | ||||||
|         pass |  | ||||||
|  |  | ||||||
|     @abstractmethod |     @abstractmethod | ||||||
|     def is_member_admin(self, member: discord.Member) -> bool: |     def is_member_admin(self, member: discord.Member) -> bool: | ||||||
|         pass |         pass | ||||||
|   | |||||||
| @@ -1,26 +0,0 @@ | |||||||
| # -*- coding: utf-8 -*- |  | ||||||
|  |  | ||||||
| """ |  | ||||||
| bot sh-edraft.de Discord bot |  | ||||||
| ~~~~~~~~~~~~~~~~~~~ |  | ||||||
|  |  | ||||||
| Discord bot for customers of sh-edraft.de |  | ||||||
|  |  | ||||||
| :copyright: (c) 2022 - 2023 sh-edraft.de |  | ||||||
| :license: MIT, see LICENSE for more details. |  | ||||||
|  |  | ||||||
| """ |  | ||||||
|  |  | ||||||
| __title__ = "modules.permission.events" |  | ||||||
| __author__ = "Sven Heidemann" |  | ||||||
| __license__ = "MIT" |  | ||||||
| __copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de" |  | ||||||
| __version__ = "1.1.8" |  | ||||||
|  |  | ||||||
| from collections import namedtuple |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # imports: |  | ||||||
|  |  | ||||||
| VersionInfo = namedtuple("VersionInfo", "major minor micro") |  | ||||||
| version_info = VersionInfo(major="1", minor="1", micro="8") |  | ||||||
| @@ -1,30 +0,0 @@ | |||||||
| import discord |  | ||||||
| from cpl_core.configuration import ConfigurationABC |  | ||||||
| from cpl_core.logging import LoggerABC |  | ||||||
| from cpl_discord.events import OnMemberUpdateABC |  | ||||||
|  |  | ||||||
| from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum |  | ||||||
| from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings |  | ||||||
| from bot_data.model.server_config import ServerConfig |  | ||||||
| from modules.permission.abc.permission_service_abc import PermissionServiceABC |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class PermissionOnMemberUpdateEvent(OnMemberUpdateABC): |  | ||||||
|     def __init__(self, config: ConfigurationABC, logger: LoggerABC, permission_service: PermissionServiceABC): |  | ||||||
|         OnMemberUpdateABC.__init__(self) |  | ||||||
|         self._config = config |  | ||||||
|         self._logger = logger |  | ||||||
|         self._permission_service = permission_service |  | ||||||
|  |  | ||||||
|     async def on_member_update(self, before: discord.Member, after: discord.Member): |  | ||||||
|         if before.guild is not None: |  | ||||||
|             server_config: ServerConfig = self._config.get_configuration(f"ServerConfig_{before.guild.id}") |  | ||||||
|             if not FeatureFlagsSettings.get_flag_from_dict( |  | ||||||
|                 server_config.feature_flags, FeatureFlagsEnum.permission_module |  | ||||||
|             ): |  | ||||||
|                 return |  | ||||||
|  |  | ||||||
|         self._logger.debug(__name__, f"Module {type(self)} started") |  | ||||||
|  |  | ||||||
|         if before.roles != after.roles: |  | ||||||
|             self._permission_service.on_member_update(before, after) |  | ||||||
| @@ -1,22 +0,0 @@ | |||||||
| from cpl_core.logging import LoggerABC |  | ||||||
| from cpl_discord.events import OnReadyABC |  | ||||||
|  |  | ||||||
| from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum |  | ||||||
| from bot_core.configuration.feature_flags_settings import FeatureFlagsSettings |  | ||||||
| from bot_data.model.technician_config import TechnicianConfig |  | ||||||
| from modules.permission.abc.permission_service_abc import PermissionServiceABC |  | ||||||
|  |  | ||||||
|  |  | ||||||
| class PermissionOnReadyEvent(OnReadyABC): |  | ||||||
|     def __init__(self, logger: LoggerABC, permission_service: PermissionServiceABC, tech_config: TechnicianConfig): |  | ||||||
|         OnReadyABC.__init__(self) |  | ||||||
|         self._logger = logger |  | ||||||
|         self._permission_service = permission_service |  | ||||||
|         self._tech_config = tech_config |  | ||||||
|  |  | ||||||
|     async def on_ready(self): |  | ||||||
|         if not FeatureFlagsSettings.get_flag_from_dict( |  | ||||||
|             self._tech_config.feature_flags, FeatureFlagsEnum.permission_module |  | ||||||
|         ): |  | ||||||
|             return |  | ||||||
|         self._permission_service.on_ready() |  | ||||||
| @@ -4,7 +4,7 @@ | |||||||
|     "Version": { |     "Version": { | ||||||
|       "Major": "1", |       "Major": "1", | ||||||
|       "Minor": "1", |       "Minor": "1", | ||||||
|       "Micro": "8" |       "Micro": "9" | ||||||
|     }, |     }, | ||||||
|     "Author": "", |     "Author": "", | ||||||
|     "AuthorEmail": "", |     "AuthorEmail": "", | ||||||
|   | |||||||
| @@ -1,16 +1,11 @@ | |||||||
| from cpl_core.configuration import ConfigurationABC | from cpl_core.configuration import ConfigurationABC | ||||||
| from cpl_core.dependency_injection import ServiceCollectionABC | from cpl_core.dependency_injection import ServiceCollectionABC | ||||||
| from cpl_core.environment import ApplicationEnvironmentABC | from cpl_core.environment import ApplicationEnvironmentABC | ||||||
| from cpl_discord.discord_event_types_enum import DiscordEventTypesEnum |  | ||||||
| from cpl_discord.service.discord_collection_abc import DiscordCollectionABC | from cpl_discord.service.discord_collection_abc import DiscordCollectionABC | ||||||
|  |  | ||||||
| from bot_core.abc.module_abc import ModuleABC | from bot_core.abc.module_abc import ModuleABC | ||||||
| from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum | from bot_core.configuration.feature_flags_enum import FeatureFlagsEnum | ||||||
| from modules.permission.abc.permission_service_abc import PermissionServiceABC | from modules.permission.abc.permission_service_abc import PermissionServiceABC | ||||||
| from modules.permission.events.permission_on_member_update_event import ( |  | ||||||
|     PermissionOnMemberUpdateEvent, |  | ||||||
| ) |  | ||||||
| from modules.permission.events.permission_on_ready_event import PermissionOnReadyEvent |  | ||||||
| from modules.permission.service.permission_service import PermissionService | from modules.permission.service.permission_service import PermissionService | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -25,5 +20,3 @@ class PermissionModule(ModuleABC): | |||||||
|         services.add_singleton(PermissionServiceABC, PermissionService) |         services.add_singleton(PermissionServiceABC, PermissionService) | ||||||
|         # commands |         # commands | ||||||
|         # events |         # events | ||||||
|         self._dc.add_event(DiscordEventTypesEnum.on_ready.value, PermissionOnReadyEvent) |  | ||||||
|         self._dc.add_event(DiscordEventTypesEnum.on_member_update.value, PermissionOnMemberUpdateEvent) |  | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user