eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

eRepublik has moved citizen contributions to different campaign list endpoint

Browse Source
This commit is contained in:
Eriks K 2020-05-14 14:07:30 +03:00
parent 4cfe25b0b1
commit f64a9dc709
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -5,7 +5,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = 'eriks@72.lv' __email__ = 'eriks@72.lv'
__version__ = '0.20.0' __version__ = '0.20.0'
__commit_id__ = "c094ef2" __commit_id__ = "4cfe25b"
from erepublik import classes, utils from erepublik import classes, utils
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

3
erepublik/access_points.py
View File

@ -380,6 +380,9 @@ class ErepublikMilitaryAPI(CitizenBaseAPI):
def _get_military_campaigns_json_list(self) -> Response: def _get_military_campaigns_json_list(self) -> Response:
return self.get("{}/military/campaignsJson/list".format(self.url)) return self.get("{}/military/campaignsJson/list".format(self.url))
def _get_military_campaigns_json_citizen(self) -> Response:
return self.get("{}/military/campaignsJson/citizen".format(self.url))
def _get_military_unit_data(self, unit_id: int, **kwargs) -> Response: def _get_military_unit_data(self, unit_id: int, **kwargs) -> Response:
params = {"groupId": unit_id, "panel": "members", **kwargs} params = {"groupId": unit_id, "panel": "members", **kwargs}
return self.get("{}/military/military-unit-data/".format(self.url), params=params) return self.get("{}/military/military-unit-data/".format(self.url), params=params)

19
erepublik/citizen.py
View File

@ -1283,7 +1283,7 @@ class CitizenMedia(BaseCitizen):
try: try:
article_id = int(resp.history[1].url.split("/")[-3]) article_id = int(resp.history[1].url.split("/")[-3])
self._report_action("ARTICLE_PUBLISH", f"Published new article \"{title}\" ({article_id})", **data) self._report_action("ARTICLE_PUBLISH", f"Published new article \"{title}\" ({article_id})", **data)
except: except: # noqa
article_id = 0 article_id = 0
return article_id return article_id
else: else:
@ -1441,20 +1441,21 @@ class CitizenMilitary(CitizenTravel):
other_battles_air: List[int] = [] other_battles_air: List[int] = []
other_battles_ground: List[int] = [] other_battles_ground: List[int] = []
ret_battles = [] ret_battles: List[int] = []
if sort_by_time: if sort_by_time:
battle_list = sorted(self.all_battles.values(), key=lambda b: b.start) battle_list = sorted(self.all_battles.values(), key=lambda b: b.start)
battle_list.reverse() battle_list.reverse()
else: else:
battle_list = sorted(self.all_battles.values(), key=lambda b: b.id) battle_list = sorted(self.all_battles.values(), key=lambda b: b.id)
contributions: List[Dict[str, int]] = self._get_military_campaigns_json_citizen().json().get('contributions', [])
contributions.sort(key=lambda b: -b.get('damage'))
ret_battles += [int(b.get('battle_id', 0)) for b in contributions if b.get('battle_id')]
for battle in battle_list: for battle in battle_list:
battle_sides = [battle.invader.id, battle.defender.id] battle_sides = [battle.invader.id, battle.defender.id]
if battle.id in ret_battles:
# Previous battles continue
if self.__last_war_update_data.get("citizen_contribution"):
battle_id = self.__last_war_update_data.get("citizen_contribution")[0].get("battle_id", 0)
ret_battles.append(battle_id)
# CS Battles # CS Battles
elif self.details.citizenship in battle_sides: elif self.details.citizenship in battle_sides:
if battle.is_air: if battle.is_air:
@ -2145,7 +2146,7 @@ class CitizenTasks(BaseCitizen):
ret = self._post_main_buy_gold_items('gold', "TrainingContract2", 1) ret = self._post_main_buy_gold_items('gold', "TrainingContract2", 1)
try: try:
extra = ret.json() extra = ret.json()
except: except: # noqa
extra = {} extra = {}
self._report_action("ECONOMY_TG_CONTRACT", f"Bought TG Contract", **extra) self._report_action("ECONOMY_TG_CONTRACT", f"Bought TG Contract", **extra)
return ret return ret