0.3 #146

Merged
edraft merged 359 commits from 0.3 into master 2023-01-12 07:04:40 +01:00

359 Commits

Author SHA1 Message Date
4c577f6a7b Set config 2023-01-10 20:05:17 +01:00
f50a763539 Set docker 2023-01-10 20:05:03 +01:00
9ff9cc672e Improved docker stuff 2023-01-09 10:23:06 +01:00
9d4cf5a769 Set version for frontend 2023-01-09 08:31:31 +01:00
df1d62f569 Build version 0.3.0 2023-01-09 08:06:28 +01:00
4201510e9f Set version 0.3.0 2023-01-09 08:05:50 +01:00
394428a81a Updated config for build 2023-01-09 08:04:57 +01:00
4733f84ec6 Updated config for build 2023-01-09 08:04:45 +01:00
9c466733fb Reset config 2023-01-05 13:33:24 +01:00
bd62618fdf Build rc5 version 2023-01-04 17:20:26 +01:00
a78d5f0fcb Fixed #153 again 2023-01-04 17:19:36 +01:00
661630bb37 Build rc4 version 2023-01-04 17:07:53 +01:00
15f041a2da Set rc4 version 2023-01-04 17:07:30 +01:00
1ac5d982ed Fixed #152 2023-01-04 17:06:46 +01:00
1337ef35dd Fixed #153 2023-01-04 17:05:32 +01:00
986d7c4562 Merge remote-tracking branch 'origin/0.3' into 0.3 2023-01-04 17:03:33 +01:00
7fcb4084d2 Reactivated web api & set frontend version 2023-01-04 12:23:14 +01:00
fbac0d3d02 Reactivated web api & set frontend version 2023-01-04 12:21:31 +01:00
9626de2b27 Build new rc version 2023-01-04 12:14:39 +01:00
1d74f5e67c Set new rc version 2023-01-04 12:14:18 +01:00
6949db10f8 Merge pull request '/auto-role rule add failed (#151)' (#161) from #151 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#161
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #151
2023-01-04 12:09:14 +01:00
ba5d897662 Merge pull request 'Fixed autocompletes (#150)' (#160) from #150 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#160
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #150
2023-01-04 11:30:22 +01:00
47415af868 Merge pull request 'Fixed user autocompletes (#153)' (#159) from #153 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#159
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #153
2023-01-04 11:30:11 +01:00
6353c7ca86 Merge pull request 'Fixed user info command (#152)' (#158) from #152 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#158
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #152
2023-01-04 11:30:00 +01:00
440689653d Merge pull request 'Added logic to count moved users to mass move (#156)' (#157) from #156 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#157
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #156
2023-01-04 11:29:49 +01:00
844a818aa0 Fixed auto-role add #151 2022-12-30 13:05:49 +01:00
33fb973f21 Fixed autocompletes #150 2022-12-30 13:05:30 +01:00
7646335d03 Fixed autocompletes #150 2022-12-30 12:18:56 +01:00
04c905d287 Fixed user autocompletes #153 2022-12-30 11:45:41 +01:00
c7d8508173 Fixed user info command #152 2022-12-30 11:34:47 +01:00
f3eff97780 Added logic to count moved users to mass move #156 2022-12-30 11:26:29 +01:00
476db0ed33 Build rc2 2022-12-28 20:13:48 +01:00
9c369b911a Fixed user group 2022-12-28 20:10:20 +01:00
6dfd476bce Merge pull request 'Improved translations #64' (#149) from #64 into 0.3
closes #64
2022-12-28 19:48:49 +01:00
f669410b2a Improved translations #64 2022-12-28 19:45:50 +01:00
a46122243f Merge pull request 'Added logic to handle public and private messages #147' (#148) from #147 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#148
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #147
2022-12-28 18:59:47 +01:00
3b7345b404 Added logic to handle public and private messages #147 2022-12-27 19:02:59 +01:00
59d38f8f2a Merge pull request 'Build 0.3.0.rc1' (#145) from 0.3.0.rc1 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#145
Closes #145
2022-12-27 18:54:29 +01:00
612430d3e0 Fixed dockerfile for releases 2022-12-23 16:41:28 +01:00
e01290db9b Build 0.3.0.rc1 2022-12-23 16:12:35 +01:00
6273ce9cba Merge pull request 'Added user remove command #23' (#144) from #23 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#144
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #23
2022-12-23 15:50:07 +01:00
5c923d8bd8 Merge branch '0.3' into #23 2022-12-23 15:48:46 +01:00
6c6169f7ee Merge pull request 'Added user set command #22' (#143) from #22 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#143
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #22
2022-12-23 15:48:36 +01:00
ffd5105154 Removed error handling for database errors, replaced match-case-statements with if-else-statements and removed unused variables from the language file #23 2022-12-22 21:02:05 +01:00
9040ab6fca Improved error handling and changed attribute names from constants to variables which are located in the language file #23 2022-12-22 20:41:50 +01:00
9d89135b4c Added SQL command to delete all records by user id in "userjoinedvoicechannel"-table #23 2022-12-22 20:39:39 +01:00
71899346b2 Added translation for user remove command #23 2022-12-22 20:39:39 +01:00
d197a6e158 Added user remove command #23 2022-12-22 20:39:39 +01:00
40e53de3f2 Removed error handling for database errors and replaced match-case-statements with if-else-statements #22 2022-12-22 20:38:59 +01:00
1b9553e63b Improved error handling and changed attribute names from constants to variables which are located in the language file #22 2022-12-18 22:44:07 +01:00
5447d502cc Merge branch '0.3' into #22 2022-12-18 11:02:07 +01:00
5a4c2901f5 Fixed not checking level after new XP is assinged to user #22 2022-12-17 19:21:04 +01:00
bcf71a26f0 Fixed cpl query update 2022-12-17 16:17:14 +01:00
b25b75e382 Fixed frontend 2022-12-17 15:26:48 +01:00
f21b4f9881 Merge pull request 'Updated CPL to 2022.12.0 (#140)' (#141) from #140 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#141
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #140
2022-12-12 08:13:14 +01:00
8705904882 Merge branch '0.3' into #140 2022-12-12 08:13:00 +01:00
cf610b770b Added translation for user set command 2022-12-11 21:19:08 +01:00
ec30069ff5 Added user set command 2022-12-11 21:18:51 +01:00
7026b3abac Merge pull request 'Added user get command #21' (#142) from #21 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#142
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #21
2022-12-11 19:27:35 +01:00
31464df3f6 Fixed ontime rounding #21 2022-12-11 19:26:48 +01:00
eb9f5b83d5 Changed cpl-query to "2022.12.1.post1" in "kdb-bot/src/bot/bot.json" 2022-12-11 03:03:12 +01:00
fdd8357729 Added user get command #21 2022-12-11 00:22:34 +01:00
7c744f0e65 Updated CPL to 2022.12.0 #140 2022-12-04 18:38:58 +01:00
4a0f5c28c1 Merge pull request '0.3 - Bei message Member.name -> Member.mentions oder so (#100)' (#137) from #100 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#137
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #100
2022-11-22 18:16:38 +01:00
d2f99003ff Merge pull request '0.3 - Nachrichten sollen länger gezeigt werden (#135)' (#138) from #135 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#138
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #135
2022-11-22 18:16:21 +01:00
9dd3fd4b8e Updated configs #135 2022-11-21 20:35:55 +01:00
d18500b96c Changed .name -> .mention #100 2022-11-21 20:29:50 +01:00
91fdf34d32 Merge pull request 'Added mass-move command' (#136) from #20 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#136
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #136
2022-11-21 19:00:34 +01:00
12369cdbe3 Removed unused code for mass-move #20 2022-11-21 18:20:23 +01:00
25c698273a Fixed sending message with translation pipe #20 2022-11-21 00:30:49 +01:00
2868b1afe2 Added messaging to mass-move #20 2022-11-20 23:27:22 +01:00
0d1c15b31d Added mass-move command #20 2022-11-20 19:18:17 +01:00
840da350e4 Merge pull request '0.3 - Login per Discord (#128)' (#129) from #128 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#129
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #128
2022-11-20 16:54:03 +01:00
bd94c42eae Added discord login & removed discord register #128 2022-11-20 16:09:20 +01:00
c7a925b997 Merge pull request 'Added presence command #18' (#126) from #18 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#126
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #126
2022-11-20 15:41:26 +01:00
7fb6d22c3f Added requested changes to presence command #18 2022-11-20 15:39:34 +01:00
c5b5297058 Added presence command #18 2022-11-20 06:21:51 +01:00
9ed66c2560 Merge branch '0.3' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into 0.3
 Conflicts:
	kdb-bot/src/modules/technician/command/log_command.py
2022-11-18 15:39:36 +01:00
6e6157ccf2 Fixed log command 2022-11-18 15:34:25 +01:00
f136d6164e Fixed log command 2022-11-18 15:05:39 +01:00
9b5033b80e Fixed some on member join stuff 2022-11-18 14:33:54 +01:00
f5a71a8450 Fixed some on member join stuff 2022-11-18 14:14:01 +01:00
d3279eb7c7 Updated config 2022-11-18 10:23:40 +01:00
ec7aeb8712 Added icmplib 2022-11-18 10:16:59 +01:00
fd609eb923 Merge remote-tracking branch 'origin/0.3' into 0.3
# Conflicts:
#	kdb-bot/cpl-workspace.json
2022-11-18 09:58:28 +01:00
a7dbc75d2e Updated configs 2022-11-18 09:58:05 +01:00
b0459567f4 Fixed workspace 2022-11-18 09:52:27 +01:00
25b7b18013 Fixed workspace 2022-11-18 09:51:06 +01:00
87350cba1a Moved dockerfile 2022-11-18 09:50:06 +01:00
864d181de0 Fixed project files 2022-11-18 09:33:50 +01:00
90011be760 Updated api config ? 2022-11-18 09:30:44 +01:00
47dd6fdc2d Improved build version stuff 2022-11-18 09:30:29 +01:00
8445c23e7f Merge pull request '0.3 - Log Befehl (#44)' (#125) from #44 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#125
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #44
2022-11-17 23:03:33 +01:00
e6fc41090a Refactored code #44 2022-11-17 23:02:27 +01:00
7c79c6f992 Merge branch '0.3' into #44
# Conflicts:
#	kdb-bot/src/bot/config
2022-11-17 22:54:01 +01:00
7b8dca64bf Finished log command #44 2022-11-17 22:45:10 +01:00
549b05087f Merge pull request '0.3 - /user info für alle (#119)' (#122) from #119 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#122
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #119
2022-11-17 20:40:55 +01:00
83d18da58f Merge pull request '0.3 - level check for all members on seed (#123)' (#124) from #123 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#124
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #123
2022-11-17 20:40:37 +01:00
18e4465b17 Merge branch '0.3' into #123 2022-11-17 20:01:44 +01:00
2e20bb12de Merge branch '0.3' into #119 2022-11-17 20:01:31 +01:00
4f4e80fb6b Merge pull request '0.3 - Xp für Reaction (#118)' (#121) from #118 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#121
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #121
2022-11-17 20:01:12 +01:00
fd1245fb4f Merge remote-tracking branch 'origin/#118' into #118 2022-11-17 19:59:01 +01:00
fdb358c45e Removed xp when remove reaction #118 2022-11-17 19:58:51 +01:00
c438a91b87 Added logic to add xp on reaction #118 2022-11-17 19:58:51 +01:00
a46fbcd9fc Removed xp when remove reaction #118 2022-11-17 19:57:28 +01:00
91285540c6 Merge pull request '0.3 - /ping pings to urls (#117)' (#120) from #117 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#120
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #117
2022-11-17 19:54:17 +01:00
ab2145d5df Check level for each member after changes #123 2022-11-17 19:31:57 +01:00
63fe566044 Improved /user info command #119 2022-11-17 16:49:33 +01:00
d45d787cea Added logic to add xp on reaction #118 2022-11-17 16:35:47 +01:00
442170eca9 Added pings to servers to ping command #117 2022-11-17 16:16:28 +01:00
2c7f4647af [WIP] Added log command #44 2022-11-16 21:04:07 +01:00
53604706c2 Added technician module #44 2022-11-14 22:29:43 +01:00
42d8a16d05 Merge pull request '0.3 - Nachricht an Moderatoren, wenn Hilfe-Channel betreten wird (#113)' (#116) from #113 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#116
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #113
2022-11-14 21:56:40 +01:00
d933cae73c Merge branch '0.3' into #113 2022-11-14 21:56:24 +01:00
ce73145dbb Merge pull request '0.3 - Checks in Befehlen als Decorators (#114)' (#115) from #114 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#115
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #114
2022-11-14 21:49:59 +01:00
ab7fdec499 Merge branch '0.3' into #114 2022-11-14 21:49:42 +01:00
d2968e0652 Merge pull request '0.3 - Admins können keine anderen Benutzer zu Admin machen (#88)' (#112) from #88 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#112
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #88
2022-11-14 21:10:35 +01:00
cebdc1b860 Merge branch '0.3' into #88 2022-11-14 21:09:30 +01:00
87435614db Fixed angular setup for windoof and linux 2022-11-14 20:10:44 +01:00
e9386633d8 Merge branch '0.3' into #88 2022-11-13 22:20:51 +01:00
49d9509255 Added logic to send mods a message when member joins help channel #113 2022-11-13 12:32:31 +01:00
905182931c Improved event checks #114 2022-11-13 12:15:53 +01:00
026d989789 Improved event checks #114 2022-11-13 12:11:01 +01:00
d38fa77757 Added checks to commands #114 2022-11-13 12:07:50 +01:00
5cdf2834cc Added is ready check to events #114 2022-11-13 12:01:34 +01:00
7173dee28d Added event checks #114 2022-11-13 11:58:09 +01:00
e754a10241 Added command checks #114 2022-11-13 11:56:42 +01:00
theim
8fa6458d6e Added my configs 2022-11-12 15:16:06 +01:00
e269442603 Fixed bot project 2022-11-12 14:29:50 +01:00
d36a29042e Fixed copy paste error in feature flags 2022-11-12 12:15:45 +01:00
c09841a3da Merge branch '0.3' into #88 2022-11-11 22:02:39 +01:00
e098416a29 Merge pull request '0.3 - /level edit (#103)' (#108) from #103 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#108
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #103
2022-11-11 22:02:26 +01:00
9017535bfb Merge branch '0.3' into #88 2022-11-11 10:19:25 +01:00
b2087042bc Added error notification to level edit #103 2022-11-11 07:33:24 +01:00
8fafc94118 Merge branch '0.3' into #103 2022-11-11 07:28:21 +01:00
c608b232b0 Merge pull request '0.3 - Ontime in user info (#97)' (#107) from #97 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#107
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #97
2022-11-11 07:26:44 +01:00
6ff53fb31c Merge branch '0.3' into #97 2022-11-11 07:26:34 +01:00
be96644e5c Merge pull request '0.3 - AutoRole Emoji zu nachricht nach Anlegen einer Regel hinzufügen (#63)' (#110) from #63 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#110
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #63
2022-11-11 07:26:28 +01:00
2646dccb91 Merge branch '0.3' into #63 2022-11-11 07:25:52 +01:00
1a5917ac6b Merge pull request '0.3 - Nachricht bei shutdown und restart wird nicht geschickt vor neustart (#62)' (#111) from #62 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#111
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #62
2022-11-11 07:21:34 +01:00
588a8e140f Merge branch '0.3' into #62 2022-11-11 07:21:21 +01:00
c70149e9c8 Added is admin check to level edit #103 2022-11-10 21:10:48 +01:00
50fbc3eb8c Merge branch '0.3' into #103 2022-11-10 21:09:52 +01:00
b4fce51b57 Added is admin check to level create 2022-11-10 20:56:45 +01:00
3c1f017e3a Fixed admins cannot assign users to admins #88 2022-11-10 20:26:29 +01:00
25cc98732d Fixed restart after message #62 2022-11-10 20:02:53 +01:00
ef41ce03d3 Added functionality to auto-role rule add to add reaction to message #63 2022-11-10 19:50:42 +01:00
44f22e6aee Added level edit command #103 2022-11-10 16:33:04 +01:00
10a502fa4b Merge branch '#97' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into #97 2022-11-10 08:23:46 +01:00
2a4933f971 Added ontime to user info #97 2022-11-10 08:23:40 +01:00
b30d49f5d7 Updated my laptop config 2022-11-10 08:20:49 +01:00
7eca399b9d Merge remote-tracking branch 'origin/0.3' into 0.3 2022-11-10 08:17:58 +01:00
766e9b1235 Changed edrafts secrets 2022-11-10 08:17:44 +01:00
26f0938566 Changed prod pws 2022-11-10 08:15:50 +01:00
97fab6adca Changed stage pws 2022-11-10 08:12:43 +01:00
97279c2599 Changed dev pws 2022-11-10 08:03:12 +01:00
8fe38c451e Moved docker related files 2022-11-10 07:54:31 +01:00
b0b228eef6 Moved docker related files 2022-11-10 07:54:20 +01:00
7bb407f2d7 Added configs 2022-11-10 07:47:43 +01:00
bf4468bfa6 Merge branch '0.3' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into 0.3 2022-11-10 07:34:12 +01:00
762e85d062 Removed configs 2022-11-10 07:34:03 +01:00
36a8d14720 Merge branch '0.3' into #97 2022-11-10 07:12:32 +01:00
2613fcc999 Merge pull request '0.3 - received command in allen neuen Befehlen (#105)' (#106) from #105 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#106
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #105
2022-11-10 07:12:26 +01:00
356dc1848c Added ontime to user info #97 2022-11-09 22:34:25 +01:00
55c43efbdc Merge branch '0.3' into #105 2022-11-09 22:23:08 +01:00
e47318d8e9 Added received command to new commands #105 2022-11-09 22:21:32 +01:00
f551fdf87b Merge pull request '0.3 - auto-role list - möglicherweise nicht pro Server sondern allgemein (#93)' (#104) from #93 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#104
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #93
2022-11-09 22:06:32 +01:00
6f3877700e Fixed auto-role output by server #93 2022-11-09 21:40:04 +01:00
2483faef01 Merge pull request '0.3 - Statistiken (#46)' (#102) from #46 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#102
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #46
2022-11-09 20:55:05 +01:00
82365a24ba Fixed stats group #46 2022-11-09 20:52:58 +01:00
a29e33a3f9 Readded debug log to level seeder #26 2022-11-09 20:07:37 +01:00
273548411b Removed tests #26 2022-11-09 19:57:16 +01:00
a8f481ff4a Merge branch '#46' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into #46
 Conflicts:
	kdb-bot/src/modules/level/level_seeder.py
2022-11-09 19:54:40 +01:00
7fe0f19adf Added db to stats #46 2022-11-09 19:53:10 +01:00
b52cdf0f34 Added stats repo #46 2022-11-09 19:53:10 +01:00
1c9c265ba8 Added stats table #46 2022-11-09 19:53:10 +01:00
b5080d8c04 Added stats migration #46 2022-11-09 19:53:10 +01:00
bf107f9a18 Added stats remove command #46 2022-11-09 19:53:10 +01:00
8cd67cd68c Added stats edit command #46 2022-11-09 19:53:10 +01:00
5c7db72723 Fixed level seeder #46 2022-11-09 19:53:10 +01:00
86433e841b Fixed typo #46 2022-11-09 19:51:46 +01:00
61b2432d0b Added logic to handle custom statistics #46 2022-11-09 19:51:46 +01:00
ddb9d0e647 Removed old code #46 2022-11-09 19:51:46 +01:00
a57c8da72a Added logic to call statistics #46 2022-11-09 19:51:46 +01:00
c6a5d49942 Added logic to call statistics #46 2022-11-09 19:51:46 +01:00
27ccdbd980 Merge pull request '0.3 - level set (#26)' (#101) from #26 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#101
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #26
2022-11-09 19:51:22 +01:00
a5ef2551e8 Improved error translation #26 2022-11-09 19:50:57 +01:00
c632ad51d4 Fixed stuff caused by merges #26 2022-11-09 19:33:45 +01:00
4f433c3840 Merge branch '#26' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into #26 2022-11-09 19:26:47 +01:00
455c1e7023 Fixed translation #26 2022-11-09 19:26:41 +01:00
9ade299be7 Merge branch '0.3' into #26 2022-11-09 19:24:12 +01:00
09dcc8a9d3 Merge pull request '0.3 - level up (#27)' (#99) from #27 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#99
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #27
2022-11-09 19:24:01 +01:00
bd79831892 Added db to stats #46 2022-11-09 19:23:10 +01:00
c7967c6904 Added stats repo #46 2022-11-09 18:49:11 +01:00
a43676e9bf Added stats table #46 2022-11-09 18:36:48 +01:00
fa7e41469b Added stats migration #46 2022-11-09 18:22:27 +01:00
c9ce81701f Added stats remove command #46 2022-11-09 18:01:14 +01:00
c407c59c1a Added stats edit command #46 2022-11-09 17:59:55 +01:00
7e5706137e Fixed level seeder #46 2022-11-09 17:18:14 +01:00
144c1d7e79 Merge branch '0.3' into #27
# Conflicts:
#	kdb-bot/src/bot/translation/de.json
2022-11-09 10:16:06 +01:00
054266bfa0 Merge pull request '0.3 - level down (#28)' (#98) from #28 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#98
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #28
2022-11-09 10:03:21 +01:00
eaae058754 Fixed problems since merge #28 2022-11-09 08:51:08 +01:00
95a64732f3 Fixed typo #46 2022-11-08 22:06:36 +01:00
57d59e91ac Merge branch '0.3' into #28
# Conflicts:
#	kdb-bot/src/bot/translation/de.json
#	kdb-bot/src/modules/level/command/level_group.py
2022-11-08 22:04:14 +01:00
e3d3d200d6 Added logic to handle custom statistics #46 2022-11-08 21:54:33 +01:00
7da60e6f0a Merge pull request '0.3 - level remove Befehl (#91)' (#96) from #91 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#96
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #91
2022-11-08 21:47:46 +01:00
95e33109fe Removed old code #46 2022-11-08 20:36:31 +01:00
9e937f17b7 Fixed typo in translation... bruh #91 2022-11-08 20:33:55 +01:00
5dca2e5fed Added logic to call statistics #46 2022-11-08 20:28:44 +01:00
f24fd5e880 Added logic to call statistics #46 2022-11-08 20:28:38 +01:00
cfd96126df Merge branch '0.3' into #91 2022-11-08 18:59:41 +01:00
9099ebe4f3 Moved admin & moderator commands to base module 2022-11-08 18:59:24 +01:00
c666ceb51e Added level set command #26 2022-11-08 18:49:18 +01:00
e5eb50a3cb Fixed level seeder #26 2022-11-08 18:49:10 +01:00
f0f23163e4 Added level down command #27 2022-11-08 18:01:04 +01:00
faaadb0009 Fixed level seeder #28 2022-11-08 17:49:42 +01:00
fe32604a14 Added level down command #28 2022-11-08 17:49:32 +01:00
9b39d9baa5 Merge branch '#91' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into #91 2022-11-08 09:36:41 +01:00
7f2cdc5b1c Added remove command #91 2022-11-08 09:36:15 +01:00
4ffbbd5b89 Merge pull request '0.3 - level create Befehl (#90)' (#95) from #90 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#95
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #90
2022-11-08 09:35:29 +01:00
898b24c8ee Changed color names #90 2022-11-08 08:02:35 +01:00
ccbe60b747 Merge branch '0.3' into #90 2022-11-07 22:33:26 +01:00
22456946b8 Merge pull request '0.3 - level list Befehl (#29)' (#94) from #29 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#94
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #29
2022-11-07 22:29:36 +01:00
e4fcc7931e Merge branch '0.3' into #91 2022-11-07 22:16:32 +01:00
e0af7421a1 Merge branch '0.3' into #90 2022-11-07 22:16:22 +01:00
c2ed8b9bc5 Merge branch '0.3' into #29 2022-11-07 22:16:01 +01:00
e27d2ae682 Merge pull request '0.3 - Levelsystem (#25)' (#92) from #25 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#92
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #25
2022-11-07 22:15:37 +01:00
b8fcaa48a5 Added remove command #91 2022-11-07 20:54:27 +01:00
6a18b15447 Fixed level stuff #90 2022-11-07 20:35:24 +01:00
b2397fcc2f Added create command #90 2022-11-07 20:35:12 +01:00
7ed30c40be Added list command #29 2022-11-07 19:04:41 +01:00
63000636a8 Updated version of level project #25 2022-11-06 22:46:15 +01:00
3d27295b14 Added translation to level service #25 2022-11-06 22:43:42 +01:00
1b587b049a Build files #25 2022-11-06 22:40:30 +01:00
dc90258a28 "Repaired" workspace file #25 2022-11-06 22:30:57 +01:00
23fde793db Fixed my config #25 2022-11-06 22:19:41 +01:00
6640d70440 Added logic to send message after level up #25 2022-11-06 22:17:27 +01:00
6e39154c75 Fixed level assignment #25 2022-11-06 21:54:21 +01:00
164671a07c Added logic to handle level by xp #25 2022-11-06 21:34:58 +01:00
8aee72856c Added level service #25 2022-11-06 19:51:50 +01:00
8118d4edc3 Improved logic to create roles for levels by default #25 2022-11-06 19:36:15 +01:00
861a847088 Improved logic to create roles for levels by default #25 2022-11-06 19:18:11 +01:00
666c527730 Added logic to handle default levels #25 2022-11-06 16:26:15 +01:00
e6e26b77f9 Added level repo #25 2022-11-06 14:46:11 +01:00
5a3eb57c0b Added level model #25 2022-11-06 14:35:28 +01:00
e1dbab3f4f Added level module and migration #25 2022-11-06 14:26:41 +01:00
3516a164da Merge pull request 'Added flask support #70 #75' (#71) from #70 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#71
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #70 #72 #75 #83 #85 #86
2022-11-05 13:55:41 +01:00
e1304cc602 Added comment #70 2022-11-05 13:49:01 +01:00
88f00c6046 Fixed typing #70 2022-11-05 12:42:22 +01:00
09a6062992 Fixed typing #70 2022-11-05 12:40:21 +01:00
c92403f274 Removed unused deps #70 2022-11-05 12:39:49 +01:00
422c9bbb25 Fixed log level #70 2022-11-05 12:03:22 +01:00
e45d156e74 Changed config #70 2022-11-05 11:52:31 +01:00
8e32362333 Changed config #70 2022-11-05 11:51:58 +01:00
801d4bf16b Merge pull request 'Logging erweitern um IP-Adressen #70-4 (#85)' (#87) from #85 into #70
Reviewed-on: sh-edraft.de/kd_discord_bot#87
Closes #85
2022-10-25 21:24:27 +02:00
f7fd15b4bd Merge branch '#70' into #85 2022-10-25 21:24:11 +02:00
ac5271de6d Fixed update user #85 2022-10-25 21:15:40 +02:00
1f2087f50f Fixed update user #85 2022-10-25 21:11:55 +02:00
1c5b776efb Fixed change password autocomplete #70 2022-10-25 20:44:50 +02:00
368a00434b Fixed socket connect error #85 2022-10-25 20:27:59 +02:00
242af637f7 Improved api logging #85 2022-10-25 20:27:39 +02:00
6d8aa26883 Improved api logging #85 2022-10-25 20:19:05 +02:00
bf2a412dec Improved user confirmation #70 2022-10-25 08:31:08 +02:00
811e9991d0 Fixed user confirmation :/ #70 2022-10-25 08:07:15 +02:00
5cbd6ec00b Fixed user confirmation 2022-10-25 08:00:57 +02:00
b9c793ebb7 Merge pull request 'Set secured passwords #70-3' (#84) from #70-3 into #70
Reviewed-on: sh-edraft.de/kd_discord_bot#84
Closes #83
2022-10-25 07:50:58 +02:00
76c14a79ed Set secured passwords #70-3 2022-10-25 07:48:53 +02:00
877efe086b Fixed AuthUserTransformer #70 2022-10-25 07:41:13 +02:00
3b2ab6c8a0 Potentially fixed docker deployment #70 2022-10-23 22:41:18 +02:00
7c0f30ff95 Fixed nginx #70 2022-10-23 18:24:32 +02:00
8719452dad Fixed nginx #70 2022-10-23 18:24:13 +02:00
24a3a48478 Fixed socket service #70 2022-10-23 17:49:31 +02:00
ea026b351e Fixed docker dev env #70 2022-10-23 16:38:48 +02:00
109d3f28a2 Fixed revoke jwt #70 2022-10-23 16:35:24 +02:00
af5b9a2341 Improved dev stack #70 2022-10-23 15:37:40 +02:00
25a6758c40 Improved dev stack #70 2022-10-23 15:32:03 +02:00
a685ab9e06 Fixed docker cfg #70 2022-10-23 15:11:05 +02:00
7b8f42ad59 Added dev stack #70 2022-10-23 15:05:01 +02:00
a691808068 Fixed multiple send mails error #70 2022-10-23 14:37:42 +02:00
ecd648a9b2 Fixed confirmation id None on discord registration #70 2022-10-23 14:24:23 +02:00
f891587ce3 Improved docker support for deployment #70 2022-10-23 14:11:15 +02:00
ffe7b5e109 Repaired register by discord #70 2022-10-23 12:44:51 +02:00
602b1f3f98 Fixed docker env #70 2022-10-22 08:17:54 +02:00
17a14cedb6 Improved config #70 2022-10-22 07:37:47 +02:00
e31c5472af [WIP] Changed some stuff for docker #70 2022-10-21 23:01:09 +02:00
46ed616560 Added get version stuff to build docker #70 2022-10-21 19:25:17 +02:00
47f294a982 Improved set version for frontend #70 2022-10-21 13:50:11 +02:00
0fcf2c7b45 Set version correctly #70 2022-10-21 13:45:37 +02:00
fd2d30ee7f Added set version tool #70 2022-10-21 12:45:46 +02:00
e9b74140b5 Removed gitkeep #70 2022-10-20 21:19:24 +02:00
27442fe7c7 Merge pull request 'Bissl docker kram zum laufen gebracht #70-1_docker_and_build' (#76) from #70-1_docker_and_build into #70
Reviewed-on: sh-edraft.de/kd_discord_bot#76
2022-10-20 20:49:38 +02:00
b748435f98 Build tools project #70-1 2022-10-20 20:20:01 +02:00
d60baa0dce Added project information #70-1 2022-10-20 20:18:16 +02:00
48507962f8 Improved docker #70-1 2022-10-20 17:50:50 +02:00
7d4f3e9541 Added requirements.txt generator #70-1 2022-10-20 16:48:06 +02:00
3b9ef0048e Remove unnecessary configs #70-1 2022-10-20 16:32:05 +02:00
523e019aa0 Added post-build project #70-1 2022-10-20 15:46:08 +02:00
d0d053152d Improved docker compose #70-1 2022-10-20 15:45:52 +02:00
8231d20e3b Moved deps #70 2022-10-20 12:57:36 +02:00
f35dd0b15d Fixed auth user and user relation #70 2022-10-20 12:57:02 +02:00
d778bd2719 Added logic to register by discord #70 2022-10-20 09:47:23 +02:00
0c42c6554c Added logic to register by discord #70 2022-10-19 22:42:53 +02:00
fbc7b58780 Put send mail in thread #70 2022-10-19 18:42:20 +02:00
840193d5a8 Fixed send mails #70 2022-10-19 18:01:11 +02:00
4869039503 Fixed auto-role migration #70 2022-10-19 16:57:03 +02:00
d0ded956cb [WIP] Fixed forgot password #70 2022-10-18 21:00:23 +02:00
47a73a4298 Fixed password handling #70 2022-10-18 19:50:13 +02:00
a082b879ca Secured password handling #70 2022-10-18 18:33:03 +02:00
a51efa641d Improved auth views and imrpoved default settings handling #70 2022-10-18 18:04:53 +02:00
f553779797 Merge pull request '0.3-#70 - Im Web Interface Server auswählen - (#72)' (#73) from #72 into #70
Reviewed-on: sh-edraft.de/kd_discord_bot#73
Closes #72
2022-10-18 16:37:04 +02:00
dee8e4fe74 Fixed themes #72 2022-10-18 16:36:24 +02:00
7760ee5725 Update menu when server is selected #72 2022-10-18 16:23:40 +02:00
1055d5c2e1 Improved design of menu to handle servers #72 2022-10-18 13:44:13 +02:00
c094a3efae Improved get server logic #72 2022-10-18 12:41:42 +02:00
2a97438417 [WIP] Added server dashboard #72 2022-10-17 19:44:51 +02:00
a69c223a33 Added server list to dashboard #72 2022-10-17 18:12:43 +02:00
1baa8cee60 Added logic to get servers to dashboard #72 2022-10-17 16:50:09 +02:00
3d17bb7703 Added get filtered servers #72 2022-10-17 16:22:09 +02:00
d7a0706e0c Improved get server logic #72 2022-10-17 16:07:33 +02:00
dfcc516389 Added role check to authorization #72 2022-10-17 13:53:37 +02:00
1857473ccc Added logic to get discord servers #72 2022-10-17 12:19:50 +02:00
90bfee23b4 Added logic to load api after bot #70 2022-10-16 21:36:08 +02:00
f634ad552e Fixed settings dto #70 2022-10-16 21:29:58 +02:00
29fa35dffe Fixed update user #70 2022-10-16 21:16:04 +02:00
c5f371e0d5 Fixed update user #70 2022-10-16 21:10:20 +02:00
f319e89473 Fixed login state problems #70 2022-10-16 16:01:37 +02:00
d5ad5ded88 Fixed header styling #70 2022-10-16 14:49:46 +02:00
dbbd2b54c4 Fixed load menu #70 2022-10-16 13:09:26 +02:00
1a3126dfc5 Removed themeService from templates #70 2022-10-16 12:57:27 +02:00
ba881aefa8 Added verify-login #70 2022-10-16 12:06:18 +02:00
3fe8e1503c Added authorize check to controller #70 2022-10-16 10:11:21 +02:00
651482a1b9 Added api connection check #70 2022-10-16 01:55:37 +02:00
8c3cd1fae7 Added angular frontend #70 2022-10-16 00:13:03 +02:00
ee49bde961 Added waitress dep #70 2022-10-15 23:48:38 +02:00
2b08c1d71e Updated bot stuff #70 2022-10-15 23:38:38 +02:00
ead3f69a69 Moved bot to kdb-bot #70 2022-10-15 23:17:45 +02:00
029b46d7de Build #70 2022-10-15 17:34:16 +02:00
9da95f4dfb Fixed update user #70 2022-10-15 17:25:49 +02:00
8e56ff6a8e Set log level #70 2022-10-15 17:07:46 +02:00
21fcfaaa7f Fixed some random stuff #70 2022-10-15 17:07:22 +02:00
119f4e9d04 Improved api #70 2022-10-15 12:54:10 +02:00
5cd91d8341 Fixed error and dto handling #70 2022-10-15 09:32:41 +02:00
e0844a7f92 [WIP] Improved basics of api #70 2022-10-15 03:04:17 +02:00
6f95d0a055 Added auth service stuff with jwt #70 2022-10-15 00:42:55 +02:00
1090e502c2 [WIP] Added auth service stuff without jwt #70 2022-10-14 23:32:36 +02:00
1defe29406 Added auth user controller #70 2022-10-14 15:37:52 +02:00
126637306d [WIP] Added auth user service #70 2022-10-14 13:17:25 +02:00
2457107c63 Added auth user repository #70 2022-10-14 13:05:53 +02:00
411e44a681 [WIP] Added auth controller & updated pakages #70 2022-10-14 10:35:58 +02:00
91b054fdca Added auth service abc #70 2022-10-14 07:51:30 +02:00
e8c491a478 Made api async #70 2022-10-14 07:16:12 +02:00
aab3d62365 Added api settings #70 2022-10-14 07:04:56 +02:00
0927288bb5 Added api calls #70 2022-10-13 20:57:47 +02:00
0019f868ad Added flask support #70 2022-10-13 19:57:56 +02:00
d05dec3605 Updated my config 2022-10-13 16:34:04 +02:00
30dbce3f4b Merge pull request '0.3 - user-info zu /user info konvertieren #61' (#68) from Ebola-Chan/kd_discord_bot:#61 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#68
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #61
2022-10-13 16:33:17 +02:00
56db9f42ad Merge pull request '0.3 - Techniker in PermissionService aufnehmen #60' (#69) from Ebola-Chan/kd_discord_bot:#60 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#69
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #60
2022-10-13 16:32:44 +02:00
85f5717624 Addad technician to PermissionService #60 2022-10-12 21:27:55 +02:00
0c71e4934e Renamed user-info and added it to user group #61 2022-10-12 20:50:26 +02:00