Commit Graph

559 Commits

Author SHA1 Message Date
35d161c080 Removed obsolete fix 2023-03-20 14:40:56 +01:00
818163cbed Formatted tools 2023-03-20 14:39:23 +01:00
468ebb5f79 Merge branch 'master' into 1.0.0-fix
# Conflicts:
#	kdb-bot/src/bot/__init__.py
#	kdb-bot/src/bot/bot.json
#	kdb-bot/src/bot/config
#	kdb-bot/src/bot/extension/__init__.py
#	kdb-bot/src/bot_api/__init__.py
#	kdb-bot/src/bot_api/abc/__init__.py
#	kdb-bot/src/bot_api/bot-api.json
#	kdb-bot/src/bot_api/configuration/__init__.py
#	kdb-bot/src/bot_api/controller/__init__.py
#	kdb-bot/src/bot_api/event/__init__.py
#	kdb-bot/src/bot_api/exception/__init__.py
#	kdb-bot/src/bot_api/filter/__init__.py
#	kdb-bot/src/bot_api/filter/discord/__init__.py
#	kdb-bot/src/bot_api/logging/__init__.py
#	kdb-bot/src/bot_api/model/__init__.py
#	kdb-bot/src/bot_api/model/discord/__init__.py
#	kdb-bot/src/bot_api/route/__init__.py
#	kdb-bot/src/bot_api/service/__init__.py
#	kdb-bot/src/bot_api/transformer/__init__.py
#	kdb-bot/src/bot_core/__init__.py
#	kdb-bot/src/bot_core/abc/__init__.py
#	kdb-bot/src/bot_core/bot-core.json
#	kdb-bot/src/bot_core/configuration/__init__.py
#	kdb-bot/src/bot_core/core_extension/__init__.py
#	kdb-bot/src/bot_core/events/__init__.py
#	kdb-bot/src/bot_core/exception/__init__.py
#	kdb-bot/src/bot_core/helper/__init__.py
#	kdb-bot/src/bot_core/logging/__init__.py
#	kdb-bot/src/bot_core/pipes/__init__.py
#	kdb-bot/src/bot_core/service/__init__.py
#	kdb-bot/src/bot_data/__init__.py
#	kdb-bot/src/bot_data/abc/__init__.py
#	kdb-bot/src/bot_data/bot-data.json
#	kdb-bot/src/bot_data/migration/__init__.py
#	kdb-bot/src/bot_data/model/__init__.py
#	kdb-bot/src/bot_data/service/__init__.py
#	kdb-bot/src/bot_graphql/__init__.py
#	kdb-bot/src/bot_graphql/abc/__init__.py
#	kdb-bot/src/bot_graphql/filter/__init__.py
#	kdb-bot/src/bot_graphql/mutations/__init__.py
#	kdb-bot/src/modules/auto_role/__init__.py
#	kdb-bot/src/modules/auto_role/auto-role.json
#	kdb-bot/src/modules/auto_role/command/__init__.py
#	kdb-bot/src/modules/auto_role/events/__init__.py
#	kdb-bot/src/modules/auto_role/helper/__init__.py
#	kdb-bot/src/modules/base/__init__.py
#	kdb-bot/src/modules/base/abc/__init__.py
#	kdb-bot/src/modules/base/base.json
#	kdb-bot/src/modules/base/command/__init__.py
#	kdb-bot/src/modules/base/configuration/__init__.py
#	kdb-bot/src/modules/base/events/__init__.py
#	kdb-bot/src/modules/base/events/base_on_voice_state_update_event.py
#	kdb-bot/src/modules/base/helper/__init__.py
#	kdb-bot/src/modules/base/model/__init__.py
#	kdb-bot/src/modules/base/service/__init__.py
#	kdb-bot/src/modules/base/thread/__init__.py
#	kdb-bot/src/modules/boot_log/__init__.py
#	kdb-bot/src/modules/boot_log/boot-log.json
#	kdb-bot/src/modules/boot_log/configuration/__init__.py
#	kdb-bot/src/modules/database/__init__.py
#	kdb-bot/src/modules/database/database.json
#	kdb-bot/src/modules/level/__init__.py
#	kdb-bot/src/modules/level/command/__init__.py
#	kdb-bot/src/modules/level/configuration/__init__.py
#	kdb-bot/src/modules/level/events/__init__.py
#	kdb-bot/src/modules/level/level.json
#	kdb-bot/src/modules/level/service/__init__.py
#	kdb-bot/src/modules/permission/__init__.py
#	kdb-bot/src/modules/permission/abc/__init__.py
#	kdb-bot/src/modules/permission/configuration/__init__.py
#	kdb-bot/src/modules/permission/events/__init__.py
#	kdb-bot/src/modules/permission/permission.json
#	kdb-bot/src/modules/permission/service/__init__.py
#	kdb-bot/src/modules/stats/service/__init__.py
#	kdb-bot/src/modules/stats/stats.json
#	kdb-bot/src/modules/technician/__init__.py
#	kdb-bot/src/modules/technician/command/__init__.py
#	kdb-bot/src/modules/technician/technician.json
#	kdb-bot/tools/get_version/get-version.json
#	kdb-bot/tools/post_build/post-build.json
#	kdb-bot/tools/set_version/set-version.json
2023-03-20 14:39:18 +01:00
085726bf60 Updated config 2023-03-20 14:32:44 +01:00
223abbe66f Fixed user mutation 2023-03-20 14:11:02 +01:00
4c5a8baed5 Build release 2023-03-20 14:01:08 +01:00
cc0a0a5c69 Added logic to confirm privacy before registration #251 2023-03-17 14:43:16 +01:00
9f57182fc1 Fixed collection sorting & paging order 2023-03-14 15:32:26 +01:00
8b79d69e41 Build 1.0.0.rc2 2023-03-12 04:55:42 +01:00
5f284597aa Build 1.0.0.rc2 2023-03-12 04:55:42 +01:00
e1b1a68b07 Set version for rc2 2023-03-12 04:55:42 +01:00
b1a0115e8b Fixed db set date & show only changed fields in history view #246 2023-03-12 04:55:04 +01:00
ad00dce5d9 Fixed mysql scripts #246 2023-03-11 03:09:27 +01:00
e3c47ce5b1 Fixed mysql scripts #246 2023-03-11 03:09:18 +01:00
ee503f76f2 Order history tables #246 2023-03-11 01:19:06 +01:00
b8e4146b33 Added history to all data tables #246 2023-03-11 01:19:06 +01:00
69ce659328 Added history tables to graphql #246 2023-03-11 01:18:35 +01:00
325a17b5a8 Added level history to graphql #246 2023-03-11 01:18:35 +01:00
5df0501505 Added last migration parts #246 2023-03-11 01:18:35 +01:00
c3ef7a746f [WIP] Added last tables #246 2023-03-11 01:18:35 +01:00
bca33c6e56 [WIP] Added more tables #246 2023-03-11 01:18:35 +01:00
d24d3fa4de [WIP] Added more tables #246 2023-03-11 01:18:35 +01:00
1755efb5d9 [WIP] Added migration and basics for history logic #246 2023-03-11 01:18:35 +01:00
f404287cc1 Merge branch '1.0.0' into #247 2023-03-11 01:14:47 +01:00
c0e5f0d4b0 Updated config 2023-03-09 19:41:10 +01:00
80769a1bf0 Fixed permission service 2023-03-09 19:27:56 +01:00
16ef29999c Fixed _is_email_valid method #247 2023-03-09 11:15:28 +01:00
33279b7053 Fixed collection count field #247 2023-03-09 11:12:48 +01:00
04fcfddbd9 Code cleanup #247 2023-03-09 11:10:53 +01:00
d1420d18c0 Put boot log send message in loop task #243 2023-03-06 10:54:58 +01:00
22d26bf032 Reload levelsystem after mutate levels #245 2023-03-06 10:54:58 +01:00
3324cf3ac3 Fixed time calculation for user joined gs/vs 2023-03-06 10:54:58 +01:00
1664c67763 Fixed time calculation for user joined gs/vs 2023-03-06 10:54:58 +01:00
bddcd3929a Updated docker compose 2023-03-06 10:54:58 +01:00
23e17c1f38 Fixed auto-role error 2023-03-06 08:42:48 +01:00
883811d156 Removed minecraft_id 2023-03-06 08:42:48 +01:00
505c87b996 Build version 2023-03-06 08:42:48 +01:00
18fe6ecb86 Set version for rc 2023-03-06 08:42:48 +01:00
1b328dc20e Fixed translation #238 2023-03-06 08:05:30 +01:00
34c362a391 Improved game server handling for ontime #238 2023-03-06 08:05:08 +01:00
15dfc3f47c Added GameServer & ApiKey logic #238 2023-03-06 08:05:08 +01:00
91b2cf7546 Added GameServer handling & commands #238 2023-03-06 08:05:08 +01:00
a8dad6b223 Added GameServer data model #238 2023-03-06 08:05:08 +01:00
d24c8e40de Merge branch '1.0.0' into #240 2023-03-05 21:47:53 +01:00
24f90657e1 Fixed german translation #232 2023-03-05 21:22:22 +01:00
454fabb3e3 Added migration only mode #240 2023-03-04 18:57:51 +01:00
d75503569e Refactored translations #232 2023-02-23 10:58:08 +01:00
2d995544c3 Code refactoring #35 2023-02-23 08:58:04 +01:00
e5fb9fd504 Merge branch '1.0.0' into #35 2023-02-23 08:46:52 +01:00
6915515932 Fixed table loading #220 2023-02-22 21:02:49 +01:00
2674af64e9 Added warning commands #35 2023-02-22 08:44:08 +01:00
1eb625fe7a Improved warning handling #35 2023-02-22 08:39:50 +01:00
19f47a01e5 Added warnings service #35 2023-02-22 08:39:50 +01:00
8ff21debf0 Added user warning repository #35 2023-02-22 08:39:50 +01:00
89bcb655d2 Added user warning model #35 2023-02-22 08:39:50 +01:00
b9d33c5fd0 Merge branch '1.0.0' into #133 2023-02-21 22:45:30 +01:00
2763f254af Merge pull request 'Fixed db null handling #219' (#229) from #219 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#229
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #219
2023-02-21 21:10:18 +01:00
f7dc8d135a Improved SQL statements #219 2023-02-21 21:08:51 +01:00
d42b76ba87 Improved SQL statements #219 2023-02-21 20:51:28 +01:00
0f26db3d74 Merge pull request 'Der Bot muss wohl zwei mal gestartet werden, damit er die DB richtig läd #214' (#231) from #214 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#231
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #214
2023-02-21 20:43:05 +01:00
f3024d2ea5 Fixed changes of rebase #133 2023-02-21 17:24:18 +01:00
9274be6bb7 Merge branch '1.0.0' into #218 2023-02-21 13:21:33 +01:00
ac1affa937 Fixed seeder and module order #214 2023-02-21 13:19:34 +01:00
4e722d9c47 Fixed add xp to author of reacted message #218 2023-02-21 12:47:20 +01:00
6585576266 Merge branch '1.0.0' into #219 2023-02-21 12:43:15 +01:00
8937243725 Fixed db null handling #219 2023-02-21 12:42:47 +01:00
f38b517b98 Added confirm dialog on first discord login #210 2023-02-21 12:09:29 +01:00
1f3b12501b Fixed notification on OnMemberJoin #191 2023-02-21 10:16:16 +01:00
ec9bc80392 Finished auto role rules #134 2023-02-20 22:30:25 +01:00
a2dcbbc465 Finished auto role list #134 2023-02-20 21:32:46 +01:00
81fe7433bd Improved settings #134 2023-02-20 21:32:46 +01:00
ed5564dc7c [WIP] Improved auto roles #134 2023-02-20 21:32:46 +01:00
e0ca057399 [WIP] Added auto roles list #134 2023-02-20 21:32:46 +01:00
16b2deec6b Added requested changes #190 2023-02-19 21:33:08 +01:00
85e664e642 Removed statistic module #190 2023-02-19 19:46:13 +01:00
Jonas Drescher
eb18fdea46 added Jonas to settings 2023-02-19 14:36:07 +01:00
Jonas Drescher
6945cd2eac added Jonas to settings 2023-02-19 14:31:00 +01:00
ef040f2b91 Fixed permission check 2023-02-19 14:25:41 +01:00
96339ed168 Fixed some stuff for deployment #130 2023-02-19 11:59:02 +01:00
5a9ad77761 Updated config #130 2023-02-19 11:09:34 +01:00
fd9d938b8a Set version to build for staging 2023-02-19 10:29:29 +01:00
da3680a83e Improved imports #130 2023-02-18 14:45:51 +01:00
610ce42fa2 Fixed styling & added game server to profile #130 2023-02-18 13:37:03 +01:00
6149825101 Fixed sorting with null values #130 2023-02-18 13:05:45 +01:00
38417bd712 Fixed auth user confirmed check #130 2023-02-18 12:49:14 +01:00
7d67b08ce6 Added leftServer handling to members list #130 2023-02-18 12:14:04 +01:00
afff27b273 Improved db updates #130 2023-02-18 11:44:13 +01:00
de8262dae1 Improved sidebar handling & added minecraftId to profile #130 2023-02-18 11:34:33 +01:00
b96288f4a3 Added member profile #130 2023-02-18 10:44:19 +01:00
dfe4f28e24 Improved sorting #130 2023-02-18 10:22:31 +01:00
fea259fa3b Renamed type_id to id for sorting #130 2023-02-18 10:22:31 +01:00
85452c9a74 Added members view #130 2023-02-18 10:22:30 +01:00
b15bcec20a Updated config #130 2023-02-18 10:19:47 +01:00
f847841582 Added routing by permissions #130 2023-02-18 10:19:45 +01:00
e2ef4f3bde Merge pull request 'Login in WI möglich trotz nicht bestätigter mail #77' (#205) from #77 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#205
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #77
2023-02-16 22:18:20 +01:00
065e8b0645 Merge branch '1.0.0' into #77 2023-02-16 22:02:59 +01:00
f04a6066a1 Merge branch '1.0.0' into #167 2023-02-16 22:01:38 +01:00
c4507d3aa1 Merge branch '1.0.0' into #167 2023-02-16 21:45:10 +01:00
1039a58d4f Merge branch '1.0.0' into #77 2023-02-16 21:44:53 +01:00
ed4d41d424 Merge branch '1.0.0' into #78 2023-02-16 21:44:32 +01:00
b9087dccb3 Fixed copy&paste error #181 2023-02-16 21:43:47 +01:00
4bb486f1d5 Merge branch '1.0.0' into #181 2023-02-16 21:08:48 +01:00
8efd0fc993 Added logic to prevent login when email not confirmed #77 2023-02-16 17:12:41 +01:00
6c0b48a941 Added logic to show createdAt & modifiedAt in auth user list #78 2023-02-16 17:00:55 +01:00
77946cb3a8 Added logic to add bonus xp when joining the event channel #167 2023-02-13 23:15:04 +01:00
5953c82a9b Fixed formatting #167 2023-02-13 23:14:57 +01:00
6bf73fcf91 Added logic to save active events locally #167 2023-02-13 23:14:49 +01:00
3844240930 Fixed filter error #181 2023-02-13 22:21:18 +01:00
efa18944fe Edited my API config 2023-02-13 20:47:32 +01:00
9e2a0441d3 Merge branch '1.0.0' into #198 2023-02-12 20:36:05 +01:00
60990db88d Fixed collection building #89 2023-02-12 20:33:28 +01:00
ce1cdd4017 Added user joined game server validation checks on start #181 2023-02-12 20:30:42 +01:00
9a8f8a13f6 Improved user joined game server mutation #181 2023-02-12 20:00:47 +01:00
667bb708d9 Improved user joined game server mutation #181 2023-02-12 19:47:27 +01:00
54cb6cf8a0 Fixed user filter #181 2023-02-12 17:42:59 +01:00
aa16847fbf Added minecraft register commands #181 2023-02-12 17:22:58 +01:00
2ef4d079ed Added minecraft id #181 2023-02-12 16:55:35 +01:00
bd4e088032 Added mutations for user joined game server #181 2023-02-12 16:39:26 +01:00
1e74584e71 Added user joined game server gql query #181 2023-02-12 16:16:17 +01:00
0b5acdea58 Added user joined game server model #181 2023-02-12 15:42:02 +01:00
91bbb2f2e9 Added permission check on data mutation #198 2023-02-12 14:59:20 +01:00
dd64435c65 Added logic to check if user is allowed to see requested data #89 2023-02-11 13:11:55 +01:00
a6df06f13a Added logic to create default api-key for frontend #162-3 2023-02-09 22:09:02 +01:00
7f14aff1bd Added api-key commands #162-3 2023-02-09 20:22:46 +01:00
d03ea1d970 Added ApiKeys to db #162-3 2023-02-09 19:29:25 +01:00
f144564806 Secured graphql playground #162-2 2023-02-09 18:29:19 +01:00
6aca981fd1 [WIP] Switched from rest to GraphQL #162-2 2023-02-09 16:09:34 +01:00
79837afdfb Removed server route #162-2 2023-02-09 14:32:38 +01:00
8273b2b98e Build frontend & fixed oauth scopes #162 2023-02-09 14:30:51 +01:00
b33c5dc9bf Fixed mutations #162 2023-02-08 19:24:07 +01:00
e9559dec08 Fixed queries #162 2023-02-08 19:10:56 +01:00
5d470be583 Changed from snake to camel case #162 2023-02-08 19:05:32 +01:00
1dfe7edcba Added services to di #162 2023-02-08 17:50:43 +01:00
af8c2dea60 Added mutations #162 2023-02-08 17:48:54 +01:00
23e238b7d5 Removed server from queries where user set #162 2023-02-08 12:34:47 +01:00
fde318b85d Improved filters & queries #162 2023-02-08 12:32:16 +01:00
93c60b9176 Improved filters #162 2023-02-08 12:05:02 +01:00
12f8f669ed Improved filters #162 2023-02-07 19:09:27 +01:00
36fd3c73b9 Added client filter #162 2023-02-07 18:58:09 +01:00
3f7cfc47af Finished auto role filter #162 2023-02-07 18:53:28 +01:00
eb58c34c4d Added auto role filter #162 2023-02-07 17:52:38 +01:00
e3c0a0dea3 Reformatted files with black #162 2023-02-07 17:07:25 +01:00
dbfae8d8a4 Added more gql filters #162 2023-02-07 17:07:14 +01:00
e1c89814da Fixed voice state update (ontime) handling 2023-01-19 20:02:56 +01:00
53cdaf3fa0 Added get_ontime_overlaps script 2023-01-19 19:34:03 +01:00
b11ce18ac9 Fixed switch channel handling 2023-01-19 18:35:49 +01:00
16066864ed Improved queries & filtering #162 2023-01-16 19:18:23 +01:00
807827e30f Improved queries & filtering #162 2023-01-16 15:13:45 +01:00
c75cc54d16 Improved queries #162 2023-01-15 17:47:40 +01:00
6a1ad1ec9f Added filters #162 2023-01-15 17:06:04 +01:00