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

Found awards switch to ASCII friendlier multiplier char - ✕ -> x

Browse Source 
Localize max div end time
This commit is contained in:
Eriks Karls 2019-08-05 11:55:39 +03:00
parent 6af9675c39
commit 3fa7d097fe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erepublik/citizen.py
View File

@ -256,7 +256,7 @@ class Citizen(classes.CitizenAPI):
continue continue
if data: if data:
msgs = ["{count} ✕ {kind}, totaling {} {currency}\n" msgs = ["{count} x {kind}, totaling {} {currency}\n"
"{about}".format(d["count"] * d["reward"], **d) for d in data.values()] "{about}".format(d["count"] * d["reward"], **d) for d in data.values()]
self.write_log("Found awards: {}".format("\n".join(msgs))) self.write_log("Found awards: {}".format("\n".join(msgs)))
@ -1872,7 +1872,7 @@ class Citizen(classes.CitizenAPI):
def write_on_country_wall(self, message: str) -> bool: def write_on_country_wall(self, message: str) -> bool:
self._get_main() self._get_main()
post_to_wall_as = re.findall(r"""id="post_to_country_as".*?<option value="(\d?)">.*?</option>.*</select>""", post_to_wall_as = re.findall(r'id="post_to_country_as".*?<option value="(\d?)">.*?</option>.*</select>',
self.r.text, re.S | re.M) self.r.text, re.S | re.M)
r = self._post_country_post_create(message, max(post_to_wall_as, key=int) if post_to_wall_as else 0) r = self._post_country_post_create(message, max(post_to_wall_as, key=int) if post_to_wall_as else 0)
return r.json() return r.json()

2
erepublik/classes.py
View File

@ -1042,7 +1042,7 @@ class Battle(object):
if data.get('end'): if data.get('end'):
end = datetime.datetime.fromtimestamp(data.get('end'), tz=utils.erep_tz) end = datetime.datetime.fromtimestamp(data.get('end'), tz=utils.erep_tz)
else: else:
end = datetime.datetime.max end = utils.localize_dt(utils.good_timedelta(datetime.datetime.max, datetime.timedelta(days=1)))
battle_div = BattleDivision( battle_div = BattleDivision(
end=end, epic=data.get('epic_type') in [1, 5], end=end, epic=data.get('epic_type') in [1, 5],