From b5973ef815de22bc47828ee153237897e940dc3c Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 23 Jul 2021 10:29:46 +0300 Subject: [PATCH 1/5] =?UTF-8?q?Bump=20version:=200.25.1.2=20=E2=86=92=200.?= =?UTF-8?q?25.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 1bdccfa..8e4edd7 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.25.1.2" +__version__ = "0.25.1.3" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index 8fcb5c2..d1e1627 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.25.1.2 +current_version = 0.25.1.3 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index 2be39b1..bb7263a 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.25.1.2", + version="0.25.1.3", zip_safe=False, ) From df4ed4fceb99b7e87d05cec4160eec87bf5aff96 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 23 Jul 2021 11:14:27 +0300 Subject: [PATCH 2/5] bugfix --- erepublik/citizen.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 845feb6..6779bcc 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -180,9 +180,8 @@ class BaseCitizen(access_points.CitizenAPI): ugly_js_match = re.search(r'"promotions":\s*(\[{?.*?}?])', html) ugly_js = ugly_js_match.group(1) if ugly_js_match else "null" promos = utils.json_loads(utils.normalize_html_json(ugly_js)) - if promos is None: - self.promos = {} - else: + self.promos = {} + if promos: self.promos = {k: v for k, v in self.promos.items() if v > self.now} send_mail = False for promo in promos: From dd6e22af51876519f4138db4cbe68f9959c35720 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 23 Jul 2021 11:14:50 +0300 Subject: [PATCH 3/5] =?UTF-8?q?Bump=20version:=200.25.1.3=20=E2=86=92=200.?= =?UTF-8?q?25.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 8e4edd7..76a1461 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.25.1.3" +__version__ = "0.25.1.4" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index d1e1627..ba63e2a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.25.1.3 +current_version = 0.25.1.4 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index bb7263a..36df734 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.25.1.3", + version="0.25.1.4", zip_safe=False, ) From 8d096b2770a65deb720b1df8d9ebbfe7267126e6 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 23 Jul 2021 11:53:02 +0300 Subject: [PATCH 4/5] Promo bugfix --- erepublik/citizen.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 6779bcc..c4749c8 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -183,17 +183,7 @@ class BaseCitizen(access_points.CitizenAPI): self.promos = {} if promos: 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(): - active_promos.append(f"{kind} active until {time_until}") self.reporter.report_promo(kind, time_until) new_date = re.search(r"var new_date = '(\d*)';", html) From cd7065b11aacc717e0c46680b5921dd754fc55c3 Mon Sep 17 00:00:00 2001 From: KEriks Date: Fri, 23 Jul 2021 11:53:19 +0300 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20version:=200.25.1.4=20=E2=86=92=200.?= =?UTF-8?q?25.1.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erepublik/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 76a1461..86f5418 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -4,7 +4,7 @@ __author__ = """Eriks Karls""" __email__ = "eriks@72.lv" -__version__ = "0.25.1.4" +__version__ = "0.25.1.5" from erepublik.citizen import Citizen diff --git a/setup.cfg b/setup.cfg index ba63e2a..7a327bc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.25.1.4 +current_version = 0.25.1.5 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)\.?(?P\d+)? diff --git a/setup.py b/setup.py index 36df734..71476c0 100644 --- a/setup.py +++ b/setup.py @@ -50,6 +50,6 @@ setup( test_suite="tests", tests_require=test_requirements, url="https://github.com/eeriks/erepublik/", - version="0.25.1.4", + version="0.25.1.5", zip_safe=False, )