mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-10 13:00:16 +02:00
Moved alliance/corp blue status update logic within block verifying corp standings exist
This commit is contained in:
parent
d8f4cfb3c9
commit
b36890ea9b
@ -367,19 +367,23 @@ def run_corp_update():
|
|||||||
blue_info['ticker'],
|
blue_info['ticker'],
|
||||||
blue_info['members']['current'], True, blue_alliance)
|
blue_info['members']['current'], True, blue_alliance)
|
||||||
|
|
||||||
# Update all allinace info's
|
# Update all allinace info's
|
||||||
for all_alliance_info in EveManager.get_all_alliance_info():
|
for all_alliance_info in EveManager.get_all_alliance_info():
|
||||||
all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
|
all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id)
|
||||||
if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID):
|
if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID):
|
||||||
EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'],
|
EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'],
|
||||||
all_alliance_api_info['member_count'], False)
|
all_alliance_api_info['member_count'], False)
|
||||||
elif standing_level in corp_standings:
|
elif standing_level in corp_standings:
|
||||||
if int(all_alliance_info.alliance_id) in corp_standings[standing_level]:
|
if int(all_alliance_info.alliance_id) in corp_standings[standing_level]:
|
||||||
if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][
|
if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][
|
||||||
'standing']) >= settings.BLUE_STANDING:
|
'standing']) >= settings.BLUE_STANDING:
|
||||||
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
||||||
all_alliance_api_info['executor_id'],
|
all_alliance_api_info['executor_id'],
|
||||||
all_alliance_api_info['member_count'], True)
|
all_alliance_api_info['member_count'], True)
|
||||||
|
else:
|
||||||
|
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
||||||
|
all_alliance_api_info['executor_id'],
|
||||||
|
all_alliance_api_info['member_count'], False)
|
||||||
else:
|
else:
|
||||||
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
||||||
all_alliance_api_info['executor_id'],
|
all_alliance_api_info['executor_id'],
|
||||||
@ -388,42 +392,38 @@ def run_corp_update():
|
|||||||
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
||||||
all_alliance_api_info['executor_id'],
|
all_alliance_api_info['executor_id'],
|
||||||
all_alliance_api_info['member_count'], False)
|
all_alliance_api_info['member_count'], False)
|
||||||
else:
|
|
||||||
EveManager.update_alliance_info(all_alliance_api_info['id'],
|
|
||||||
all_alliance_api_info['executor_id'],
|
|
||||||
all_alliance_api_info['member_count'], False)
|
|
||||||
|
|
||||||
# Update corp infos
|
# Update corp infos
|
||||||
for all_corp_info in EveManager.get_all_corporation_info():
|
for all_corp_info in EveManager.get_all_corporation_info():
|
||||||
alliance = None
|
alliance = None
|
||||||
corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id)
|
corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id)
|
||||||
if corpinfo['alliance']['id'] is not None:
|
if corpinfo['alliance']['id'] is not None:
|
||||||
alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id'])
|
alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id'])
|
||||||
|
|
||||||
if alliance is not None and all_corp_info.alliance is not None:
|
if alliance is not None and all_corp_info.alliance is not None:
|
||||||
|
|
||||||
if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID):
|
if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID):
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False)
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False)
|
||||||
elif int(alliance.alliance_id) in corp_standings[standing_level]:
|
elif int(alliance.alliance_id) in corp_standings[standing_level]:
|
||||||
if int(corp_standings[standing_level][int(alliance.alliance_id)][
|
if int(corp_standings[standing_level][int(alliance.alliance_id)][
|
||||||
'standing']) >= settings.BLUE_STANDING:
|
'standing']) >= settings.BLUE_STANDING:
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
||||||
True)
|
True)
|
||||||
|
else:
|
||||||
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
||||||
|
False)
|
||||||
else:
|
else:
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
||||||
False)
|
False)
|
||||||
else:
|
else:
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance,
|
if int(all_corp_info.corporation_id) in corp_standings[standing_level]:
|
||||||
False)
|
if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][
|
||||||
else:
|
'standing']) >= settings.BLUE_STANDING:
|
||||||
if int(all_corp_info.corporation_id) in corp_standings[standing_level]:
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
|
||||||
if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][
|
else:
|
||||||
'standing']) >= settings.BLUE_STANDING:
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True)
|
|
||||||
else:
|
else:
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
|
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
|
||||||
else:
|
|
||||||
EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False)
|
|
||||||
|
|
||||||
# Remove irrelevent corp and alliance models
|
# Remove irrelevent corp and alliance models
|
||||||
# Check the corps
|
# Check the corps
|
||||||
|
Loading…
x
Reference in New Issue
Block a user