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

master #475

Closed
edraft wants to merge 60 commits from master into dev
pull from: master
merge into: sh-edraft.de:dev
Conversation 0 Commits 60 Files Changed 183 +3 -6
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b0990b626c - Show all commits

9
bot/src/modules/base/service/user_warnings_service.py
View File

@@ -92,13 +92,10 @@ class UserWarningsService:
elif existing_warnings.count() == 3:
server = self._servers.get_server_by_discord_id(member.guild.id)
user = self._users.get_user_by_discord_id_and_server_id(member.id, server.id)
levels = self._levels.get_levels_by_server_id(server.id)
new_level = levels.where(lambda l: l.min_xp > 0).order_by(lambda l: l.min_xp).last_or_default()
if new_level is not None:
user.xp = new_level.min_xp
self._users.update_user(user)
self._db.save_changes()
user.xp = 0
self._users.update_user(user)
self._db.save_changes()
await self.notify_user(member, self._t.transform("modules.base.warnings.third"))
elif existing_warnings.count() >= 4: