sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

0.3 #146

Merged
edraft merged 359 commits from 0.3 into master 2023-01-12 07:04:40 +01:00
Conversation 0 Commits 359 Files Changed 481 +20 -20
16 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a78d5f0fcb - Show all commits

2
kdb-bot/src/bot/bot.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/src/bot_api/bot-api.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/bot_core/bot-core.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/src/bot_data/bot-data.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/src/modules/auto_role/auto-role.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/modules/base/base.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

10
kdb-bot/src/modules/base/command/user_group.py
View File

@ -158,10 +158,10 @@ class UserGroup(DiscordCommandABC):
server = self._servers.find_server_by_discord_id(ctx.guild.id)
user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
if atr == self._atr_dict["xp"]:
if atr == 'xp':
value = str(user.xp)
elif atr == self._atr_dict["ontime"]:
elif atr == 'ontime':
value = str(round(
self._user_joined_voice_channel.get_user_joined_voice_channels_by_user_id(user.user_id)
.sum(lambda join: (join.leaved_on - join.joined_on).total_seconds() / 3600),
@ -194,7 +194,7 @@ class UserGroup(DiscordCommandABC):
server = self._servers.find_server_by_discord_id(ctx.guild.id)
user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
if atr == self._atr_dict["xp"]:
if atr == 'xp':
if not value.isnumeric():
await self._message_service.send_interaction_msg(ctx.interaction, self._t.transform('modules.base.user.set.error.value_type_not_numeric'))
return
@ -234,13 +234,13 @@ class UserGroup(DiscordCommandABC):
server = self._servers.find_server_by_discord_id(ctx.guild.id)
user = self._users.find_user_by_discord_id_and_server_id(member.id, server.server_id)
if atr == self._atr_dict["xp"]:
if atr == 'xp':
user.xp = 0
self._users.update_user(user)
self._db.save_changes()
await self._level.check_level(member)
elif atr == self._atr_dict["ontime"]:
elif atr == 'ontime':
self._user_joined_voice_channel.delete_user_joined_voice_channel_by_user_id(user.user_id)
self._db.save_changes()

2
kdb-bot/src/modules/boot_log/boot-log.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/modules/database/database.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/src/modules/level/level.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/modules/permission/permission.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/modules/stats/stats.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/src/modules/technician/technician.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "",
"AuthorEmail": "",

2
kdb-bot/tools/get_version/get-version.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/tools/post_build/post-build.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",

2
kdb-bot/tools/set_version/set-version.json
View File

@ -4,7 +4,7 @@
"Version": {
"Major": "0",
"Minor": "3",
"Micro": "0.rc4"
"Micro": "0.rc5"
},
"Author": "Sven Heidemann",
"AuthorEmail": "sven.heidemann@sh-edraft.de",