Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #156 from TrentBartlem/patch-3

Browse Source 
Only sync TS3 if it's enabled
Closes #154
This commit is contained in:
Adarnof 2016-01-02 17:52:35 -05:00
commit e357de3cab
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
celerytask/tasks.py
View File

@ -46,6 +46,9 @@ def disable_blue_member(user):
deactivate_services(user) deactivate_services(user)
AuthServicesInfoManager.update_is_blue(False, user) AuthServicesInfoManager.update_is_blue(False, user)
def is_teamspeak3_active():
return settings.ENABLE_AUTH_TEAMSPEAK3 or settings.ENABLE_BLUE_TEAMSPEAK3
def update_jabber_groups(user): def update_jabber_groups(user):
syncgroups = SyncGroupCache.objects.filter(user=user) syncgroups = SyncGroupCache.objects.filter(user=user)
authserviceinfo = AuthServicesInfo.objects.get(user=user) authserviceinfo = AuthServicesInfo.objects.get(user=user)
@ -109,7 +112,7 @@ def update_teamspeak3_groups(user):
for filtered_group in filtered_groups: for filtered_group in filtered_groups:
for ts_group in filtered_group.ts_group.all(): for ts_group in filtered_group.ts_group.all():
groups[ts_group.ts_group_name] = ts_group.ts_group_id groups[ts_group.ts_group_name] = ts_group.ts_group_id
if (is_teamspeak3_active()):
Teamspeak3Manager.update_groups(authserviceinfo.teamspeak3_uid, groups) Teamspeak3Manager.update_groups(authserviceinfo.teamspeak3_uid, groups)
def update_discord_groups(user): def update_discord_groups(user):
@ -210,6 +213,7 @@ def remove_from_databases(user, groups, syncgroups):
@periodic_task(run_every=crontab(minute="*/1")) @periodic_task(run_every=crontab(minute="*/1"))
def run_databaseUpdate(): def run_databaseUpdate():
users = User.objects.all() users = User.objects.all()
if (is_teamspeak3_active()):
Teamspeak3Manager._sync_ts_group_db() Teamspeak3Manager._sync_ts_group_db()
for user in users: for user in users:
groups = user.groups.all() groups = user.groups.all()