Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-14 15:00:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cant Reference what is already deleted

Browse Source
This commit is contained in:
AaronKable 2020-09-18 22:03:16 +08:00
parent ded9301527
commit e5ede4f7b6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
allianceauth/services/modules/discord/models.py
View File

@ -211,6 +211,7 @@ class DiscordUser(models.Model):
Return None if user does no longer exist Return None if user does no longer exist
""" """
try: try:
_user = self.user
client = DiscordUser.objects._bot_client(is_rate_limited=is_rate_limited) client = DiscordUser.objects._bot_client(is_rate_limited=is_rate_limited)
success = client.remove_guild_member( success = client.remove_guild_member(
guild_id=DISCORD_GUILD_ID, user_id=self.uid guild_id=DISCORD_GUILD_ID, user_id=self.uid
@ -220,7 +221,7 @@ class DiscordUser(models.Model):
if deleted_count > 0: if deleted_count > 0:
if notify_user: if notify_user:
notify( notify(
user=self.user, user=_user,
title=gettext_lazy('Discord Account Disabled'), title=gettext_lazy('Discord Account Disabled'),
message=gettext_lazy( message=gettext_lazy(
'Your Discord account was disabeled automatically ' 'Your Discord account was disabeled automatically '
@ -229,22 +230,22 @@ class DiscordUser(models.Model):
), ),
level='warning' level='warning'
) )
logger.info('Account for user %s was deleted.', self.user) logger.info('Account for user %s was deleted.', _user)
return True return True
else: else:
logger.debug('Account for user %s was already deleted.', self.user) logger.debug('Account for user %s was already deleted.', _user)
return None return None
else: else:
logger.warning( logger.warning(
'Failed to remove user %s from the Discord server', self.user 'Failed to remove user %s from the Discord server', _user
) )
return False return False
except (HTTPError, ConnectionError, DiscordApiBackoff) as ex: except (HTTPError, ConnectionError, DiscordApiBackoff) as ex:
if handle_api_exceptions: if handle_api_exceptions:
logger.exception( logger.exception(
'Failed to remove user %s from Discord server: %s', self.user, ex 'Failed to remove user %s from Discord server: %s',self.user, ex
) )
return False return False
else: else: