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

Addresses #110

Browse Source 
Corrected logic attempting to retrieve data from nonexistant character model.
Also added logic to create character models for new characters on existing API keys.
This commit is contained in:
Adarnof 2015-12-02 05:56:18 +00:00
parent 58bcddc431
commit f899a76b5f
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
celerytask/tasks.py
View File

@ -34,6 +34,12 @@ def disable_alliance_member(user, char_id):
EveManager.get_character_by_id(char_id).corporation_name)) EveManager.get_character_by_id(char_id).corporation_name))
deactivate_services(user) deactivate_services(user)
def disable_expired_member(user):
deactivate_services(user)
user.user_permissions.clear()
user.groups.clear()
user.save()
def disable_blue_member(user): def disable_blue_member(user):
remove_member_permission(user, 'blue_member') remove_member_permission(user, 'blue_member')
remove_user_from_group(user, settings.DEFAULT_BLUE_GROUP) remove_user_from_group(user, settings.DEFAULT_BLUE_GROUP)
@ -167,6 +173,7 @@ 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):
@ -198,6 +205,7 @@ 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
@ -257,6 +265,13 @@ def run_api_refresh():
characters = EveApiManager.get_characters_from_api(api_key_pair.api_id, characters = EveApiManager.get_characters_from_api(api_key_pair.api_id,
api_key_pair.api_key) api_key_pair.api_key)
EveManager.update_characters_from_list(characters) EveManager.update_characters_from_list(characters)
new_character = False
for char in characters.result:
# Ensure we have a model for all characters on key
if not EveManager.check_if_character_exist(characters.result[char]['name']):
new_character = True
if new_character:
EveManager.create_characters_from_list(characters, user, api_key_pair.api_key)
valid_key = True valid_key = True
else: else:
EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id) EveManager.delete_characters_by_api_id(api_key_pair.api_id, user.id)
@ -319,12 +334,8 @@ def run_api_refresh():
else: else:
deactivate_services(user) deactivate_services(user)
else: else:
if check_if_user_has_permission(user, "member"): # nuke it, the hard way
disable_alliance_member(user, authserviceinfo.main_char_id) disable_expired_member(user)
elif check_if_user_has_permission(user, "blue_member"):
disable_blue_member(user)
else:
deactivate_services(user)
else: else:
# disable accounts with invalid keys # disable accounts with invalid keys
if check_if_user_has_permission(user, "member"): if check_if_user_has_permission(user, "member"):