From 762e85d062ec205348bc1ed62ea4a1cd783a3a73 Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Thu, 10 Nov 2022 07:34:03 +0100 Subject: [PATCH] Removed configs --- .gitmodules | 6 + kdb-bot/LICENSE | 9 ++ kdb-bot/README.md | 2 + kdb-bot/src/bot/config | 1 + .../src/bot/config/appsettings.PC-Nick.json | 86 ------------- .../bot/config/appsettings.development.json | 100 --------------- .../bot/config/appsettings.edrafts-lapi.json | 97 -------------- .../bot/config/appsettings.edrafts-pc.json | 97 -------------- .../src/bot/config/appsettings.example.json | 18 --- kdb-bot/src/bot/config/appsettings.json | 34 ----- .../bot/config/appsettings.production.json | 120 ------------------ .../src/bot/config/appsettings.staging.json | 96 -------------- kdb-bot/src/bot/config/feature-flags.json | 16 --- kdb-bot/src/bot_api/config | 1 + .../config/apisettings.development.json | 33 ----- .../config/apisettings.edrafts-lapi.json | 28 ---- .../config/apisettings.edrafts-pc.json | 27 ---- kdb-bot/src/bot_api/config/apisettings.json | 1 - .../config/apisettings.production.json | 33 ----- .../bot_api/config/apisettings.staging.json | 33 ----- .../bot_api/config/appsettings.PC-Nick.json | 1 - 21 files changed, 19 insertions(+), 820 deletions(-) create mode 100644 .gitmodules create mode 100644 kdb-bot/LICENSE create mode 100644 kdb-bot/README.md create mode 160000 kdb-bot/src/bot/config delete mode 100644 kdb-bot/src/bot/config/appsettings.PC-Nick.json delete mode 100644 kdb-bot/src/bot/config/appsettings.development.json delete mode 100644 kdb-bot/src/bot/config/appsettings.edrafts-lapi.json delete mode 100644 kdb-bot/src/bot/config/appsettings.edrafts-pc.json delete mode 100644 kdb-bot/src/bot/config/appsettings.example.json delete mode 100644 kdb-bot/src/bot/config/appsettings.json delete mode 100644 kdb-bot/src/bot/config/appsettings.production.json delete mode 100644 kdb-bot/src/bot/config/appsettings.staging.json delete mode 100644 kdb-bot/src/bot/config/feature-flags.json create mode 160000 kdb-bot/src/bot_api/config delete mode 100644 kdb-bot/src/bot_api/config/apisettings.development.json delete mode 100644 kdb-bot/src/bot_api/config/apisettings.edrafts-lapi.json delete mode 100644 kdb-bot/src/bot_api/config/apisettings.edrafts-pc.json delete mode 100644 kdb-bot/src/bot_api/config/apisettings.json delete mode 100644 kdb-bot/src/bot_api/config/apisettings.production.json delete mode 100644 kdb-bot/src/bot_api/config/apisettings.staging.json delete mode 100644 kdb-bot/src/bot_api/config/appsettings.PC-Nick.json diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..1b416f6089 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "kdb-bot/src/bot/config"] + path = kdb-bot/src/bot/config + url = https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot.config.git +[submodule "kdb-bot/src/bot_api/config"] + path = kdb-bot/src/bot_api/config + url = https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot.api.config.git diff --git a/kdb-bot/LICENSE b/kdb-bot/LICENSE new file mode 100644 index 0000000000..374f2e3a0a --- /dev/null +++ b/kdb-bot/LICENSE @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2022-2023 sh-edraft.de + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/kdb-bot/README.md b/kdb-bot/README.md new file mode 100644 index 0000000000..72b3dd3329 --- /dev/null +++ b/kdb-bot/README.md @@ -0,0 +1,2 @@ +# kd_discord_bot + diff --git a/kdb-bot/src/bot/config b/kdb-bot/src/bot/config new file mode 160000 index 0000000000..fb3afa7e74 --- /dev/null +++ b/kdb-bot/src/bot/config @@ -0,0 +1 @@ +Subproject commit fb3afa7e74da374270843eae1850ff6b60819600 diff --git a/kdb-bot/src/bot/config/appsettings.PC-Nick.json b/kdb-bot/src/bot/config/appsettings.PC-Nick.json deleted file mode 100644 index d296c19c2a..0000000000 --- a/kdb-bot/src/bot/config/appsettings.PC-Nick.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/", - "Filename": "bot.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "BotLoggingSettings": { - "Command": { - "Path": "logs/", - "Filename": "commands.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Database": { - "Path": "logs/", - "Filename": "database.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Message": { - "Path": "logs/", - "Filename": "message.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - } - }, - "DatabaseSettings": { - "Host": "localhost", - "User": "root", - "Password": "MTAwNjE5OTdOaWNrLko=", - "Database": "kd_kdb", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "DiscordBot": { - "Token": "MTAyOTgxMjE0Mjk4NTE5MTYxNA.G4ArAJ.sZh6pE-mwO2qDAr1mfHEoo7EwbJb-TZT8h6nGg", - "Prefix": "!kn " - }, - "Bot": { - "910199451145076828": { - "MessageDeleteTimer": 2 - }, - "Technicians": [ - 240160344557879316 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - } - }, - "BootLog": { - "910199451145076828": { - "LoginMessageChannelId": "910199452915093588" - } - }, - "Permission": { - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} diff --git a/kdb-bot/src/bot/config/appsettings.development.json b/kdb-bot/src/bot/config/appsettings.development.json deleted file mode 100644 index a69ebd747b..0000000000 --- a/kdb-bot/src/bot/config/appsettings.development.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/$date_now/", - "Filename": "bot.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "BotLoggingSettings": { - "Api": { - "Path": "logs/$date_now/", - "Filename": "api.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "Command": { - "Path": "logs/$date_now/", - "Filename": "commands.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "Database": { - "Path": "logs/$date_now/", - "Filename": "database.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Message": { - "Path": "logs/$date_now/", - "Filename": "message.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - } - }, - "DiscordBot": { - "Token": "OTk4MTU5NjczODkzMDYwNzM4.GN3QyA.yvWO6L7Eu36gXQ7ARDs0Jg2J1VqIDnHLou5lT4", - "Prefix": "!kd " - }, - "Translation": { - "DefaultLanguage": "de", - "Languages": [ - "de" - ] - }, - "DatabaseSettings": { - "Host": "kdb_db_dev_1", - "User": "kd_kdb", - "Password": "IXc1RF8mc3RlQ2VqZmpxfmJ7MF9EUEBlOsKnWDI/SlV6", - "Database": "kd_kdb", - "Port": "3306", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "Bot": { - "910199451145076828": { - "MessageDeleteTimer": 4 - }, - "Technicians": [ - 240160344557879316, - 236592458664902657 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - } - }, - "BootLog": { - "910199451145076828": { - "LoginMessageChannelId": "910199452915093588" - } - }, - "Permission": { - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot/config/appsettings.edrafts-lapi.json b/kdb-bot/src/bot/config/appsettings.edrafts-lapi.json deleted file mode 100644 index e912b14863..0000000000 --- a/kdb-bot/src/bot/config/appsettings.edrafts-lapi.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/", - "Filename": "bot.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "BotLoggingSettings": { - "Api": { - "Path": "logs/", - "Filename": "api.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "Command": { - "Path": "logs/", - "Filename": "commands.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Database": { - "Path": "logs/", - "Filename": "database.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Message": { - "Path": "logs/", - "Filename": "message.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - } - }, - "DatabaseSettings": { - "Host": "localhost", - "User": "kd_kdb", - "Password": "VGpZcihrb0N2T2MyZUlURQ==", - "Database": "keksdose_bot_dev", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "DiscordBot": { - "Token": "OTk4MTYwNDI3Njg5MTgxMjM3.GI7h67.BqD6Lu1Tz0MuG8iktYrcLnHi1pNozyMiWFGTKI", - "Prefix": "!ke " - }, - "Bot": { - "910199451145076828": { - "MessageDeleteTimer": 2 - }, - "Technicians": [ - 240160344557879316 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - } - }, - "BootLog": { - "910199451145076828": { - "LoginMessageChannelId": 910199452915093588 - } - }, - "Level": { - "910199451145076828": { - "ChangedLevelNotificationChannelId": 910199452667637892 - } - }, - "Permission": { - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} diff --git a/kdb-bot/src/bot/config/appsettings.edrafts-pc.json b/kdb-bot/src/bot/config/appsettings.edrafts-pc.json deleted file mode 100644 index e912b14863..0000000000 --- a/kdb-bot/src/bot/config/appsettings.edrafts-pc.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/", - "Filename": "bot.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "BotLoggingSettings": { - "Api": { - "Path": "logs/", - "Filename": "api.log", - "ConsoleLogLevel": "TRACE", - "FileLogLevel": "TRACE" - }, - "Command": { - "Path": "logs/", - "Filename": "commands.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Database": { - "Path": "logs/", - "Filename": "database.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - }, - "Message": { - "Path": "logs/", - "Filename": "message.log", - "ConsoleLogLevel": "DEBUG", - "FileLogLevel": "TRACE" - } - }, - "DatabaseSettings": { - "Host": "localhost", - "User": "kd_kdb", - "Password": "VGpZcihrb0N2T2MyZUlURQ==", - "Database": "keksdose_bot_dev", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "DiscordBot": { - "Token": "OTk4MTYwNDI3Njg5MTgxMjM3.GI7h67.BqD6Lu1Tz0MuG8iktYrcLnHi1pNozyMiWFGTKI", - "Prefix": "!ke " - }, - "Bot": { - "910199451145076828": { - "MessageDeleteTimer": 2 - }, - "Technicians": [ - 240160344557879316 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - } - }, - "BootLog": { - "910199451145076828": { - "LoginMessageChannelId": 910199452915093588 - } - }, - "Level": { - "910199451145076828": { - "ChangedLevelNotificationChannelId": 910199452667637892 - } - }, - "Permission": { - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} diff --git a/kdb-bot/src/bot/config/appsettings.example.json b/kdb-bot/src/bot/config/appsettings.example.json deleted file mode 100644 index 4242ee4032..0000000000 --- a/kdb-bot/src/bot/config/appsettings.example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/", - "Filename": "log_$start_time.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "WARN" - }, - "DiscordBot": { - "Token": "", - "Prefix": "! " - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot/config/appsettings.json b/kdb-bot/src/bot/config/appsettings.json deleted file mode 100644 index 643f38ab40..0000000000 --- a/kdb-bot/src/bot/config/appsettings.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/$date_now/", - "Filename": "bot.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "WARN" - }, - "BotLoggingSettings": { - "Command": { - "Path": "logs/$date_now/", - "Filename": "commands.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "WARN" - }, - "Database": { - "Path": "logs/$date_now/", - "Filename": "database.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "WARN" - }, - "Message": { - "Path": "logs/$date_now/", - "Filename": "message.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "WARN" - } - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot/config/appsettings.production.json b/kdb-bot/src/bot/config/appsettings.production.json deleted file mode 100644 index 0b1ba8c63d..0000000000 --- a/kdb-bot/src/bot/config/appsettings.production.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/$date_now/", - "Filename": "bot.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "INFO" - }, - "BotLoggingSettings": { - "Api": { - "Path": "logs/$date_now/", - "Filename": "api.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "INFO" - }, - "Command": { - "Path": "logs/$date_now/", - "Filename": "commands.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "INFO" - }, - "Database": { - "Path": "logs/$date_now/", - "Filename": "database.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "INFO" - }, - "Message": { - "Path": "logs/$date_now/", - "Filename": "message.log", - "ConsoleLogLevel": "ERROR", - "FileLogLevel": "INFO" - } - }, - "Translation": { - "DefaultLanguage": "de", - "Languages": [ - "de" - ] - }, - "DatabaseSettings": { - "Host": "kdb_db_prod_1", - "User": "kd_kdb", - "Password": "Kz1nan0ow4RFYlJHNl9TJsO2fcO8PnphTlQ9ckV7X35tPHk=", - "Database": "kd_kdb", - "Port": "3306", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "Bot": { - "650366049023295514": { - "MessageDeleteTimer": 2 - }, - "910199451145076828": { - "MessageDeleteTimer": 2 - }, - "Technicians": [ - 240160344557879316, - 236592458664902657 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "650366049023295514": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 784530469290246145 - ], - "AFKCommandChannelId": 784530469290246145, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - }, - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://docs.sh-edraft.de/kdb/" - } - }, - "BootLog": { - "650366049023295514": { - "LoginMessageChannelId": "998544927094997093" - }, - "910199451145076828": { - "LoginMessageChannelId": "910199452915093588" - } - }, - "Permission": { - "650366049023295514": { - "AdminRoleIds": [ - 666129320481128479 - ], - "ModeratorRoleIds": [ - 998161580669804565 - ] - }, - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot/config/appsettings.staging.json b/kdb-bot/src/bot/config/appsettings.staging.json deleted file mode 100644 index d467b0da47..0000000000 --- a/kdb-bot/src/bot/config/appsettings.staging.json +++ /dev/null @@ -1,96 +0,0 @@ -{ - "TimeFormatSettings": { - "DateFormat": "%Y-%m-%d", - "TimeFormat": "%H:%M:%S", - "DateTimeFormat": "%Y-%m-%d %H:%M:%S.%f", - "DateTimeLogFormat": "%Y-%m-%d_%H-%M-%S" - }, - "LoggingSettings": { - "Path": "logs/$date_now/", - "Filename": "bot.log", - "ConsoleLogLevel": "INFO", - "FileLogLevel": "DEBUG" - }, - "BotLoggingSettings": { - "Api": { - "Path": "logs/$date_now/", - "Filename": "api.log", - "ConsoleLogLevel": "INFO", - "FileLogLevel": "DEBUG" - }, - "Command": { - "Path": "logs/$date_now/", - "Filename": "commands.log", - "ConsoleLogLevel": "INFO", - "FileLogLevel": "DEBUG" - }, - "Database": { - "Path": "logs/$date_now/", - "Filename": "database.log", - "ConsoleLogLevel": "INFO", - "FileLogLevel": "DEBUG" - }, - "Message": { - "Path": "logs/$date_now/", - "Filename": "message.log", - "ConsoleLogLevel": "INFO", - "FileLogLevel": "DEBUG" - } - }, - "Translation": { - "DefaultLanguage": "de", - "Languages": [ - "de" - ] - }, - "DatabaseSettings": { - "Host": "kdb_db_staging_1", - "User": "kd_kdb", - "Password": "MyZZd1ZNQ3fDvGI9TFV0N0LCp8OWc1k/S3J+WFJ0RCMmJmY=", - "Database": "kd_kdb", - "Port": "3306", - "Charset": "utf8mb4", - "UseUnicode": "true", - "Buffered": "true", - "AuthPlugin": "mysql_native_password" - }, - "Bot": { - "910199451145076828": { - "MessageDeleteTimer": 4 - }, - "Technicians": [ - 240160344557879316, - 236592458664902657 - ], - "WaitForRestart": 4, - "WaitForShutdown": 4 - }, - "Base": { - "910199451145076828": { - "MaxVoiceStateHours": 24, - "XpPerMessage": 2, - "XpPerOntimeHour": 4, - "AFKChannelIds": [ - 910199452915093593, - 910199452915093594 - ], - "AFKCommandChannelId": 910199452915093594, - "HelpCommandReferenceUrl": "https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot/wiki/Befehle" - } - }, - "BootLog": { - "910199451145076828": { - "LoginMessageChannelId": "910199452915093588" - } - }, - "Permission": { - "910199451145076828": { - "AdminRoleIds": [ - 925072155203477584 - ], - "ModeratorRoleIds": [ - 925072209884635167 - ] - } - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot/config/feature-flags.json b/kdb-bot/src/bot/config/feature-flags.json deleted file mode 100644 index da07fa2398..0000000000 --- a/kdb-bot/src/bot/config/feature-flags.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "FeatureFlags": { - "ApiModule": false, - "AdminModule": true, - "AutoRoleModule": true, - "BaseModule": true, - "BootLogModule": true, - "CoreModule": true, - "CoreExtensionModule": true, - "DatabaseModule": true, - "ModeratorModule": true, - "LevelModule": true, - "PermissionModule": true, - "PresenceModule": true - } -} diff --git a/kdb-bot/src/bot_api/config b/kdb-bot/src/bot_api/config new file mode 160000 index 0000000000..90197e75e5 --- /dev/null +++ b/kdb-bot/src/bot_api/config @@ -0,0 +1 @@ +Subproject commit 90197e75e535a74caee41b4f39fd459ffb1891b5 diff --git a/kdb-bot/src/bot_api/config/apisettings.development.json b/kdb-bot/src/bot_api/config/apisettings.development.json deleted file mode 100644 index 41cb1f577c..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.development.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "Api": { - "Port": 80, - "Host": "0.0.0.0", - "RedirectToHTTPS": false - }, - "Authentication": { - "SecretKey": "RjNiNUxEeisjSnZ6Zz1XIUBnc2EleHNG", - "Issuer": "http://localhost:8044", - "Audience": "http://localhost:8043", - "TokenExpireTime": 1, - "RefreshTokenExpireTime": 7 - }, - "DiscordAuthentication": { - "ClientSecret": "cmhqYmF4MXBCd2IzeEZoSXRZQ29vY3NwUWwxQzFTZng=", - "RedirectURL": "http://localhost:8043/auth/register", - "Scope": [ - "identify", - "email" - ], - "TokenURL": "https://discordapp.com/api/oauth2/token", - "AuthURL": "https://discordapp.com/api/oauth2/authorize" - }, - "Frontend": { - "URL": "http://localhost:8043/" - }, - "EMailClientSettings": { - "Host": "mail.sh-edraft.de", - "Port": "587", - "UserName": "dev-srv@sh-edraft.de", - "Credentials": "RmBOQX1eNFYiYjgsSid3fV1nelc2WA==" - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/apisettings.edrafts-lapi.json b/kdb-bot/src/bot_api/config/apisettings.edrafts-lapi.json deleted file mode 100644 index f122db51e2..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.edrafts-lapi.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "Api": { - "Port": 5000, - "Host": "0.0.0.0", - "RedirectToHTTPS": false - }, - "Authentication": { - "SecretKey": "RjNiNUxEeisjSnZ6Zz1XIUBnc2EleHNG", - "Issuer": "http://localhost:5000", - "Audience": "http://localhost:4200", - "TokenExpireTime": 1, - "RefreshTokenExpireTime": 7 - }, - "DiscordAuthentication": { - "ClientSecret": "V3FTb3JYVFBiVktEeHZxdWJDWW4xcnBCbXRwdmpwcy0=", - "_RedirectURL": "http://localhost:5000/api/auth/discord/register", - "RedirectURL": "http://localhost:4200/auth/register", - "Scope": [ - "identify", - "email" - ], - "TokenURL": "https://discordapp.com/api/oauth2/token", - "AuthURL": "https://discordapp.com/api/oauth2/authorize" - }, - "Frontend": { - "URL": "http://localhost:4200/" - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/apisettings.edrafts-pc.json b/kdb-bot/src/bot_api/config/apisettings.edrafts-pc.json deleted file mode 100644 index 100812aa12..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.edrafts-pc.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "Api": { - "Port": 8044, - "Host": "0.0.0.0", - "RedirectToHTTPS": false - }, - "Authentication": { - "SecretKey": "RjNiNUxEeisjSnZ6Zz1XIUBnc2EleHNG", - "Issuer": "http://localhost:8084", - "Audience": "http://localhost:4200", - "TokenExpireTime": 1, - "RefreshTokenExpireTime": 7 - }, - "DiscordAuthentication": { - "ClientSecret": "V3FTb3JYVFBiVktEeHZxdWJDWW4xcnBCbXRwdmpwcy0=", - "RedirectURL": "http://localhost:4200/auth/register", - "Scope": [ - "identify", - "email" - ], - "TokenURL": "https://discordapp.com/api/oauth2/token", - "AuthURL": "https://discordapp.com/api/oauth2/authorize" - }, - "Frontend": { - "URL": "http://localhost:4200/" - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/apisettings.json b/kdb-bot/src/bot_api/config/apisettings.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/apisettings.production.json b/kdb-bot/src/bot_api/config/apisettings.production.json deleted file mode 100644 index 5eb0107f91..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.production.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "Api": { - "Port": 80, - "Host": "0.0.0.0", - "RedirectToHTTPS": false - }, - "Authentication": { - "SecretKey": "cEwzW2BdcWxGLTBdPClJImNIbDFJXjVsPGw=", - "Issuer": "https://kdb.keksdose-gaming.de/", - "Audience": "https://kdb.keksdose-gaming.de/", - "TokenExpireTime": 1, - "RefreshTokenExpireTime": 7 - }, - "DiscordAuthentication": { - "ClientSecret": "SXpIOGY4ZzhWVEljOXJwSk5QcVpNU0lmRDNTb2c1Vk8=", - "RedirectURL": "https://kdb.keksdose-gaming.de/auth/register", - "Scope": [ - "identify", - "email" - ], - "TokenURL": "https://discordapp.com/api/oauth2/token", - "AuthURL": "https://discordapp.com/api/oauth2/authorize" - }, - "Frontend": { - "URL": "https://kdb.keksdose-gaming.de/" - }, - "EMailClientSettings": { - "Host": "mail.sh-edraft.de", - "Port": "587", - "UserName": "kruemmelmonster@sh-edraft.de", - "Credentials": "YjAwT3tPSVspezdadExdOEkoV3M3XiNb" - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/apisettings.staging.json b/kdb-bot/src/bot_api/config/apisettings.staging.json deleted file mode 100644 index 5ce66fc330..0000000000 --- a/kdb-bot/src/bot_api/config/apisettings.staging.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "Api": { - "Port": 80, - "Host": "0.0.0.0", - "RedirectToHTTPS": false - }, - "Authentication": { - "SecretKey": "Kj87RjklLUM1MytsUjtbcCswRidBV2VdMXU=", - "Issuer": "https://kdb-test.keksdose-gaming.de/", - "Audience": "https://kdb-test.keksdose-gaming.de/", - "TokenExpireTime": 1, - "RefreshTokenExpireTime": 7 - }, - "DiscordAuthentication": { - "ClientSecret": "VVdRZTg1SnFxUExCNmhzU1RZY05mTHV5TmVaV0NkUmc=", - "RedirectURL": "https://kdb-test.keksdose-gaming.de/auth/register", - "Scope": [ - "identify", - "email" - ], - "TokenURL": "https://discordapp.com/api/oauth2/token", - "AuthURL": "https://discordapp.com/api/oauth2/authorize" - }, - "Frontend": { - "URL": "https://kdb-test.keksdose-gaming.de/" - }, - "EMailClientSettings": { - "Host": "mail.sh-edraft.de", - "Port": "587", - "UserName": "kruemmelmonster@sh-edraft.de", - "Credentials": "YjAwT3tPSVspezdadExdOEkoV3M3XiNb" - } -} \ No newline at end of file diff --git a/kdb-bot/src/bot_api/config/appsettings.PC-Nick.json b/kdb-bot/src/bot_api/config/appsettings.PC-Nick.json deleted file mode 100644 index 9e26dfeeb6..0000000000 --- a/kdb-bot/src/bot_api/config/appsettings.PC-Nick.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file