From d3c8189c92bfcb5a2f8186d85b014181f32d0d82 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Mon, 30 Nov 2015 23:51:39 +0000 Subject: [PATCH] Corrected Discord user deletion logic. Fixed Discord account reset. --- services/managers/discord_manager.py | 3 ++- services/views.py | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/services/managers/discord_manager.py b/services/managers/discord_manager.py index 0b99e26f..0851703c 100644 --- a/services/managers/discord_manager.py +++ b/services/managers/discord_manager.py @@ -226,8 +226,9 @@ class DiscordManager: @staticmethod def delete_user(username): try: - user_id = DiscordAPIManager.get_user_id(username) + user_id = DiscordAPIManager.get_user_id(settings.DISCORD_SERVER_ID, username) DiscordAPIManager.kick_user(settings.DISCORD_SERVER_ID, user_id) + return True except KeyError: #user does not exist return True diff --git a/services/views.py b/services/views.py index 980c3f47..b612d6ce 100755 --- a/services/views.py +++ b/services/views.py @@ -351,9 +351,11 @@ def reset_discord(request): result = DiscordManager.delete_user(authinfo.discord_username) if result: # ensures succesful deletion + AuthServicesInfoManager.update_user_discord_info("", "", request.user) new_result = DiscordManager.add_user(authinfo.discord_username) if new_result: # ensures succesful creation AuthServicesInfoManager.update_user_discord_info(new_result[0], new_result[1], request.user) + update_discord_groups(request.user) return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")