diff --git a/services/managers/discord_manager.py b/services/managers/discord_manager.py index d957052f..d0f61016 100644 --- a/services/managers/discord_manager.py +++ b/services/managers/discord_manager.py @@ -168,7 +168,7 @@ class DiscordAPIManager: def kick_user(server_id, user_id): custom_headers = {'authorization': DiscordAPIManager.get_auth_token()} path = DISCORD_URL + "/guilds/" + str(server_id) + "/members/" + str(user_id) - r = requests.delete(path, custom_headers) + r = requests.delete(path, headers=custom_headers) r.raise_for_status() @staticmethod @@ -218,7 +218,7 @@ class DiscordManager: username_clean = DiscordManager.__sanatize_username(username) invite_code = DiscordAPIManager.create_invite(settings.DISCORD_SERVER_ID)['code'] DiscordAPIManager.register_user(settings.DISCORD_SERVER_ID, username_clean, invite_code) - user_id = DiscordAPIManager.get_user_id(username_clean) + user_id = DiscordAPIManager.get_user_id(settings.DISCORD_SERVER_ID, username_clean) return username_clean, user_id except: return "", "" @@ -226,7 +226,12 @@ class DiscordManager: @staticmethod def delete_user(username): try: - DiscordAPIManager.kick_user(settings.DISCORD_SERVER_ID, username) + user_id = DiscordAPIManager.get_user_id(username) + except: + #user does not exist + return True + try: + DiscordAPIManager.kick_user(settings.DISCORD_SERVER_ID, user_id) return True except: return False diff --git a/services/views.py b/services/views.py index ca1885bd..a566fe63 100755 --- a/services/views.py +++ b/services/views.py @@ -21,6 +21,7 @@ from celerytask.tasks import update_mumble_groups from celerytask.tasks import update_forum_groups from celerytask.tasks import update_ipboard_groups from celerytask.tasks import update_teamspeak3_groups +from celerytask.tasks import update_discord_groups from forms import JabberBroadcastForm from forms import FleetFormatterForm from util import check_if_user_has_permission diff --git a/stock/templates/registered/services.html b/stock/templates/registered/services.html index 5de97501..c26b5ced 100755 --- a/stock/templates/registered/services.html +++ b/stock/templates/registered/services.html @@ -157,12 +157,14 @@ Service Username User ID + Domain Action Discord {{ authinfo.discord_username }} {{ authinfo.discord_uid }} + https://discordapp.com {% ifequal authinfo.discord_username "" %} @@ -329,12 +331,14 @@ Service Username User ID + Domain Action Discord {{ authinfo.discord_username }} {{ authinfo.discord_uid }} + https://discordapp.com {% ifequal authinfo.discord_username "" %} diff --git a/util/context_processors.py b/util/context_processors.py index b055737b..3ddbbe92 100755 --- a/util/context_processors.py +++ b/util/context_processors.py @@ -43,4 +43,5 @@ def domain_url(request): 'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD, 'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL, 'JACK_KNIFE_URL': settings.JACK_KNIFE_URL, + 'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID, 'CURRENT_UTC_TIME': timezone.now()}