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

erepublik/__init__.py

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

erepublik/citizen.py

@@ -180,21 +180,10 @@ 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 = {}
-            self.promos = {}
+        if promos:
-        else:
             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)

setup.cfg

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

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.5",
     zip_safe=False,
 )