Bump version: 0.20.3.8 → 0.20.3.9

erepublik/__init__.py

@@ -4,10 +4,9 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.20.2'
-__commit_id__ = "bcb27da"
+__version__ = '0.20.3.9'
 
-from erepublik import classes, utils
+from erepublik import classes, utils, constants
 from erepublik.citizen import Citizen
 
-__all__ = ["classes", "utils", "Citizen"]
+__all__ = ["classes", "utils", "Citizen", ]

erepublik/access_points.py

@@ -5,7 +5,7 @@ from typing import Any, Dict, List, Mapping, Union
 
 from requests import Response, Session
 
-from erepublik import utils
+from . import constants, utils
 
 __all__ = ['SlowRequests', 'CitizenAPI']
 
@@ -45,7 +45,7 @@ class SlowRequests(Session):
         })
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return dict(last_time=self.last_time, timeout=self.timeout, user_agent=self.headers['User-Agent'],
                     request_log_name=self.request_log_name, debug=self.debug)
 
@@ -450,6 +450,9 @@ class ErepublikPoliticsAPI(CitizenBaseAPI):
         data = dict(_token=self.token, presentation=presentation)
         return self.post("{}/candidate-for-congress".format(self.url), data=data)
 
+    def _get_presidential_elections(self, country_id: int, timestamp: int) -> Response:
+        return self.get(f"{self.url}/main/presidential-elections/{country_id}/{timestamp}")
+
 
 class ErepublikPresidentAPI(CitizenBaseAPI):
     def _post_wars_attack_region(self, war_id: int, region_id: int, region_name: str) -> Response:
@@ -458,13 +461,13 @@ class ErepublikPresidentAPI(CitizenBaseAPI):
 
     def _post_new_war(self, self_country_id: int, attack_country_id: int, debate: str = "") -> Response:
         data = dict(requirments=1, _token=self.token, debate=debate,
-                    countryNameConfirm=utils.COUNTRY_LINK[attack_country_id])
-        return self.post("{}/{}/new-war".format(self.url, utils.COUNTRY_LINK[self_country_id]), data=data)
+                    countryNameConfirm=constants.COUNTRIES[attack_country_id].link)
+        return self.post("{}/{}/new-war".format(self.url, constants.COUNTRIES[self_country_id].link), data=data)
 
     def _post_new_donation(self, country_id: int, amount: int, org_name: str, debate: str = "") -> Response:
         data = dict(requirments=1, _token=self.token, debate=debate, currency=1, value=amount, commit='Propose',
                     type_name=org_name)
-        return self.post("{}/{}/new-donation".format(self.url, utils.COUNTRY_LINK[country_id]), data=data)
+        return self.post("{}/{}/new-donation".format(self.url, constants.COUNTRIES[country_id].link), data=data)
 
 
 class ErepublikProfileAPI(CitizenBaseAPI):
@@ -565,6 +568,10 @@ class ErepublikProfileAPI(CitizenBaseAPI):
         data = dict(_token=self.token, rewardId=reward_id)
         return self.post("{}/main/weekly-challenge-collect-reward".format(self.url), data=data)
 
+    def _post_main_profile_update(self, action: str, params: str):
+        data = {"action": action, "params": params, "_token": self.token}
+        return self.post(f"{self.url}/main/profile-update", data=data)
+
 
 class ErepublikTravelAPI(CitizenBaseAPI):
     def _post_main_travel(self, check: str, **kwargs) -> Response:

erepublik/classes.py

@@ -6,14 +6,10 @@ from typing import Any, Dict, List, NamedTuple, Optional, Tuple, Union
 
 from requests import Response, Session, post
 
-from erepublik import utils
-from erepublik.utils import json
+from . import utils, constants
 
-INDUSTRIES = {1: "Food", 2: "Weapons", 4: "House", 23: "Aircraft",
-              7: "FRM q1", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
-              12: "WRM q1", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
-              18: "HRM q1", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
-              24: "ARM q1", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5", }
+__all__ = ['Battle', 'BattleDivision', 'BattleSide', 'Company', 'Config', 'Details', 'Energy', 'ErepublikException',
+           'Holding', 'MyCompanies', 'MyJSONEncoder', 'OfferItem', 'Politics', 'Reporter', 'TelegramBot']
 
 
 class ErepublikException(Exception):
@@ -32,7 +28,8 @@ class Holding:
     region: int
     companies: List["Company"]
 
-    def __init__(self, _id: int, region: int):
+    def __init__(self, _id: int, region: int, citizen):
+        self.citizen = citizen
         self.id: int = _id
         self.region: int = region
         self.companies: List["Company"] = list()
@@ -63,6 +60,24 @@ class Holding:
                 wrm += company.raw_usage
         return dict(frm=frm, wrm=wrm)
 
+    def get_wam_companies(self, raw_factory: bool = None):
+        raw = []
+        factory = []
+        for company in self.wam_companies:
+            if not company.already_worked and not company.cannot_wam_reason == "war":
+                if company.is_raw:
+                    raw.append(company)
+                else:
+                    factory.append(company)
+        if raw_factory is not None and not raw_factory:
+            return factory
+        elif raw_factory is not None and raw_factory:
+            return raw
+        elif raw_factory is None:
+            return raw + factory
+        else:
+            raise ErepublikException("raw_factory should be True/False/None")
+
     def __str__(self):
         name = f"Holding (#{self.id}) with {len(self.companies)} "
         if len(self.companies) % 10 == 1:
@@ -75,7 +90,7 @@ class Holding:
         return str(self)
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return dict(name=str(self), id=self.id, region=self.region, companies=self.companies, wam_count=self.wam_count)
 
 
@@ -172,7 +187,7 @@ class Company:
         return self._sort_keys != other._sort_keys
 
     def __str__(self):
-        name = f"(#{self.id:>9d}) {INDUSTRIES[self.industry]}"
+        name = f"(#{self.id:>9d}) {constants.INDUSTRIES[self.industry]}"
         if not self.is_raw:
             name += f" q{self.quality}"
         return name
@@ -181,12 +196,21 @@ class Company:
         return str(self)
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return dict(name=str(self), holding=self.holding.id, id=self.id, quality=self.quality, is_raw=self.is_raw,
                     raw_usage=self.raw_usage, products_made=self.products_made, wam_enabled=self.wam_enabled,
                     can_wam=self.can_wam, cannot_wam_reason=self.cannot_wam_reason, industry=self.industry,
                     already_worked=self.already_worked, preset_works=self.preset_works)
 
+    def dissolve(self) -> Response:
+        self.holding.citizen.write_log(f"{self} dissolved!")
+        # noinspection PyProtectedMember
+        return self.holding.citizen._post_economy_sell_company(self.id, self.holding.citizen.details.pin, sell=False)
+
+    def upgrade(self, level: int) -> Response:
+        # noinspection PyProtectedMember
+        return self.holding.citizen._post_economy_upgrade_company(self.id, level, self.holding.citizen.details.pin)
+
 
 class MyCompanies:
     work_units: int = 0
@@ -196,7 +220,9 @@ class MyCompanies:
     holdings: Dict[int, Holding]
     companies: List[Company]
 
-    def __init__(self):
+    def __init__(self, citizen):
+        from erepublik import Citizen
+        self.citizen: Citizen = citizen
         self.holdings: Dict[int, Holding] = dict()
         self.companies: List[Company] = list()
         self.next_ot_time = utils.now()
@@ -207,9 +233,10 @@ class MyCompanies:
         """
         for holding in holdings.values():
             if holding.get('id') not in self.holdings:
-                self.holdings.update({int(holding.get('id')): Holding(holding['id'], holding['region_id'])})
+                self.holdings.update(
+                    {int(holding.get('id')): Holding(holding['id'], holding['region_id'], self.citizen)})
         if not self.holdings.get(0):
-            self.holdings.update({0: Holding(0, 0)})  # unassigned
+            self.holdings.update({0: Holding(0, 0, self.citizen)})  # unassigned
 
     def prepare_companies(self, companies: Dict[str, Dict[str, Any]]):
         """
@@ -240,43 +267,8 @@ class MyCompanies:
     def get_total_wam_count(self) -> int:
         return sum([holding.wam_count for holding in self.holdings.values()])
 
-    def get_holding_wam_count(self, holding_id: int, raw_factory=None) -> int:
-        """
-        Returns amount of wam enabled companies in the holding
-        :param holding_id: holding id
-        :param raw_factory: True - only raw, False - only factories, None - both
-        :return: int
-        """
-        return len(self.get_holding_wam_companies(holding_id, raw_factory))
-
-    def get_holding_wam_companies(self, holding_id: int, raw_factory: bool = None) -> List[Company]:
-        """
-        Returns WAM enabled companies in the holding, True - only raw, False - only factories, None - both
-        :param holding_id: holding id
-        :param raw_factory: bool or None
-        :return: list
-        """
-        raw = []
-        factory = []
-        if holding_id in self.holdings:
-            for company in self.holdings[holding_id].wam_companies:
-                if not company.already_worked and not company.cannot_wam_reason == "war":
-                    if company.is_raw:
-                        raw.append(company)
-                    else:
-                        factory.append(company)
-        if raw_factory is not None and not raw_factory:
-            return factory
-        elif raw_factory is not None and raw_factory:
-            return raw
-        elif raw_factory is None:
-            return raw + factory
-        else:
-            raise ErepublikException("raw_factory should be True/False/None")
-
     @staticmethod
     def get_needed_inventory_usage(companies: Union[Company, List[Company]]) -> Decimal:
-
         if isinstance(companies, list):
             return sum([company.products_made * 100 if company.is_raw else 1 for company in companies])
         else:
@@ -294,7 +286,7 @@ class MyCompanies:
         self.companies.clear()
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return dict(name=str(self), work_units=self.work_units, next_ot_time=self.next_ot_time,
                     ff_lockdown=self.ff_lockdown, holdings=self.holdings, company_count=len(self.companies))
 
@@ -363,7 +355,7 @@ class Config:
         self.telegram_token = ""
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return dict(email=self.email, work=self.work, train=self.train, wam=self.wam, ot=self.ot,
                     auto_sell=self.auto_sell, auto_sell_all=self.auto_sell_all, employees=self.employees,
                     fight=self.fight, air=self.air, ground=self.ground, all_in=self.all_in,
@@ -419,6 +411,13 @@ class Energy:
     def available(self):
         return self.recovered + self.recoverable
 
+    @property
+    def as_dict(self):
+        return dict(limit=self.limit, interval=self.interval, recoverable=self.recoverable, recovered=self.recovered,
+                    reference_time=self.reference_time, food_fights=self.food_fights,
+                    is_recoverable_full=self.is_recoverable_full, is_recovered_full=self.is_recovered_full,
+                    is_energy_full=self.is_energy_full, available=self.available)
+
 
 class Details:
     xp = 0
@@ -428,11 +427,11 @@ class Details:
     gold = 0
     next_pp: List[int] = None
     citizen_id = 0
-    citizenship = 0
+    citizenship: constants.Country
     current_region = 0
-    current_country = 0
+    current_country: constants.Country
     residence_region = 0
-    residence_country = 0
+    residence_country: constants.Country
     daily_task_done = False
     daily_task_reward = False
     mayhem_skills = {1: 0, 2: 0, 3: 0, 4: 0, 5: 0, 6: 0, 7: 0, 8: 0, 9: 0, 10: 0, 11: 0, 12: 0, 13: 0, 14: 0, }
@@ -466,6 +465,15 @@ class Details:
             next_level_up = (1 + (self.xp // 10)) * 10
         return next_level_up - self.xp
 
+    @property
+    def as_dict(self):
+        return dict(xp=self.xp, cc=self.cc, pp=self.pp, pin=self.pin, gold=self.gold, next_pp=self.next_pp,
+                    citizen_id=self.citizen_id, citizenship=self.citizenship, current_region=self.current_region,
+                    current_country=self.current_country, residence_region=self.residence_region,
+                    residence_country=self.residence_country, daily_task_done=self.daily_task_done,
+                    daily_task_reward=self.daily_task_reward, mayhem_skills=self.mayhem_skills,
+                    xp_till_level_up=self.xp_till_level_up)
+
 
 class Politics:
     is_party_member: bool = False
@@ -476,6 +484,12 @@ class Politics:
     is_congressman: bool = False
     is_country_president: bool = False
 
+    @property
+    def as_dict(self):
+        return dict(is_party_member=self.is_party_member, party_id=self.party_id, party_slug=self.party_slug,
+                    is_party_president=self.is_party_president, is_congressman=self.is_congressman,
+                    is_country_president=self.is_country_president)
+
 
 class House:
     quality = None
@@ -493,28 +507,35 @@ class House:
 
 class Reporter:
     __to_update: List[Dict[Any, Any]] = None
-    name: str = ""
-    email: str = ""
-    citizen_id: int = 0
     key: str = ""
     allowed: bool = False
 
     @property
-    def __dict__(self):
+    def name(self) -> str:
+        return self.citizen.name
+
+    @property
+    def email(self) -> str:
+        return self.citizen.config.email
+
+    @property
+    def citizen_id(self) -> int:
+        return self.citizen.details.citizen_id
+
+    @property
+    def as_dict(self):
         return dict(name=self.name, email=self.email, citizen_id=self.citizen_id, key=self.key, allowed=self.allowed,
                     queue=self.__to_update)
 
-    def __init__(self):
+    def __init__(self, citizen):
+        self.citizen = citizen
         self._req = Session()
         self.url = "https://api.erep.lv"
         self._req.headers.update({"user-agent": "Bot reporter v2"})
         self.__to_update = []
         self.__registered: bool = False
 
-    def do_init(self, name: str = "", email: str = "", citizen_id: int = 0):
-        self.name: str = name
-        self.email: str = email
-        self.citizen_id: int = citizen_id
+    def do_init(self):
         self.key: str = ""
         self.__update_key()
         self.register_account()
@@ -527,8 +548,10 @@ class Reporter:
         if self.__to_update:
             for unreported_data in self.__to_update:
                 unreported_data.update(player_id=self.citizen_id, key=self.key)
+                unreported_data = utils.json.load(utils.json.dumps(unreported_data, cls=MyJSONEncoder, sort_keys=True))
                 self._req.post("{}/bot/update".format(self.url), json=unreported_data)
             self.__to_update.clear()
+        data = utils.json.loads(utils.json.dumps(data, cls=MyJSONEncoder, sort_keys=True))
         r = self._req.post("{}/bot/update".format(self.url), json=data)
         return r
 
@@ -573,10 +596,11 @@ class Reporter:
     def report_promo(self, kind: str, time_until: datetime.datetime):
         self._req.post(f"{self.url}/promos/add/", data=dict(kind=kind, time_untill=time_until))
 
-    def fetch_battle_priorities(self, country_id: int) -> List[int]:
+    def fetch_battle_priorities(self, country: constants.Country) -> List["Battle"]:
         try:
-            battle_response = self._req.get(f'{self.url}/api/v1/battles/{country_id}')
-            return battle_response.json().get('battle_ids', [])
+            battle_response = self._req.get(f'{self.url}/api/v1/battles/{country.id}')
+            return [self.citizen.all_battles[bid] for bid in battle_response.json().get('battle_ids', []) if
+                    bid in self.citizen.all_battles]
         except:  # noqa
             return []
 
@@ -589,7 +613,7 @@ class Reporter:
             return
 
 
-class MyJSONEncoder(json.JSONEncoder):
+class MyJSONEncoder(utils.json.JSONEncoder):
     def default(self, o):
         from erepublik.citizen import Citizen
         if isinstance(o, Decimal):
@@ -604,8 +628,8 @@ class MyJSONEncoder(json.JSONEncoder):
                         microseconds=o.microseconds, total_seconds=o.total_seconds())
         elif isinstance(o, Response):
             return dict(headers=o.headers.__dict__, url=o.url, text=o.text)
-        elif hasattr(o, '__dict__'):
-            return o.__dict__
+        elif hasattr(o, 'as_dict'):
+            return o.as_dict
         elif isinstance(o, set):
             return list(o)
         elif isinstance(o, Citizen):
@@ -617,28 +641,59 @@ class MyJSONEncoder(json.JSONEncoder):
 
 
 class BattleSide:
-    id: int
     points: int
-    deployed: List[int] = None
-    allies: List[int] = None
+    deployed: List[constants.Country]
+    allies: List[constants.Country]
+    battle: "Battle"
+    country: constants.Country
+    defender: bool
 
-    def __init__(self, country_id: int, points: int, allies: List[int], deployed: List[int]):
-        self.id = country_id
+    def __init__(self, battle: "Battle", country: constants.Country, points: int, allies: List[constants.Country],
+                 deployed: List[constants.Country], defender: bool):
+        self.battle = battle
+        self.country = country
         self.points = points
-        self.allies = [int(ally) for ally in allies]
-        self.deployed = [int(ally) for ally in deployed]
+        self.allies = allies
+        self.deployed = deployed
+        self.defender = defender
+
+    @property
+    def id(self) -> int:
+        return self.country.id
+
+    def __repr__(self):
+        side_text = "Defender" if self.defender else "Invader "
+        return f"<BattleSide: {side_text} {self.country.name}|{self.points:02d}p>"
+
+    def __str__(self):
+        side_text = "Defender" if self.defender else "Invader "
+        return f"{side_text} {self.country.name} - {self.points:02d} points"
+
+    def __format__(self, format_spec):
+        return self.country.iso
+
+    @property
+    def as_dict(self):
+        return dict(points=self.points, country=self.country, defender=self.defender, allies=self.allies,
+                    deployed=self.deployed, battle=repr(self.battle))
 
 
 class BattleDivision:
+    id: int
     end: datetime.datetime
     epic: bool
     dom_pts: Dict[str, int]
     wall: Dict[str, Union[int, float]]
-    battle_zone_id: int
     def_medal: Dict[str, int]
     inv_medal: Dict[str, int]
     terrain: int
     div: int
+    battle: "Battle"
+
+    @property
+    def as_dict(self):
+        return dict(id=self.id, division=self.div, terrain=(self.terrain, self.terrain_display), wall=self.wall,
+                    epic=self.epic, battle=str(self.battle), end=self.div_end)
 
     @property
     def is_air(self):
@@ -648,8 +703,8 @@ class BattleDivision:
     def div_end(self) -> bool:
         return utils.now() >= self.end
 
-    def __init__(self, div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int, wall_dom: float,
-                 terrain_id: int = 0):
+    def __init__(self, battle: "Battle", div_id: int, end: datetime.datetime, epic: bool, div: int, wall_for: int,
+                 wall_dom: float, terrain_id: int = 0):
         """Battle division helper class
 
         :type div_id: int
@@ -660,8 +715,8 @@ class BattleDivision:
         :type wall_for: int
         :type wall_dom: float
         """
-
-        self.battle_zone_id = div_id
+        self.battle = battle
+        self.id = div_id
         self.end = end
         self.epic = epic
         self.wall = dict({"for": wall_for, "dom": wall_dom})
@@ -669,8 +724,19 @@ class BattleDivision:
         self.div = div
 
     @property
-    def id(self):
-        return self.battle_zone_id
+    def terrain_display(self):
+        return constants.TERRAINS[self.terrain]
+
+    def __str__(self):
+        base_name = f"Div #{self.id} d{self.div}"
+        if self.terrain:
+            base_name += f" ({self.terrain_display})"
+        if self.div_end:
+            base_name += " Ended"
+        return base_name
+
+    def __repr__(self):
+        return f"<BattleDivision #{self.id} (battle #{self.battle.id})>"
 
 
 class Battle:
@@ -683,6 +749,14 @@ class Battle:
     invader: BattleSide
     defender: BattleSide
     div: Dict[int, BattleDivision]
+    region_id: int
+    region_name: str
+
+    @property
+    def as_dict(self):
+        return dict(id=self.id, war_id=self.war_id, divisions=self.div, zone=self.zone_id, rw=self.is_rw,
+                    dict_lib=self.is_dict_lib, start=self.start, sides={'inv': self.invader, 'def': self.defender},
+                    region=[self.region_id, self.region_name])
 
     @property
     def has_air(self) -> bool:
@@ -698,6 +772,10 @@ class Battle:
                 return True
         return bool(self.zone_id % 4)
 
+    @property
+    def link(self):
+        return f"https://www.erepublik.com/en/military/battlefield/{self.id}"
+
     def __init__(self, battle: Dict[str, Any]):
         """Object representing eRepublik battle.
 
@@ -710,29 +788,31 @@ class Battle:
         self.is_rw = bool(battle.get('is_rw'))
         self.is_as = bool(battle.get('is_as'))
         self.is_dict_lib = bool(battle.get('is_dict')) or bool(battle.get('is_lib'))
-        self.start = datetime.datetime.fromtimestamp(int(battle.get('start', 0)), tz=utils.erep_tz)
+        self.region_id = battle.get('region', {}).get('id')
+        self.region_name = battle.get('region', {}).get('name')
+        self.start = datetime.datetime.fromtimestamp(int(battle.get('start', 0)), tz=constants.erep_tz)
 
         self.invader = BattleSide(
-            battle.get('inv', {}).get('id'), battle.get('inv', {}).get('points'),
-            [row.get('id') for row in battle.get('inv', {}).get('ally_list')],
-            [row.get('id') for row in battle.get('inv', {}).get('ally_list') if row['deployed']]
+            self, constants.COUNTRIES[battle.get('inv', {}).get('id')], battle.get('inv', {}).get('points'),
+            [constants.COUNTRIES[row.get('id')] for row in battle.get('inv', {}).get('ally_list')],
+            [constants.COUNTRIES[row.get('id')] for row in battle.get('inv', {}).get('ally_list') if row['deployed']], False
         )
 
         self.defender = BattleSide(
-            battle.get('def', {}).get('id'), battle.get('def', {}).get('points'),
-            [row.get('id') for row in battle.get('def', {}).get('ally_list')],
-            [row.get('id') for row in battle.get('def', {}).get('ally_list') if row['deployed']]
+            self, constants.COUNTRIES[battle.get('def', {}).get('id')], battle.get('def', {}).get('points'),
+            [constants.COUNTRIES[row.get('id')] for row in battle.get('def', {}).get('ally_list')],
+            [constants.COUNTRIES[row.get('id')] for row in battle.get('def', {}).get('ally_list') if row['deployed']], True
         )
 
         self.div = {}
         for div, data in battle.get('div', {}).items():
-            div = int(data.get('div'))
+            div = int(div)
             if data.get('end'):
-                end = datetime.datetime.fromtimestamp(data.get('end'), tz=utils.erep_tz)
+                end = datetime.datetime.fromtimestamp(data.get('end'), tz=constants.erep_tz)
             else:
                 end = utils.localize_dt(datetime.datetime.max - datetime.timedelta(days=1))
 
-            battle_div = BattleDivision(div_id=data.get('id'), div=data.get('dev'), end=end,
+            battle_div = BattleDivision(self, div_id=data.get('id'), div=data.get('div'), end=end,
                                         epic=data.get('epic_type') in [1, 5],
                                         wall_for=data.get('wall').get("for"),
                                         wall_dom=data.get('wall').get("dom"),
@@ -740,18 +820,18 @@ class Battle:
 
             self.div.update({div: battle_div})
 
-    def __repr__(self):
-        now = utils.now()
+    def __str__(self):
+        time_now = utils.now()
         is_started = self.start < utils.now()
         if is_started:
-            time_part = " {}".format(now - self.start)
+            time_part = " {}".format(time_now - self.start)
         else:
-            time_part = "-{}".format(self.start - now)
+            time_part = "-{}".format(self.start - time_now)
 
-        return f"Battle {self.id} | " \
-               f"{utils.ISO_CC[self.invader.id]} : {utils.ISO_CC[self.defender.id]} | " \
-               f"Round {self.zone_id:2} | " \
-               f"Round time {time_part}"
+        return f"Battle {self.id} for {self.region_name[:16]} | {self.invader} : {self.defender} | Round time {time_part}"
+
+    def __repr__(self):
+        return f"<Battle #{self.id} {self.invader}:{self.defender} R{self.zone_id}>"
 
 
 class EnergyToFight:
@@ -805,7 +885,7 @@ class TelegramBot:
         self._next_time = utils.now()
 
     @property
-    def __dict__(self):
+    def as_dict(self):
         return {'chat_id': self.chat_id, 'api_url': self.api_url, 'player': self.player_name,
                 'last_time': self._last_time, 'next_time': self._next_time, 'queue': self.__queue,
                 'initialized': self.__initialized, 'has_threads': bool(len(self._threads))}
@@ -836,22 +916,6 @@ class TelegramBot:
 
         return True
 
-    def report_free_bhs(self, battles: List[Tuple[int, int, int, int, datetime.timedelta]]):
-        battle_links = []
-        for battle_id, side_id, against_id, damage, time_left in battles:
-            total_seconds = int(time_left.total_seconds())
-            time_start = ""
-            hours, remainder = divmod(total_seconds, 3600)
-            if hours:
-                time_start = f"{hours}h "
-            minutes, seconds = divmod(remainder, 60)
-            time_start += f"{minutes:02}m {seconds:02}s"
-            damage = "{:,}".format(damage).replace(',', ' ')
-            battle_links.append(f"*{damage}*dmg bh for [{utils.COUNTRIES[side_id]} vs {utils.COUNTRIES[against_id]}]"
-                                f"(https://www.erepublik.com/en/military/battlefield/{battle_id}) "
-                                f"_time since start {time_start}_")
-        self.send_message("Free BHs:\n" + "\n".join(battle_links))
-
     def report_full_energy(self, available: int, limit: int, interval: int):
         if (utils.now() - self._last_full_energy_report).total_seconds() >= 30 * 60:
             self._last_full_energy_report = utils.now()
@@ -881,7 +945,7 @@ class TelegramBot:
 
 class OfferItem(NamedTuple):
     price: float = 99_999.
-    country: int = 0
+    country: constants.Country = constants.Country(0, "", "", "")
     amount: int = 0
     offer_id: int = 0
     citizen_id: int = 0

erepublik/constants.py

@@ -0,0 +1,182 @@
+from typing import Dict, Optional, Union
+
+import pytz
+
+__all__ = ["erep_tz", "Country", "AIR_RANKS", "COUNTRIES", "FOOD_ENERGY", "GROUND_RANKS", "GROUND_RANK_POINTS", "INDUSTRIES", "TERRAINS"]
+
+erep_tz = pytz.timezone('US/Pacific')
+
+
+class Country:
+    id: int
+    name: str
+    link: str
+    iso: str
+
+    def __init__(self, country_id: int, name: str, link: str, iso: str):
+        self.id = country_id
+        self.name = name
+        self.link = link
+        self.iso = iso
+
+    def __repr__(self):
+        return f"Country({self.id}, '{self.name}', '{self.link}', '{self.iso}')"
+
+    def __str__(self):
+        return f"#{self.id} {self.name}"
+
+    def __format__(self, format_spec):
+        return self.iso
+
+    def __int__(self):
+        return self.id
+
+    def __eq__(self, other):
+        if isinstance(other, (int, float)):
+            return self.id == int(other)
+        else:
+            try:
+                return self.id == int(other)
+            except ValueError:
+                return self == other
+
+    @property
+    def as_dict(self):
+        return dict(id=self.id, name=self.name, iso=self.iso)
+
+
+class Industries:
+    __by_name = {'food': 1, 'weapons': 2, 'house': 4, 'aircraft': 23,
+                 'frm q1': 7, 'frm q2': 8, 'frm q3': 9, 'frm q4': 10, 'frm q5': 11,
+                 'wrm q1': 12, 'wrm q2': 13, 'wrm q3': 14, 'wrm q4': 15, 'wrm q5': 16,
+                 'hrm q1': 18, 'hrm q2': 19, 'hrm q3': 20, 'hrm q4': 21, 'hrm q5': 22,
+                 'arm q1': 24, 'arm q2': 25, 'arm q3': 26, 'arm q4': 27, 'arm q5': 28}
+    __by_id = {1: "Food", 2: "Weapons", 4: "House", 23: "Aircraft",
+               7: "FRM q1", 8: "FRM q2", 9: "FRM q3", 10: "FRM q4", 11: "FRM q5",
+               12: "WRM q1", 13: "WRM q2", 14: "WRM q3", 15: "WRM q4", 16: "WRM q5",
+               18: "HRM q1", 19: "HRM q2", 20: "HRM q3", 21: "HRM q4", 22: "HRM q5",
+               24: "ARM q1", 25: "ARM q2", 26: "ARM q3", 27: "ARM q4", 28: "ARM q5"}
+
+    def __getitem__(self, item) -> Optional[Union[int, str]]:
+        if isinstance(item, int):
+            return self.__by_id.get(item, None)
+        elif isinstance(item, str):
+            return self.__by_name.get(item.lower(), None)
+        return
+
+    def __getattr__(self, item) -> Optional[Union[int, str]]:
+        return self[item]
+
+    @property
+    def as_dict(self):
+        return dict(by_id=self.__by_id, by_name=self.__by_name)
+
+
+AIR_RANKS: Dict[int, str] = {
+    1: "Airman", 2: "Airman 1st Class", 3: "Airman 1st Class*", 4: "Airman 1st Class**", 5: "Airman 1st Class***",
+    6: "Airman 1st Class****", 7: "Airman 1st Class*****", 8: "Senior Airman", 9: "Senior Airman*",
+    10: "Senior Airman**", 11: "Senior Airman***", 12: "Senior Airman****", 13: "Senior Airman*****",
+    14: "Staff Sergeant", 15: "Staff Sergeant*", 16: "Staff Sergeant**", 17: "Staff Sergeant***",
+    18: "Staff Sergeant****", 19: "Staff Sergeant*****", 20: "Aviator", 21: "Aviator*", 22: "Aviator**",
+    23: "Aviator***", 24: "Aviator****", 25: "Aviator*****", 26: "Flight Lieutenant", 27: "Flight Lieutenant*",
+    28: "Flight Lieutenant**", 29: "Flight Lieutenant***", 30: "Flight Lieutenant****", 31: "Flight Lieutenant*****",
+    32: "Squadron Leader", 33: "Squadron Leader*", 34: "Squadron Leader**", 35: "Squadron Leader***",
+    36: "Squadron Leader****", 37: "Squadron Leader*****", 38: "Chief Master Sergeant", 39: "Chief Master Sergeant*",
+    40: "Chief Master Sergeant**", 41: "Chief Master Sergeant***", 42: "Chief Master Sergeant****",
+    43: "Chief Master Sergeant*****", 44: "Wing Commander", 45: "Wing Commander*", 46: "Wing Commander**",
+    47: "Wing Commander***", 48: "Wing Commander****", 49: "Wing Commander*****", 50: "Group Captain",
+    51: "Group Captain*", 52: "Group Captain**", 53: "Group Captain***", 54: "Group Captain****",
+    55: "Group Captain*****", 56: "Air Commodore", 57: "Air Commodore*", 58: "Air Commodore**", 59: "Air Commodore***",
+    60: "Air Commodore****", 61: "Air Commodore*****",
+}
+
+COUNTRIES: Dict[int, Country] = {
+    1: Country(1, 'Romania', 'Romania', 'ROU'), 9: Country(9, 'Brazil', 'Brazil', 'BRA'),
+    10: Country(10, 'Italy', 'Italy', 'ITA'), 11: Country(11, 'France', 'France', 'FRA'),
+    12: Country(12, 'Germany', 'Germany', 'DEU'), 13: Country(13, 'Hungary', 'Hungary', 'HUN'),
+    14: Country(14, 'China', 'China', 'CHN'), 15: Country(15, 'Spain', 'Spain', 'ESP'),
+    23: Country(23, 'Canada', 'Canada', 'CAN'), 24: Country(24, 'USA', 'USA', 'USA'),
+    26: Country(26, 'Mexico', 'Mexico', 'MEX'), 27: Country(27, 'Argentina', 'Argentina', 'ARG'),
+    28: Country(28, 'Venezuela', 'Venezuela', 'VEN'), 29: Country(29, 'United Kingdom', 'United-Kingdom', 'GBR'),
+    30: Country(30, 'Switzerland', 'Switzerland', 'CHE'), 31: Country(31, 'Netherlands', 'Netherlands', 'NLD'),
+    32: Country(32, 'Belgium', 'Belgium', 'BEL'), 33: Country(33, 'Austria', 'Austria', 'AUT'),
+    34: Country(34, 'Czech Republic', 'Czech-Republic', 'CZE'), 35: Country(35, 'Poland', 'Poland', 'POL'),
+    36: Country(36, 'Slovakia', 'Slovakia', 'SVK'), 37: Country(37, 'Norway', 'Norway', 'NOR'),
+    38: Country(38, 'Sweden', 'Sweden', 'SWE'), 39: Country(39, 'Finland', 'Finland', 'FIN'),
+    40: Country(40, 'Ukraine', 'Ukraine', 'UKR'), 41: Country(41, 'Russia', 'Russia', 'RUS'),
+    42: Country(42, 'Bulgaria', 'Bulgaria', 'BGR'), 43: Country(43, 'Turkey', 'Turkey', 'TUR'),
+    44: Country(44, 'Greece', 'Greece', 'GRC'), 45: Country(45, 'Japan', 'Japan', 'JPN'),
+    47: Country(47, 'South Korea', 'South-Korea', 'KOR'), 48: Country(48, 'India', 'India', 'IND'),
+    49: Country(49, 'Indonesia', 'Indonesia', 'IDN'), 50: Country(50, 'Australia', 'Australia', 'AUS'),
+    51: Country(51, 'South Africa', 'South Africa', 'ZAF'),
+    52: Country(52, 'Republic of Moldova', 'Republic-of-Moldova', 'MDA'),
+    53: Country(53, 'Portugal', 'Portugal', 'PRT'), 54: Country(54, 'Ireland', 'Ireland', 'IRL'),
+    55: Country(55, 'Denmark', 'Denmark', 'DNK'), 56: Country(56, 'Iran', 'Iran', 'IRN'),
+    57: Country(57, 'Pakistan', 'Pakistan', 'PAK'), 58: Country(58, 'Israel', 'Israel', 'ISR'),
+    59: Country(59, 'Thailand', 'Thailand', 'THA'), 61: Country(61, 'Slovenia', 'Slovenia', 'SVN'),
+    63: Country(63, 'Croatia', 'Croatia', 'HRV'), 64: Country(64, 'Chile', 'Chile', 'CHL'),
+    65: Country(65, 'Serbia', 'Serbia', 'SRB'), 66: Country(66, 'Malaysia', 'Malaysia', 'MYS'),
+    67: Country(67, 'Philippines', 'Philippines', 'PHL'), 68: Country(68, 'Singapore', 'Singapore', 'SGP'),
+    69: Country(69, 'Bosnia and Herzegovina', 'Bosnia-Herzegovina', 'BiH'),
+    70: Country(70, 'Estonia', 'Estonia', 'EST'), 80: Country(80, 'Montenegro', 'Montenegro', 'MNE'),
+    71: Country(71, 'Latvia', 'Latvia', 'LVA'), 72: Country(72, 'Lithuania', 'Lithuania', 'LTU'),
+    73: Country(73, 'North Korea', 'North-Korea', 'PRK'), 74: Country(74, 'Uruguay', 'Uruguay', 'URY'),
+    75: Country(75, 'Paraguay', 'Paraguay', 'PRY'), 76: Country(76, 'Bolivia', 'Bolivia', 'BOL'),
+    77: Country(77, 'Peru', 'Peru', 'PER'), 78: Country(78, 'Colombia', 'Colombia', 'COL'),
+    79: Country(79, 'Republic of Macedonia (FYROM)', 'Republic-of-Macedonia-FYROM', 'MKD'),
+    81: Country(81, 'Republic of China (Taiwan)', 'Republic-of-China-Taiwan', 'TWN'),
+    82: Country(82, 'Cyprus', 'Cyprus', 'CYP'), 167: Country(167, 'Albania', 'Albania', 'ALB'),
+    83: Country(83, 'Belarus', 'Belarus', 'BLR'), 84: Country(84, 'New Zealand', 'New-Zealand', 'NZL'),
+    164: Country(164, 'Saudi Arabia', 'Saudi-Arabia', 'SAU'), 165: Country(165, 'Egypt', 'Egypt', 'EGY'),
+    166: Country(166, 'United Arab Emirates', 'United-Arab-Emirates', 'UAE'),
+    168: Country(168, 'Georgia', 'Georgia', 'GEO'), 169: Country(169, 'Armenia', 'Armenia', 'ARM'),
+    170: Country(170, 'Nigeria', 'Nigeria', 'NGA'), 171: Country(171, 'Cuba', 'Cuba', 'CUB')
+}
+
+FOOD_ENERGY: Dict[str, int] = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
+
+GROUND_RANKS: Dict[int, str] = {
+    1: "Recruit", 2: "Private", 3: "Private*", 4: "Private**", 5: "Private***",
+    6: "Corporal", 7: "Corporal*", 8: "Corporal**", 9: "Corporal***",
+    10: "Sergeant", 11: "Sergeant*", 12: "Sergeant**", 13: "Sergeant***",
+    14: "Lieutenant", 15: "Lieutenant*", 16: "Lieutenant**", 17: "Lieutenant***",
+    18: "Captain", 19: "Captain*", 20: "Captain**", 21: "Captain***",
+    22: "Major", 23: "Major*", 24: "Major**", 25: "Major***",
+    26: "Commander", 27: "Commander*", 28: "Commander**", 29: "Commander***",
+    30: "Lt Colonel", 31: "Lt Colonel*", 32: "Lt Colonel**", 33: "Lt Colonel***",
+    34: "Colonel", 35: "Colonel*", 36: "Colonel**", 37: "Colonel***",
+    38: "General", 39: "General*", 40: "General**", 41: "General***",
+    42: "Field Marshal", 43: "Field Marshal*", 44: "Field Marshal**", 45: "Field Marshal***",
+    46: "Supreme Marshal", 47: "Supreme Marshal*", 48: "Supreme Marshal**", 49: "Supreme Marshal***",
+    50: "National Force", 51: "National Force*", 52: "National Force**", 53: "National Force***",
+    54: "World Class Force", 55: "World Class Force*", 56: "World Class Force**", 57: "World Class Force***",
+    58: "Legendary Force", 59: "Legendary Force*", 60: "Legendary Force**", 61: "Legendary Force***",
+    62: "God of War", 63: "God of War*", 64: "God of War**", 65: "God of War***",
+    66: "Titan", 67: "Titan*", 68: "Titan**", 69: "Titan***",
+    70: "Legends I", 71: "Legends II", 72: "Legends III", 73: "Legends IV", 74: "Legends V", 75: "Legends VI",
+    76: "Legends VII", 77: "Legends VIII", 78: "Legends IX", 79: "Legends X", 80: "Legends XI", 81: "Legends XII",
+    82: "Legends XIII", 83: "Legends XIV", 84: "Legends XV", 85: "Legends XVI", 86: "Legends XVII", 87: "Legends XVIII",
+    88: "Legends XIX", 89: "Legends XX",
+}
+
+GROUND_RANK_POINTS: Dict[int, int] = {
+    1: 0, 2: 15, 3: 45, 4: 80, 5: 120, 6: 170, 7: 250, 8: 350, 9: 450, 10: 600, 11: 800, 12: 1000,
+    13: 1400, 14: 1850, 15: 2350, 16: 3000, 17: 3750, 18: 5000, 19: 6500, 20: 9000, 21: 12000,
+    22: 15500, 23: 20000, 24: 25000, 25: 31000, 26: 40000, 27: 52000, 28: 67000, 29: 85000,
+    30: 110000, 31: 140000, 32: 180000, 33: 225000, 34: 285000, 35: 355000, 36: 435000, 37: 540000,
+    38: 660000, 39: 800000, 40: 950000, 41: 1140000, 42: 1350000, 43: 1600000, 44: 1875000,
+    45: 2185000, 46: 2550000, 47: 3000000, 48: 3500000, 49: 4150000, 50: 4900000, 51: 5800000,
+    52: 7000000, 53: 9000000, 54: 11500000, 55: 14500000, 56: 18000000, 57: 22000000, 58: 26500000,
+    59: 31500000, 60: 37000000, 61: 43000000, 62: 50000000, 63: 100000000, 64: 200000000,
+    65: 500000000, 66: 1000000000, 67: 2000000000, 68: 4000000000, 69: 10000000000, 70: 20000000000,
+    71: 30000000000, 72: 40000000000, 73: 50000000000, 74: 60000000000, 75: 70000000000,
+    76: 80000000000, 77: 90000000000, 78: 100000000000, 79: 110000000000, 80: 120000000000,
+    81: 130000000000, 82: 140000000000, 83: 150000000000, 84: 160000000000, 85: 170000000000,
+    86: 180000000000, 87: 190000000000, 88: 200000000000, 89: 210000000000
+}
+
+INDUSTRIES = Industries()
+
+TERRAINS: Dict[int, str] = {0: "Standard", 1: 'Industrial', 2: 'Urban', 3: 'Suburbs', 4: 'Airport', 5: 'Plains',
+                            6: 'Wasteland', 7: 'Mountains', 8: 'Beach', 9: 'Swamp', 10: 'Mud', 11: 'Hills',
+                            12: 'Jungle', 13: 'Forest', 14: 'Desert'}

erepublik/utils.py

@@ -9,148 +9,46 @@ import traceback
 import unicodedata
 from decimal import Decimal
 from pathlib import Path
-from typing import Any, Dict, List, Mapping, Optional, Union
+from typing import Any, List, Mapping, Optional, Union
 
-import pytz
 import requests
 
-from . import __commit_id__, __version__
+from . import __version__, constants
 
 try:
     import simplejson as json
 except ImportError:
     import json
 
-__all__ = ["FOOD_ENERGY", "COMMIT_ID", "COUNTRIES", "erep_tz", 'COUNTRY_LINK',
-           "now", "localize_dt", "localize_timestamp", "good_timedelta", "eday_from_date", "date_from_eday",
-           "get_sleep_seconds", "interactive_sleep", "silent_sleep",
-           "write_silent_log", "write_interactive_log", "get_file", "write_file",
-           "send_email", "normalize_html_json", "process_error", "process_warning",
-           'calculate_hit', 'get_ground_hit_dmg_value', 'get_air_hit_dmg_value']
+__all__ = ['VERSION', 'calculate_hit', 'caught_error', 'date_from_eday', 'eday_from_date',
+           'get_air_hit_dmg_value', 'get_file', 'get_ground_hit_dmg_value', 'get_sleep_seconds', 'good_timedelta',
+           'interactive_sleep', 'json', 'localize_dt', 'localize_timestamp', 'normalize_html_json', 'now',
+           'process_error', 'process_warning', 'send_email', 'silent_sleep', 'slugify', 'write_file',
+           'write_interactive_log', 'write_silent_log']
 
 if not sys.version_info >= (3, 7):
     raise AssertionError('This script requires Python version 3.7 and higher\n'
                          'But Your version is v{}.{}.{}'.format(*sys.version_info))
 
-FOOD_ENERGY: Dict[str, int] = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
-COMMIT_ID: str = __commit_id__
 VERSION: str = __version__
 
-erep_tz = pytz.timezone('US/Pacific')
-AIR_RANKS: Dict[int, str] = {
-    1: "Airman", 2: "Airman 1st Class", 3: "Airman 1st Class*", 4: "Airman 1st Class**", 5: "Airman 1st Class***",
-    6: "Airman 1st Class****", 7: "Airman 1st Class*****", 8: "Senior Airman", 9: "Senior Airman*",
-    10: "Senior Airman**", 11: "Senior Airman***", 12: "Senior Airman****", 13: "Senior Airman*****",
-    14: "Staff Sergeant", 15: "Staff Sergeant*", 16: "Staff Sergeant**", 17: "Staff Sergeant***",
-    18: "Staff Sergeant****", 19: "Staff Sergeant*****", 20: "Aviator", 21: "Aviator*", 22: "Aviator**",
-    23: "Aviator***", 24: "Aviator****", 25: "Aviator*****", 26: "Flight Lieutenant", 27: "Flight Lieutenant*",
-    28: "Flight Lieutenant**", 29: "Flight Lieutenant***", 30: "Flight Lieutenant****", 31: "Flight Lieutenant*****",
-    32: "Squadron Leader", 33: "Squadron Leader*", 34: "Squadron Leader**", 35: "Squadron Leader***",
-    36: "Squadron Leader****", 37: "Squadron Leader*****", 38: "Chief Master Sergeant", 39: "Chief Master Sergeant*",
-    40: "Chief Master Sergeant**", 41: "Chief Master Sergeant***", 42: "Chief Master Sergeant****",
-    43: "Chief Master Sergeant*****", 44: "Wing Commander", 45: "Wing Commander*", 46: "Wing Commander**",
-    47: "Wing Commander***", 48: "Wing Commander****", 49: "Wing Commander*****", 50: "Group Captain",
-    51: "Group Captain*", 52: "Group Captain**", 53: "Group Captain***", 54: "Group Captain****",
-    55: "Group Captain*****", 56: "Air Commodore", 57: "Air Commodore*", 58: "Air Commodore**", 59: "Air Commodore***",
-    60: "Air Commodore****", 61: "Air Commodore*****",
-}
-
-GROUND_RANKS: Dict[int, str] = {
-    1: "Recruit", 2: "Private", 3: "Private*", 4: "Private**", 5: "Private***",
-    6: "Corporal", 7: "Corporal*", 8: "Corporal**", 9: "Corporal***",
-    10: "Sergeant", 11: "Sergeant*", 12: "Sergeant**", 13: "Sergeant***",
-    14: "Lieutenant", 15: "Lieutenant*", 16: "Lieutenant**", 17: "Lieutenant***",
-    18: "Captain", 19: "Captain*", 20: "Captain**", 21: "Captain***",
-    22: "Major", 23: "Major*", 24: "Major**", 25: "Major***",
-    26: "Commander", 27: "Commander*", 28: "Commander**", 29: "Commander***",
-    30: "Lt Colonel", 31: "Lt Colonel*", 32: "Lt Colonel**", 33: "Lt Colonel***",
-    34: "Colonel", 35: "Colonel*", 36: "Colonel**", 37: "Colonel***",
-    38: "General", 39: "General*", 40: "General**", 41: "General***",
-    42: "Field Marshal", 43: "Field Marshal*", 44: "Field Marshal**", 45: "Field Marshal***",
-    46: "Supreme Marshal", 47: "Supreme Marshal*", 48: "Supreme Marshal**", 49: "Supreme Marshal***",
-    50: "National Force", 51: "National Force*", 52: "National Force**", 53: "National Force***",
-    54: "World Class Force", 55: "World Class Force*", 56: "World Class Force**", 57: "World Class Force***",
-    58: "Legendary Force", 59: "Legendary Force*", 60: "Legendary Force**", 61: "Legendary Force***",
-    62: "God of War", 63: "God of War*", 64: "God of War**", 65: "God of War***",
-    66: "Titan", 67: "Titan*", 68: "Titan**", 69: "Titan***",
-    70: "Legends I", 71: "Legends II", 72: "Legends III", 73: "Legends IV", 74: "Legends V", 75: "Legends VI",
-    76: "Legends VII", 77: "Legends VIII", 78: "Legends IX", 79: "Legends X", 80: "Legends XI", 81: "Legends XII",
-    82: "Legends XIII", 83: "Legends XIV", 84: "Legends XV", 85: "Legends XVI", 86: "Legends XVII", 87: "Legends XVIII",
-    88: "Legends XIX", 89: "Legends XX",
-}
-
-GROUND_RANK_POINTS: Dict[int, int] = {
-    1: 0, 2: 15, 3: 45, 4: 80, 5: 120, 6: 170, 7: 250, 8: 350, 9: 450, 10: 600, 11: 800, 12: 1000,
-    13: 1400, 14: 1850, 15: 2350, 16: 3000, 17: 3750, 18: 5000, 19: 6500, 20: 9000, 21: 12000,
-    22: 15500, 23: 20000, 24: 25000, 25: 31000, 26: 40000, 27: 52000, 28: 67000, 29: 85000,
-    30: 110000, 31: 140000, 32: 180000, 33: 225000, 34: 285000, 35: 355000, 36: 435000, 37: 540000,
-    38: 660000, 39: 800000, 40: 950000, 41: 1140000, 42: 1350000, 43: 1600000, 44: 1875000,
-    45: 2185000, 46: 2550000, 47: 3000000, 48: 3500000, 49: 4150000, 50: 4900000, 51: 5800000,
-    52: 7000000, 53: 9000000, 54: 11500000, 55: 14500000, 56: 18000000, 57: 22000000, 58: 26500000,
-    59: 31500000, 60: 37000000, 61: 43000000, 62: 50000000, 63: 100000000, 64: 200000000,
-    65: 500000000, 66: 1000000000, 67: 2000000000, 68: 4000000000, 69: 10000000000, 70: 20000000000,
-    71: 30000000000, 72: 40000000000, 73: 50000000000, 74: 60000000000, 75: 70000000000,
-    76: 80000000000, 77: 90000000000, 78: 100000000000, 79: 110000000000, 80: 120000000000,
-    81: 130000000000, 82: 140000000000, 83: 150000000000, 84: 160000000000, 85: 170000000000,
-    86: 180000000000, 87: 190000000000, 88: 200000000000, 89: 210000000000
-}
-
-COUNTRIES: Dict[int, str] = {
-    1: 'Romania', 9: 'Brazil', 10: 'Italy', 11: 'France', 12: 'Germany', 13: 'Hungary', 14: 'China', 15: 'Spain',
-    23: 'Canada', 24: 'USA', 26: 'Mexico', 27: 'Argentina', 28: 'Venezuela', 29: 'United Kingdom', 30: 'Switzerland',
-    31: 'Netherlands', 32: 'Belgium', 33: 'Austria', 34: 'Czech Republic', 35: 'Poland', 36: 'Slovakia', 37: 'Norway',
-    38: 'Sweden', 39: 'Finland', 40: 'Ukraine', 41: 'Russia', 42: 'Bulgaria', 43: 'Turkey', 44: 'Greece', 45: 'Japan',
-    47: 'South Korea', 48: 'India', 49: 'Indonesia', 50: 'Australia', 51: 'South Africa', 52: 'Republic of Moldova',
-    53: 'Portugal', 54: 'Ireland', 55: 'Denmark', 56: 'Iran', 57: 'Pakistan', 58: 'Israel', 59: 'Thailand',
-    61: 'Slovenia', 63: 'Croatia', 64: 'Chile', 65: 'Serbia', 66: 'Malaysia', 67: 'Philippines', 68: 'Singapore',
-    69: 'Bosnia and Herzegovina', 70: 'Estonia', 71: 'Latvia', 72: 'Lithuania', 73: 'North Korea', 74: 'Uruguay',
-    75: 'Paraguay', 76: 'Bolivia', 77: 'Peru', 78: 'Colombia', 79: 'Republic of Macedonia (FYROM)', 80: 'Montenegro',
-    81: 'Republic of China (Taiwan)', 82: 'Cyprus', 83: 'Belarus', 84: 'New Zealand', 164: 'Saudi Arabia', 165: 'Egypt',
-    166: 'United Arab Emirates', 167: 'Albania', 168: 'Georgia', 169: 'Armenia', 170: 'Nigeria', 171: 'Cuba'
-}
-
-COUNTRY_LINK: Dict[int, str] = {
-    1: 'Romania', 9: 'Brazil', 11: 'France', 12: 'Germany', 13: 'Hungary', 82: 'Cyprus', 168: 'Georgia', 15: 'Spain',
-    23: 'Canada', 26: 'Mexico', 27: 'Argentina', 28: 'Venezuela', 80: 'Montenegro', 24: 'USA', 29: 'United-Kingdom',
-    50: 'Australia', 47: 'South-Korea', 171: 'Cuba', 79: 'Republic-of-Macedonia-FYROM', 30: 'Switzerland', 165: 'Egypt',
-    31: 'Netherlands', 32: 'Belgium', 33: 'Austria', 34: 'Czech-Republic', 35: 'Poland', 36: 'Slovakia', 37: 'Norway',
-    38: 'Sweden', 39: 'Finland', 40: 'Ukraine', 41: 'Russia', 42: 'Bulgaria', 43: 'Turkey', 44: 'Greece', 45: 'Japan',
-    48: 'India', 49: 'Indonesia', 78: 'Colombia', 68: 'Singapore', 51: 'South Africa', 52: 'Republic-of-Moldova',
-    53: 'Portugal', 54: 'Ireland', 55: 'Denmark', 56: 'Iran', 57: 'Pakistan', 58: 'Israel', 59: 'Thailand', 10: 'Italy',
-    61: 'Slovenia', 63: 'Croatia', 64: 'Chile', 65: 'Serbia', 66: 'Malaysia', 67: 'Philippines', 70: 'Estonia',
-    77: 'Peru', 71: 'Latvia', 72: 'Lithuania', 73: 'North-Korea', 74: 'Uruguay', 75: 'Paraguay', 76: 'Bolivia',
-    81: 'Republic-of-China-Taiwan', 166: 'United-Arab-Emirates', 167: 'Albania', 69: 'Bosnia-Herzegovina', 14: 'China',
-    169: 'Armenia', 83: 'Belarus', 84: 'New-Zealand', 164: 'Saudi-Arabia', 170: 'Nigeria'
-}
-
-ISO_CC: Dict[int, str] = {
-    1: 'ROU', 9: 'BRA', 10: 'ITA', 11: 'FRA', 12: 'DEU', 13: 'HUN', 14: 'CHN', 15: 'ESP', 23: 'CAN', 24: 'USA',
-    26: 'MEX', 27: 'ARG', 28: 'VEN', 29: 'GBR', 30: 'CHE', 31: 'NLD', 32: 'BEL', 33: 'AUT', 34: 'CZE', 35: 'POL',
-    36: 'SVK', 37: 'NOR', 38: 'SWE', 39: 'FIN', 40: 'UKR', 41: 'RUS', 42: 'BGR', 43: 'TUR', 44: 'GRC', 45: 'JPN',
-    47: 'KOR', 48: 'IND', 49: 'IDN', 50: 'AUS', 51: 'ZAF', 52: 'MDA', 53: 'PRT', 54: 'IRL', 55: 'DNK', 56: 'IRN',
-    57: 'PAK', 58: 'ISR', 59: 'THA', 61: 'SVN', 63: 'HRV', 64: 'CHL', 65: 'SRB', 66: 'MYS', 67: 'PHL', 68: 'SGP',
-    69: 'BiH', 70: 'EST', 71: 'LVA', 72: 'LTU', 73: 'PRK', 74: 'URY', 75: 'PRY', 76: 'BOL', 77: 'PER', 78: 'COL',
-    79: 'MKD', 80: 'MNE', 81: 'TWN', 82: 'CYP', 83: 'BLR', 84: 'NZL', 164: 'SAU', 165: 'EGY', 166: 'UAE', 167: 'ALB',
-    168: 'GEO', 169: 'ARM', 170: 'NGA', 171: 'CUB',
-}
-
 
 def now() -> datetime.datetime:
-    return datetime.datetime.now(erep_tz).replace(microsecond=0)
+    return datetime.datetime.now(constants.erep_tz).replace(microsecond=0)
 
 
 def localize_timestamp(timestamp: int) -> datetime.datetime:
-    return datetime.datetime.fromtimestamp(timestamp, erep_tz)
+    return datetime.datetime.fromtimestamp(timestamp, constants.erep_tz)
 
 
 def localize_dt(dt: Union[datetime.date, datetime.datetime]) -> datetime.datetime:
     try:
         try:
-            return erep_tz.localize(dt)
+            return constants.erep_tz.localize(dt)
         except AttributeError:
-            return erep_tz.localize(datetime.datetime.combine(dt, datetime.time(0, 0, 0)))
+            return constants.erep_tz.localize(datetime.datetime.combine(dt, datetime.time(0, 0, 0)))
     except ValueError:
-        return dt.astimezone(erep_tz)
+        return dt.astimezone(constants.erep_tz)
 
 
 def good_timedelta(dt: datetime.datetime, td: datetime.timedelta) -> datetime.datetime:
@@ -163,7 +61,7 @@ def good_timedelta(dt: datetime.datetime, td: datetime.timedelta) -> datetime.da
     :return: datetime object with correct timezone when jumped over DST
     :rtype: datetime.datetime
     """
-    return erep_tz.normalize(dt + td)
+    return constants.erep_tz.normalize(dt + td)
 
 
 def eday_from_date(date: Union[datetime.date, datetime.datetime] = now()) -> int:
@@ -339,7 +237,7 @@ def normalize_html_json(js: str) -> str:
 
 
 def caught_error(e: Exception):
-    process_error(str(e), "Unclassified", sys.exc_info(), None, COMMIT_ID, False)
+    process_error(str(e), "Unclassified", sys.exc_info(), interactive=False)
 
 
 def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commit_id: str = None,
@@ -361,7 +259,7 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
     """
     type_, value_, traceback_ = exc_info
     content = [log_info]
-    content += [f"eRepublik version {VERSION}, commit id {COMMIT_ID}"]
+    content += [f"eRepublik version {VERSION}"]
     if commit_id:
         content += [f"Commit id {commit_id}"]
     content += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]

set_commit_id.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-commit=$(git log -1 --pretty=format:%h)
-sed -i.bak -E "s|__commit_id__ = \".+\"|__commit_id__ = \"${commit}\"|g" erepublik/__init__.py
-rm erepublik/__init__.py.bak

setup.cfg

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

setup.py

@@ -43,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.20.2',
+    version='0.20.3.9',
     zip_safe=False,
 )