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

Merge branch 'master' of github.com:eeriks/erepublik

Browse Source
This commit is contained in:
Eriks K 2021-08-18 09:20:38 +03:00
commit fad6d4316d
4 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/__init__.py
View File

@ -4,7 +4,7 @@
__author__ = """Eriks Karls""" __author__ = """Eriks Karls"""
__email__ = "eriks@72.lv" __email__ = "eriks@72.lv"
__version__ = "0.25.1.2" __version__ = "0.25.1.5"
from erepublik.citizen import Citizen from erepublik.citizen import Citizen

13
erepublik/citizen.py
View File

@ -180,21 +180,10 @@ class BaseCitizen(access_points.CitizenAPI):
ugly_js_match = re.search(r'"promotions":\s*(\[{?.*?}?])', html) ugly_js_match = re.search(r'"promotions":\s*(\[{?.*?}?])', html)
ugly_js = ugly_js_match.group(1) if ugly_js_match else "null" ugly_js = ugly_js_match.group(1) if ugly_js_match else "null"
promos = utils.json_loads(utils.normalize_html_json(ugly_js)) promos = utils.json_loads(utils.normalize_html_json(ugly_js))
if promos is None:
self.promos = {} self.promos = {}
else: if promos:
self.promos = {k: v for k, v in self.promos.items() if v > self.now} self.promos = {k: v for k, v in self.promos.items() if v > self.now}
send_mail = False
for promo in promos:
promo_name = promo.get("id")
expire = utils.localize_timestamp(int(promo.get("expiresAt")))
if promo_name not in self.promos:
send_mail = True
self.promos.update({promo_name: expire})
if send_mail:
active_promos = []
for kind, time_until in self.promos.items(): for kind, time_until in self.promos.items():
active_promos.append(f"{kind} active until {time_until}")
self.reporter.report_promo(kind, time_until) self.reporter.report_promo(kind, time_until)
new_date = re.search(r"var new_date = '(\d*)';", html) new_date = re.search(r"var new_date = '(\d*)';", html)

2
setup.cfg
View File

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.25.1.2 current_version = 0.25.1.5
commit = True commit = True
tag = True tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?

2
setup.py
View File

@ -50,6 +50,6 @@ setup(
test_suite="tests", test_suite="tests",
tests_require=test_requirements, tests_require=test_requirements,
url="https://github.com/eeriks/erepublik/", url="https://github.com/eeriks/erepublik/",
version="0.25.1.2", version="0.25.1.5",
zip_safe=False, zip_safe=False,
) )