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

Merge branch 'master' of https://github.com/R4stl1n/allianceauth

Browse Source
This commit is contained in:
Adarnof 2015-12-10 02:55:41 +00:00
commit ab4f00fc1e
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
celerytask/tasks.py
View File

@ -173,7 +173,6 @@ def add_to_databases(user, groups, syncgroups):
if syncgroups.filter(groupname=group.name).filter(servicename="discord").exists() is not True: if syncgroups.filter(groupname=group.name).filter(servicename="discord").exists() is not True:
create_syncgroup_for_user(user, group.name, "discord") create_syncgroup_for_user(user, group.name, "discord")
update_discord_groups(user) update_discord_groups(user)
print 'add'
def remove_from_databases(user, groups, syncgroups): def remove_from_databases(user, groups, syncgroups):
@ -205,7 +204,6 @@ def remove_from_databases(user, groups, syncgroups):
update_teamspeak3_groups(user) update_teamspeak3_groups(user)
if authserviceinfo.discord_uid and authserviceinfo.discord_uid != "": if authserviceinfo.discord_uid and authserviceinfo.discord_uid != "":
update_discord_groups(user) update_discord_groups(user)
print 'remove'
# Run every minute # Run every minute

9
services/managers/discord_manager.py
View File

@ -287,12 +287,11 @@ class DiscordManager:
if len(groups) == 0: if len(groups) == 0:
group_ids = [] group_ids = []
else: else:
roles = api.get_roles()
for g in groups: for g in groups:
if g in roles: try:
group_ids.append(roles[g]['id']) group_id = api.get_group_id(g)
else: group_ids.append(group_id)
# need to create role on server for group except:
group_ids.append(DiscordManager.create_group(g)) group_ids.append(DiscordManager.create_group(g))
api.set_roles(user_id, group_ids) api.set_roles(user_id, group_ids)