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

Added link to discord server to services page.

Browse Source 
Corrected handling of user deletion to return true if account absent on server.
This commit is contained in:
Adarnof 2015-11-30 23:01:44 +00:00
parent 2da93d4410
commit a6447d3596
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
services/managers/discord_manager.py
View File

@ -168,7 +168,7 @@ class DiscordAPIManager:
def kick_user(server_id, user_id): def kick_user(server_id, user_id):
custom_headers = {'authorization': DiscordAPIManager.get_auth_token()} custom_headers = {'authorization': DiscordAPIManager.get_auth_token()}
path = DISCORD_URL + "/guilds/" + str(server_id) + "/members/" + str(user_id) 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() r.raise_for_status()
@staticmethod @staticmethod
@ -218,7 +218,7 @@ class DiscordManager:
username_clean = DiscordManager.__sanatize_username(username) username_clean = DiscordManager.__sanatize_username(username)
invite_code = DiscordAPIManager.create_invite(settings.DISCORD_SERVER_ID)['code'] invite_code = DiscordAPIManager.create_invite(settings.DISCORD_SERVER_ID)['code']
DiscordAPIManager.register_user(settings.DISCORD_SERVER_ID, username_clean, invite_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 return username_clean, user_id
except: except:
return "", "" return "", ""
@ -226,7 +226,12 @@ class DiscordManager:
@staticmethod @staticmethod
def delete_user(username): def delete_user(username):
try: 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 return True
except: except:
return False return False

1
services/views.py
View File

@ -21,6 +21,7 @@ from celerytask.tasks import update_mumble_groups
from celerytask.tasks import update_forum_groups from celerytask.tasks import update_forum_groups
from celerytask.tasks import update_ipboard_groups from celerytask.tasks import update_ipboard_groups
from celerytask.tasks import update_teamspeak3_groups from celerytask.tasks import update_teamspeak3_groups
from celerytask.tasks import update_discord_groups
from forms import JabberBroadcastForm from forms import JabberBroadcastForm
from forms import FleetFormatterForm from forms import FleetFormatterForm
from util import check_if_user_has_permission from util import check_if_user_has_permission

4
stock/templates/registered/services.html
View File

@ -157,12 +157,14 @@
<th class="text-center">Service</th> <th class="text-center">Service</th>
<th class="text-center">Username</th> <th class="text-center">Username</th>
<th class="text-center">User ID</th> <th class="text-center">User ID</th>
<th class="text-center">Domain</th>
<th class="text-center">Action</th> <th class="text-center">Action</th>
</tr> </tr>
<tr> <tr>
<td class="text-center">Discord</td> <td class="text-center">Discord</td>
<td class="text-center">{{ authinfo.discord_username }}</td> <td class="text-center">{{ authinfo.discord_username }}</td>
<td class="text-center">{{ authinfo.discord_uid }}</td> <td class="text-center">{{ authinfo.discord_uid }}</td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.discord_username "" %} {% ifequal authinfo.discord_username "" %}
<a href="{% url 'auth_activate_discord' %}"> <a href="{% url 'auth_activate_discord' %}">
@ -329,12 +331,14 @@
<th class="text-center">Service</th> <th class="text-center">Service</th>
<th class="text-center">Username</th> <th class="text-center">Username</th>
<th class="text-center">User ID</th> <th class="text-center">User ID</th>
<th class="text-center">Domain</th>
<th class="text-center">Action</th> <th class="text-center">Action</th>
</tr> </tr>
<tr> <tr>
<td class="text-center">Discord</td> <td class="text-center">Discord</td>
<td class="text-center">{{ authinfo.discord_username }}</td> <td class="text-center">{{ authinfo.discord_username }}</td>
<td class="text-center">{{ authinfo.discord_uid }}</td> <td class="text-center">{{ authinfo.discord_uid }}</td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center"> <td class="text-center">
{% ifequal authinfo.discord_username "" %} {% ifequal authinfo.discord_username "" %}
<a href="{% url 'auth_activate_discord' %}"> <a href="{% url 'auth_activate_discord' %}">

1
util/context_processors.py
View File

@ -43,4 +43,5 @@ def domain_url(request):
'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD, 'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD,
'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL, 'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL,
'JACK_KNIFE_URL': settings.JACK_KNIFE_URL, 'JACK_KNIFE_URL': settings.JACK_KNIFE_URL,
'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID,
'CURRENT_UTC_TIME': timezone.now()} 'CURRENT_UTC_TIME': timezone.now()}