Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-08 16:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manual conflict resoltuion for pull request #98

Browse Source
This commit is contained in:
Adarnof
2015-11-25 02:59:13 +00:00
parent fbabc97e74
commit 35277b7f33
6 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/managers/eve_api_manager.py
View File

@@ -81,13 +81,24 @@ class EveApiManager():
api = evelink.api.API(api_key=(api_id, api_key))
account = evelink.account.Account(api=api)
info = account.key_info()
return info[0]['access_mask'] == 268435455
return info[0]['access_mask'] >= int(settings.MEMBER_API_MASK)
except evelink.api.APIError as error:
print error
return False
@staticmethod
def check_blue_api_is_full(api_id, api_key):
try:
api = evelink.api.API(api_key=(api_id, api_key))
account = evelink.account.Account(api=api)
info = account.key_info()
return info[0]['access_mask'] >= int(settings.BLUE_API_MASK)
except evelink.api.APIError as error:
print error
@staticmethod
def get_api_info(api_id, api_key):