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

Fixup

Browse Source
This commit is contained in:
Eriks K 2022-02-04 00:41:13 +02:00
parent 3ee9811b8f
commit 903d596064
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/citizen.py
View File

@ -327,7 +327,7 @@ class BaseCitizen(access_points.CitizenAPI):
r"((?P<amount>\d+) item\(s\) )?[eE]xpires? on Day (?P<eday>\d,\d{3}), (?P<time>\d\d:\d\d)",
_expire_value,
).groupdict()
eday = utils.date_from_eday(int(_data["eday"].replace(",", "")))
eday = utils.date_from_eday(int(_data["eday"].replace(",", ""))).date()
dt = constants.erep_tz.localize(datetime.combine(eday, time(*[int(_) for _ in _data["time"].split(":")])))
return {"amount": _data.get("amount"), "expiration": dt}

1
erepublik/constants.py
View File

@ -121,7 +121,6 @@ class Industries:
14: "WRM q3",
15: "WRM q4",
16: "WRM q5",
17: "houseRaw",
18: "houseRaw",
19: "HRM q2",
20: "HRM q3",

2
erepublik/utils.py
View File

@ -93,7 +93,7 @@ def eday_from_date(date: Union[datetime.date, datetime.datetime] = None) -> int:
return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
def date_from_eday(eday: int) -> datetime.date:
def date_from_eday(eday: int) -> datetime.datetime:
return localize_dt(datetime.date(2007, 11, 20)) + datetime.timedelta(days=eday)