mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-08 08:06:20 +01:00
Added link to discord server to services page.
Corrected handling of user deletion to return true if account absent on server.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user