Bump version: 0.20.1 → 0.20.1.1

Company sorting bugfix

.github/workflows/pythonpackage.yml

@@ -0,0 +1,33 @@
+name: Python package
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements_dev.txt
+    - name: Lint with flake8
+      run: |
+        pip install flake8
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pip install pytest
+        pytest

.travis.yml

@@ -2,8 +2,8 @@
 
 language: python
 python:
+  - 3.8
   - 3.7
-  - 3.6
 
 # Command to install dependencies, e.g. pip install -r requirements_dev.txt --use-mirrors
 install: pip install -U tox-travis

HISTORY.rst

@@ -2,6 +2,17 @@
 History
 =======
 
+0.20.0 (2020-06-15)
+-------------------
+* Massive restructuring
+* Restricted IP check
+* Bomb deploy improvements
+* More verbose action logging
+* Division switching for maverick scripts
+* New medal endpoint is correctly parsed
+* WAM/Employ modularized
+
+
 0.19.0 (2020-01-13)
 -------------------
 * Created method for current products on sale.

Makefile

@@ -88,3 +88,9 @@ dist: clean ## builds source and wheel package
 
 install: clean ## install the package to the active Python's site-packages
 	python setup.py install
+
+setcommit:
+	bash set_commit_id.sh
+# 	commit=`git log -1 --pretty=format:%h`
+# 	sed -i.bak -E "s|COMMIT_ID = \".+\"|COMMIT_ID = \"$(commit)\"|g" erepublik/utils.py
+# 	mv erepublik/utils.py.bak erepublik/utils.py

erepublik/__init__.py

@@ -4,7 +4,10 @@
 
 __author__ = """Eriks Karls"""
 __email__ = 'eriks@72.lv'
-__version__ = '0.19.4.1'
+__version__ = '0.20.1.1'
+__commit_id__ = "6abfc98"
 
 from erepublik import classes, utils
 from erepublik.citizen import Citizen
+
+__all__ = ["classes", "utils", "Citizen"]

erepublik/access_points.py

@@ -0,0 +1,663 @@
+import datetime
+import random
+import time
+from typing import Any, Dict, List, Mapping, Union
+
+from requests import Response, Session
+
+from erepublik import utils
+
+__all__ = ['SlowRequests', 'CitizenAPI']
+
+
+class SlowRequests(Session):
+    last_time: datetime.datetime
+    timeout = datetime.timedelta(milliseconds=500)
+    uas = [
+        # Chrome
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',  # noqa
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.106 Safari/537.36',  # noqa
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',  # noqa
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36',  # noqa
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36',
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.106 Safari/537.36',
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36',
+        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36',
+
+        # FireFox
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:76.0) Gecko/20100101 Firefox/76.0',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:75.0) Gecko/20100101 Firefox/75.0',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0',
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:73.0) Gecko/20100101 Firefox/73.0',
+        'Mozilla/5.0 (X11; Linux x86_64; rv:76.0) Gecko/20100101 Firefox/76.0',
+        'Mozilla/5.0 (X11; Linux x86_64; rv:75.0) Gecko/20100101 Firefox/75.0',
+        'Mozilla/5.0 (X11; Linux x86_64; rv:74.0) Gecko/20100101 Firefox/74.0',
+        'Mozilla/5.0 (X11; Linux x86_64; rv:73.0) Gecko/20100101 Firefox/73.0',
+    ]
+    debug = False
+
+    def __init__(self):
+        super().__init__()
+        self.request_log_name = utils.get_file(utils.now().strftime("debug/requests_%Y-%m-%d.log"))
+        self.last_time = utils.now()
+        self.headers.update({
+            'User-Agent': random.choice(self.uas)
+        })
+
+    @property
+    def __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)
+
+    def request(self, method, url, *args, **kwargs):
+        self._slow_down_requests()
+        self._log_request(url, method, **kwargs)
+        resp = super().request(method, url, *args, **kwargs)
+        self._log_response(url, resp)
+        return resp
+
+    def _slow_down_requests(self):
+        ltt = utils.good_timedelta(self.last_time, self.timeout)
+        if ltt > utils.now():
+            seconds = (ltt - utils.now()).total_seconds()
+            time.sleep(seconds if seconds > 0 else 0)
+        self.last_time = utils.now()
+
+    def _log_request(self, url, method, data=None, json=None, params=None, **kwargs):
+        if self.debug:
+            args = {}
+            kwargs.pop('allow_redirects', None)
+            if kwargs:
+                args.update({'kwargs': kwargs})
+
+            if data:
+                args.update({"data": data})
+
+            if json:
+                args.update({"json": json})
+
+            if params:
+                args.update({"params": params})
+
+            body = "[{dt}]\tURL: '{url}'\tMETHOD: {met}\tARGS: {args}\n".format(dt=utils.now().strftime("%F %T"),
+                                                                                url=url, met=method, args=args)
+            utils.get_file(self.request_log_name)
+            with open(self.request_log_name, 'ab') as file:
+                file.write(body.encode("UTF-8"))
+
+    def _log_response(self, url, resp, redirect: bool = False):
+        from erepublik import Citizen
+        if self.debug:
+            if resp.history and not redirect:
+                for hist_resp in resp.history:
+                    self._log_request(hist_resp.request.url, "REDIRECT")
+                    self._log_response(hist_resp.request.url, hist_resp, redirect=True)
+
+            file_data = {
+                "path": 'debug/requests',
+                "time": self.last_time.strftime('%Y/%m/%d/%H-%M-%S'),
+                "name": utils.slugify(url[len(Citizen.url):]),
+                "extra": "_REDIRECT" if redirect else ""
+            }
+
+            try:
+                utils.json.loads(resp.text)
+                file_data.update({"ext": "json"})
+            except utils.json.JSONDecodeError:
+                file_data.update({"ext": "html"})
+
+            filename = 'debug/requests/{time}_{name}{extra}.{ext}'.format(**file_data)
+            with open(utils.get_file(filename), 'wb') as f:
+                f.write(resp.text.encode('utf-8'))
+
+
+class CitizenBaseAPI:
+    url: str = "https://www.erepublik.com/en"
+    _req: SlowRequests = None
+    token: str = ""
+
+    def __init__(self):
+        """ Class for unifying eRepublik known endpoints and their required/optional parameters """
+        self._req = SlowRequests()
+
+    def post(self, url: str, data=None, json=None, **kwargs) -> Response:
+        return self._req.post(url, data, json, **kwargs)
+
+    def get(self, url: str, **kwargs) -> Response:
+        return self._req.get(url, **kwargs)
+
+    def _get_main(self) -> Response:
+        return self.get(self.url)
+
+
+class ErepublikAnniversaryAPI(CitizenBaseAPI):
+    def _post_main_collect_anniversary_reward(self) -> Response:
+        return self.post("{}/main/collect-anniversary-reward".format(self.url), data={"_token": self.token})
+
+    # 12th anniversary endpoints
+    def _get_anniversary_quest_data(self) -> Response:
+        return self.get("{}/main/anniversaryQuestData".format(self.url))
+
+    def _post_map_rewards_unlock(self, node_id: int) -> Response:
+        data = {'nodeId': node_id, '_token': self.token}
+        return self.post("{}/main/map-rewards-unlock".format(self.url), data=data)
+
+    def _post_map_rewards_speedup(self, node_id: int, currency_amount: int) -> Response:
+        data = {'nodeId': node_id, '_token': self.token, "currencyCost": currency_amount}
+        return self.post("{}/main/map-rewards-speedup".format(self.url), data=data)
+
+    def _post_map_rewards_claim(self, node_id: int) -> Response:
+        data = {'nodeId': node_id, '_token': self.token}
+        return self.post("{}/main/map-rewards-claim".format(self.url), data=data)
+
+    def _post_main_wheel_of_fortune_spin(self, cost) -> Response:
+        return self.post(f"{self.url}/wheeloffortune-spin", data={'_token': self.token, "cost": cost})
+
+    def _post_main_wheel_of_fortune_build(self) -> Response:
+        return self.post(f"{self.url}/wheeloffortune-build", data={'_token': self.token})
+
+
+class ErepublikArticleAPI(CitizenBaseAPI):
+    def _get_main_article_json(self, article_id: int) -> Response:
+        return self.get("{}/main/articleJson/{}".format(self.url, article_id))
+
+    def _post_main_article_comments(self, article: int, page: int = 1) -> Response:
+        data = dict(_token=self.token, articleId=article, page=page)
+        if page:
+            data.update({'page': page})
+        return self.post("{}/main/articleComments".format(self.url), data=data)
+
+    def _post_main_article_comments_create(self, message: str, article: int, parent: int = 0) -> Response:
+        data = dict(_token=self.token, message=message, articleId=article)
+        if parent:
+            data.update({"parentId": parent})
+        return self.post("{}/main/articleComments/create".format(self.url), data=data)
+
+    def _post_main_donate_article(self, article_id: int, amount: int) -> Response:
+        data = dict(_token=self.token, articleId=article_id, amount=amount)
+        return self.post("{}/main/donate-article".format(self.url), data=data)
+
+    def _post_main_write_article(self, title: str, content: str, country: int, kind: int) -> Response:
+        data = dict(_token=self.token, article_name=title, article_body=content, article_location=country,
+                    article_category=kind)
+        return self.post("{}/main/write-article".format(self.url), data=data)
+
+    def _post_main_vote_article(self, article_id: int) -> Response:
+        data = dict(_token=self.token, articleId=article_id)
+        return self.post("{}/main/vote-article".format(self.url), data=data)
+
+
+class ErepublikCompanyAPI(CitizenBaseAPI):
+    def _post_economy_assign_to_holding(self, factory: int, holding: int) -> Response:
+        data = dict(_token=self.token, factoryId=factory, action="assign", holdingCompanyId=holding)
+        return self.post("{}/economy/assign-to-holding".format(self.url), data=data)
+
+    def _post_economy_create_company(self, industry: int, building_type: int = 1) -> Response:
+        data = {"_token": self.token, "company[industry_id]": industry, "company[building_type]": building_type}
+        return self.post("{}/economy/create-company".format(self.url), data=data,
+                         headers={"Referer": "{}/economy/create-company".format(self.url)})
+
+    def _get_economy_inventory_items(self) -> Response:
+        return self.get("{}/economy/inventory-items/".format(self.url))
+
+    def _get_economy_job_market_json(self, country: int) -> Response:
+        return self.get("{}/economy/job-market-json/{}/1/desc".format(self.url, country))
+
+    def _get_economy_my_companies(self) -> Response:
+        return self.get("{}/economy/myCompanies".format(self.url))
+
+    def _post_economy_train(self, tg_ids: List[int]) -> Response:
+        data: Dict[str, Union[int, str]] = {}
+        for idx, tg_id in enumerate(tg_ids):
+            data["grounds[%i][id]" % idx] = tg_id
+            data["grounds[%i][train]" % idx] = 1
+        if data:
+            data['_token'] = self.token
+        return self.post("{}/economy/train".format(self.url), data=data)
+
+    def _post_economy_upgrade_company(self, factory: int, level: int, pin: str = None) -> Response:
+        data = dict(_token=self.token, type="upgrade", companyId=factory, level=level, pin="" if pin is None else pin)
+        return self.post("{}/economy/upgrade-company".format(self.url), data=data)
+
+    def _post_economy_work(self, action_type: str, wam: List[int] = None, employ: Dict[int, int] = None) -> Response:
+        data: Dict[str, Union[int, str]] = dict(action_type=action_type, _token=self.token)
+        if action_type == "production":
+            if employ is None:
+                employ = {}
+            if wam is None:
+                wam = []
+            max_idx = 0
+            for company_id in sorted(wam or []):
+                data.update({
+                    f"companies[{max_idx}][id]": company_id,
+                    f"companies[{max_idx}][employee_works]": employ.pop(company_id, 0),
+                    f"companies[{max_idx}][own_work]": 1
+                })
+                max_idx += 1
+            for company_id in sorted(employ or []):
+                data.update({
+                    f"companies[{max_idx}][id]": company_id,
+                    f"companies[{max_idx}][employee_works]": employ.pop(company_id, 0),
+                    f"companies[{max_idx}][own_work]": 0
+                })
+                max_idx += 1
+        return self.post("{}/economy/work".format(self.url), data=data)
+
+    def _post_economy_work_overtime(self) -> Response:
+        data = dict(action_type="workOvertime", _token=self.token)
+        return self.post("{}/economy/workOvertime".format(self.url), data=data)
+
+    def _post_economy_job_market_apply(self, citizen: int, salary: float) -> Response:
+        data = dict(_token=self.token, citizenId=citizen, salary=salary)
+        return self.post("{}/economy/job-market-apply".format(self.url), data=data)
+
+    def _post_economy_resign(self) -> Response:
+        return self.post("{}/economy/resign".format(self.url),
+                         headers={"Content-Type": "application/x-www-form-urlencoded"},
+                         data={"_token": self.token, "action_type": "resign"})
+
+    def _post_economy_sell_company(self, factory: int, pin: int = None, sell: bool = True) -> Response:
+        data = dict(_token=self.token, pin="" if pin is None else pin)
+        if sell:
+            data.update({"sell": "sell"})
+        else:
+            data.update({"dissolve": factory})
+        return self.post("{}/economy/sell-company/{}".format(self.url, factory),
+                         data=data, headers={"Referer": self.url})
+
+
+class ErepublikCountryAPI(CitizenBaseAPI):
+    def _get_country_military(self, country: str) -> Response:
+        return self.get("{}/country/military/{}".format(self.url, country))
+
+    def _post_main_country_donate(self, country: int, action: str, value: Union[int, float],
+                                  quality: int = None) -> Response:
+        json = dict(countryId=country, action=action, _token=self.token, value=value, quality=quality)
+        return self.post("{}/main/country-donate".format(self.url), data=json,
+                         headers={"Referer": "{}/country/economy/Latvia".format(self.url)})
+
+
+class ErepublikEconomyAPI(CitizenBaseAPI):
+    def _get_economy_citizen_accounts(self, organisation_id: int) -> Response:
+        return self.get("{}/economy/citizen-accounts/{}".format(self.url, organisation_id))
+
+    def _get_economy_my_market_offers(self) -> Response:
+        return self.get("{}/economy/myMarketOffers".format(self.url))
+
+    def _get_main_job_data(self) -> Response:
+        return self.get("{}/main/job-data".format(self.url))
+
+    def _post_main_buy_gold_items(self, currency: str, item: str, amount: int) -> Response:
+        data = dict(itemId=item, currency=currency, amount=amount, _token=self.token)
+        return self.post("{}/main/buyGoldItems".format(self.url), data=data)
+
+    def _post_economy_activate_booster(self, quality: int, duration: int, kind: str) -> Response:
+        data = dict(type=kind, quality=quality, duration=duration, fromInventory=True)
+        return self.post("{}/economy/activateBooster".format(self.url), data=data)
+
+    def _post_economy_activate_house(self, quality: int) -> Response:
+        data = {"action": "activate", "quality": quality, "type": "house", "_token": self.token}
+        return self.post("{}/economy/activateHouse".format(self.url), data=data)
+
+    def _post_economy_donate_items_action(self, citizen: int, amount: int, industry: int,
+                                          quality: int) -> Response:
+        data = dict(citizen_id=citizen, amount=amount, industry_id=industry, quality=quality, _token=self.token)
+        return self.post("{}/economy/donate-items-action".format(self.url), data=data,
+                         headers={"Referer": "{}/economy/donate-items/{}".format(self.url, citizen)})
+
+    def _post_economy_donate_money_action(self, citizen: int, amount: float = 0.0,
+                                          currency: int = 62) -> Response:
+        data = dict(citizen_id=citizen, _token=self.token, currency_id=currency, amount=amount)
+        return self.post("{}/economy/donate-money-action".format(self.url), data=data,
+                         headers={"Referer": "{}/economy/donate-money/{}".format(self.url, citizen)})
+
+    def _post_economy_exchange_purchase(self, amount: float, currency: int, offer: int) -> Response:
+        data = dict(_token=self.token, amount=amount, currencyId=currency, offerId=offer)
+        return self.post("{}/economy/exchange/purchase/".format(self.url), data=data)
+
+    def _post_economy_exchange_retrieve(self, personal: bool, page: int, currency: int) -> Response:
+        data = dict(_token=self.token, personalOffers=int(personal), page=page, currencyId=currency)
+        return self.post("{}/economy/exchange/retrieve/".format(self.url), data=data)
+
+    def _post_economy_game_tokens_market(self, action: str) -> Response:
+        assert action in ['retrieve', ]
+        data = dict(_token=self.token, action=action)
+        return self.post("{}/economy/gameTokensMarketAjax".format(self.url), data=data)
+
+    def _post_economy_marketplace(self, country: int, industry: int, quality: int,
+                                  order_asc: bool = True) -> Response:
+        data = dict(countryId=country, industryId=industry, quality=quality, ajaxMarket=1,
+                    orderBy="price_asc" if order_asc else "price_desc", _token=self.token)
+        return self.post("{}/economy/marketplaceAjax".format(self.url), data=data)
+
+    def _post_economy_marketplace_actions(self, amount: int, buy: bool = False, **kwargs) -> Response:
+        if buy:
+            data = dict(_token=self.token, offerId=kwargs['offer'], amount=amount, orderBy="price_asc", currentPage=1,
+                        buyAction=1)
+        else:
+            data = dict(_token=self.token, countryId=kwargs["country"], price=kwargs["price"],
+                        industryId=kwargs["industry"], quality=kwargs["quality"], amount=amount, sellAction='postOffer')
+        return self.post("{}/economy/marketplaceActions".format(self.url), data=data)
+
+
+class ErepublikLeaderBoardAPI(CitizenBaseAPI):
+    def _get_main_leaderboards_damage_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response:
+        data = (country, weeks, mu)
+        return self.get("{}/main/leaderboards-damage-aircraft-rankings/{}/{}/{}/0".format(self.url, *data))
+
+    def _get_main_leaderboards_damage_rankings(self, country: int, weeks: int = 0, mu: int = 0,
+                                               div: int = 0) -> Response:
+        data = (country, weeks, mu, div)
+        return self.get("{}/main/leaderboards-damage-rankings/{}/{}/{}/{}".format(self.url, *data))
+
+    def _get_main_leaderboards_kills_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response:
+        data = (country, weeks, mu)
+        return self.get("{}/main/leaderboards-kills-aircraft-rankings/{}/{}/{}/0".format(self.url, *data))
+
+    def _get_main_leaderboards_kills_rankings(self, country: int, weeks: int = 0, mu: int = 0,
+                                              div: int = 0) -> Response:
+        data = (country, weeks, mu, div)
+        return self.get("{}/main/leaderboards-kills-rankings/{}/{}/{}/{}".format(self.url, *data))
+
+
+class ErepublikLocationAPI(CitizenBaseAPI):
+    def _get_main_city_data_residents(self, city: int, page: int = 1, params: Mapping[str, Any] = None) -> Response:
+        if params is None:
+            params = {}
+        return self.get("{}/main/city-data/{}/residents".format(self.url, city), params={"currentPage": page, **params})
+
+
+class ErepublikMilitaryAPI(CitizenBaseAPI):
+    def _get_military_battlefield_choose_side(self, battle: int, side: int) -> Response:
+        return self.get("{}/military/battlefield-choose-side/{}/{}".format(self.url, battle, side))
+
+    def _get_military_show_weapons(self, battle: int) -> Response:
+        return self.get("{}/military/show-weapons".format(self.url), params={'_token': self.token, 'battleId': battle})
+
+    def _get_military_campaigns(self) -> Response:
+        return self.get("{}/military/campaigns-new/".format(self.url))
+
+    def _get_military_campaigns_json_list(self) -> Response:
+        return self.get("{}/military/campaignsJson/list".format(self.url))
+
+    def _get_military_campaigns_json_citizen(self) -> Response:
+        return self.get("{}/military/campaignsJson/citizen".format(self.url))
+
+    def _get_military_unit_data(self, unit_id: int, **kwargs) -> Response:
+        params = {"groupId": unit_id, "panel": "members", **kwargs}
+        return self.get("{}/military/military-unit-data/".format(self.url), params=params)
+
+    def _post_main_activate_battle_effect(self, battle: int, kind: str, citizen_id: int) -> Response:
+        data = dict(battleId=battle, citizenId=citizen_id, type=kind, _token=self.token)
+        return self.post("{}/main/fight-activateBattleEffect".format(self.url), data=data)
+
+    def _post_main_battlefield_travel(self, side_id: int, battle_id: int) -> Response:
+        data = dict(_token=self.token, sideCountryId=side_id, battleId=battle_id)
+        return self.post("{}/main/battlefieldTravel".format(self.url), data=data)
+
+    def _post_main_battlefield_change_division(self, battle_id: int, division_id: int) -> Response:
+        data = dict(_token=self.token, battleZoneId=division_id, battleId=battle_id)
+        return self.post("{}/main/battlefieldTravel".format(self.url), data=data)
+
+    def _get_wars_show(self, war_id: int) -> Response:
+        return self.get("{}/wars/show/{}".format(self.url, war_id))
+
+    def _post_military_fight_activate_booster(self, battle: int, quality: int, duration: int, kind: str) -> Response:
+        data = dict(type=kind, quality=quality, duration=duration, battleId=battle, _token=self.token)
+        return self.post("{}/military/fight-activateBooster".format(self.url), data=data)
+
+    def _post_military_change_weapon(self, battle: int, battle_zone: int, weapon_level: int, ) -> Response:
+        data = dict(battleId=battle, _token=self.token, battleZoneId=battle_zone, customizationLevel=weapon_level)
+        return self.post("{}/military/change-weapon".format(self.url), data=data)
+
+    def _post_military_battle_console(self, battle_id: int, action: str, page: int = 1, **kwargs) -> Response:
+        data = dict(battleId=battle_id, action=action, _token=self.token)
+        if action == "battleStatistics":
+            data.update(round=kwargs["round_id"], zoneId=kwargs["round_id"], leftPage=page, rightPage=page,
+                        division=kwargs["division"], type=kwargs.get("type", 'damage'), )
+        elif action == "warList":
+            data.update(page=page)
+        return self.post("{}/military/battle-console".format(self.url), data=data)
+
+    def _post_military_deploy_bomb(self, battle_id: int, bomb_id: int) -> Response:
+        data = dict(battleId=battle_id, bombId=bomb_id, _token=self.token)
+        return self.post("{}/military/deploy-bomb".format(self.url), data=data)
+
+    def _post_military_fight_air(self, battle_id: int, side_id: int, zone_id: int) -> Response:
+        data = dict(sideId=side_id, battleId=battle_id, _token=self.token, battleZoneId=zone_id)
+        return self.post("{}/military/fight-shoooot/{}".format(self.url, battle_id), data=data)
+
+    def _post_military_fight_ground(self, battle_id: int, side_id: int, zone_id: int) -> Response:
+        data = dict(sideId=side_id, battleId=battle_id, _token=self.token, battleZoneId=zone_id)
+        return self.post("{}/military/fight-shooot/{}".format(self.url, battle_id), data=data)
+
+    def _post_fight_deploy_deploy_report_data(self, deployment_id: int):
+        data = dict(_token=self.token, deploymentId=deployment_id)
+        return self.post(f"{self.url}/military/fightDeploy-deployReportData", json=data)
+
+
+class ErepublikPoliticsAPI(CitizenBaseAPI):
+    def _get_candidate_party(self, party_slug: str) -> Response:
+        return self.post("{}/candidate/{}".format(self.url, party_slug))
+
+    def _get_main_party_members(self, party: int) -> Response:
+        return self.get("{}/main/party-members/{}".format(self.url, party))
+
+    def _get_main_rankings_parties(self, country: int) -> Response:
+        return self.get("{}/main/rankings-parties/1/{}".format(self.url, country))
+
+    def _post_candidate_for_congress(self, presentation: str = "") -> Response:
+        data = dict(_token=self.token, presentation=presentation)
+        return self.post("{}/candidate-for-congress".format(self.url), data=data)
+
+
+class ErepublikPresidentAPI(CitizenBaseAPI):
+    def _post_wars_attack_region(self, war_id: int, region_id: int, region_name: str) -> Response:
+        data = {'_token': self.token, 'warId': war_id, 'regionName': region_name, 'regionNameConfirm': region_name}
+        return self.post('{}/wars/attack-region/{}/{}'.format(self.url, war_id, region_id), data=data)
+
+    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)
+
+    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)
+
+
+class ErepublikProfileAPI(CitizenBaseAPI):
+    def _get_main_citizen_hovercard(self, citizen: int) -> Response:
+        return self.get("{}/main/citizen-hovercard/{}".format(self.url, citizen))
+
+    def _get_main_citizen_profile_json(self, player_id: int) -> Response:
+        return self.get("{}/main/citizen-profile-json/{}".format(self.url, player_id))
+
+    def _get_main_citizen_notifications(self) -> Response:
+        return self.get("{}/main/citizenDailyAssistant".format(self.url))
+
+    def _get_main_citizen_daily_assistant(self) -> Response:
+        return self.get("{}/main/citizenNotifications".format(self.url))
+
+    def _get_main_messages_paginated(self, page: int = 1) -> Response:
+        return self.get("{}/main/messages-paginated/{}".format(self.url, page))
+
+    def _get_main_money_donation_accept(self, donation_id: int) -> Response:
+        return self.get("{}/main/money-donation/accept/{}".format(self.url, donation_id), params={"_token": self.token})
+
+    def _get_main_money_donation_reject(self, donation_id: int) -> Response:
+        return self.get("{}/main/money-donation/reject/{}".format(self.url, donation_id), params={"_token": self.token})
+
+    def _get_main_notifications_ajax_community(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/community/{}".format(self.url, page))
+
+    def _get_main_notifications_ajax_system(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/system/{}".format(self.url, page))
+
+    def _get_main_notifications_ajax_report(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/report/{}".format(self.url, page))
+
+    def _get_main_training_grounds_json(self) -> Response:
+        return self.get("{}/main/training-grounds-json".format(self.url))
+
+    def _get_main_weekly_challenge_data(self) -> Response:
+        return self.get("{}/main/weekly-challenge-data".format(self.url))
+
+    def _post_main_citizen_add_remove_friend(self, citizen: int, add: bool) -> Response:
+        data = dict(_token=self.token, citizenId=citizen, url="//www.erepublik.com/en/main/citizen-addRemoveFriend")
+        if add:
+            data.update({"action": "addFriend"})
+        else:
+            data.update({"action": "removeFriend"})
+        return self.post("{}/main/citizen-addRemoveFriend".format(self.url), data=data)
+
+    def _post_main_daily_task_reward(self) -> Response:
+        return self.post("{}/main/daily-tasks-reward".format(self.url), data=dict(_token=self.token))
+
+    def _post_delete_message(self, msg_id: list) -> Response:
+        data = {"_token": self.token, "delete_message[]": msg_id}
+        return self.post("{}/main/messages-delete".format(self.url), data)
+
+    def _post_eat(self, color: str) -> Response:
+        data = dict(_token=self.token, buttonColor=color)
+        return self.post("{}/main/eat".format(self.url), params=data)
+
+    def _post_main_global_alerts_close(self, alert_id: int) -> Response:
+        data = dict(_token=self.token, alert_id=alert_id)
+        return self.post("{}/main/global-alerts/close".format(self.url), data=data)
+
+    def _post_forgot_password(self, email: str) -> Response:
+        data = dict(_token=self.token, email=email, commit="Reset password")
+        return self.post("{}/forgot-password".format(self.url), data=data)
+
+    def _post_login(self, email: str, password: str) -> Response:
+        data = dict(csrf_token=self.token, citizen_email=email, citizen_password=password, remember='on')
+        return self.post("{}/login".format(self.url), data=data)
+
+    def _post_main_messages_alert(self, notification_ids: List[int]) -> Response:
+        data = {"_token": self.token, "delete_alerts[]": notification_ids, "deleteAllAlerts": "1", "delete": "Delete"}
+        return self.post("{}/main/messages-alerts/1".format(self.url), data=data)
+
+    def _post_main_notifications_ajax_community(self, notification_ids: List[int], page: int = 1) -> Response:
+        data = {"_token": self.token, "delete_alerts[]": notification_ids}
+        return self.post("{}/main/notificationsAjax/community/{}".format(self.url, page), data=data)
+
+    def _post_main_notifications_ajax_system(self, notification_ids: List[int], page: int = 1) -> Response:
+        data = {"_token": self.token, "delete_alerts[]": notification_ids}
+        return self.post("{}/main/notificationsAjax/system/{}".format(self.url, page), data=data)
+
+    def _post_main_notifications_ajax_report(self, notification_ids: List[int], page: int = 1) -> Response:
+        data = {"_token": self.token, "delete_alerts[]": notification_ids}
+        return self.post("{}/main/notificationsAjax/report/{}".format(self.url, page), data=data)
+
+    def _post_main_messages_compose(self, subject: str, body: str, citizens: List[int]) -> Response:
+        url_pk = 0 if len(citizens) > 1 else str(citizens[0])
+        data = dict(citizen_name=",".join([str(x) for x in citizens]),
+                    citizen_subject=subject, _token=self.token, citizen_message=body)
+        return self.post("{}/main/messages-compose/{}".format(self.url, url_pk), data=data)
+
+    def _post_military_group_missions(self) -> Response:
+        data = dict(action="check", _token=self.token)
+        return self.post("{}/military/group-missions".format(self.url), data=data)
+
+    def _post_main_weekly_challenge_reward(self, reward_id: int) -> Response:
+        data = dict(_token=self.token, rewardId=reward_id)
+        return self.post("{}/main/weekly-challenge-collect-reward".format(self.url), data=data)
+
+
+class ErepublikTravelAPI(CitizenBaseAPI):
+    def _post_main_travel(self, check: str, **kwargs) -> Response:
+        data = dict(_token=self.token, check=check, **kwargs)
+        return self.post("{}/main/travel".format(self.url), data=data)
+
+    def _post_main_travel_data(self, **kwargs) -> Response:
+        return self.post("{}/main/travelData".format(self.url), data=dict(_token=self.token, **kwargs))
+
+
+class ErepublikWallPostAPI(CitizenBaseAPI):
+    # ## Country
+
+    def _post_main_country_comment_retrieve(self, post_id: int) -> Response:
+        data = {"_token": self.token, "postId": post_id}
+        return self.post("{}/main/country-comment/retrieve/json".format(self.url), data=data)
+
+    def _post_main_country_comment_create(self, post_id: int, comment_message: str) -> Response:
+        data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message}
+        return self.post("{}/main/country-comment/create/json".format(self.url), data=data)
+
+    def _post_main_country_post_create(self, body: str, post_as: int) -> Response:
+        data = {"_token": self.token, "post_message": body, "post_as": post_as}
+        return self.post("{}/main/country-post/create/json".format(self.url), data=data)
+
+    def _post_main_country_post_retrieve(self) -> Response:
+        data = {"_token": self.token, "page": 1, "switchedFrom": False}
+        return self.post("{}/main/country-post/retrieve/json".format(self.url), data=data)
+
+    # ## Military Unit
+
+    def _post_main_military_unit_comment_retrieve(self, post_id: int) -> Response:
+        data = {"_token": self.token, "postId": post_id}
+        return self.post("{}/main/military-unit-comment/retrieve/json".format(self.url), data=data)
+
+    def _post_main_military_unit_comment_create(self, post_id: int, comment_message: str) -> Response:
+        data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message}
+        return self.post("{}/main/military-unit-comment/create/json".format(self.url), data=data)
+
+    def _post_main_military_unit_post_create(self, body: str, post_as: int) -> Response:
+        data = {"_token": self.token, "post_message": body, "post_as": post_as}
+        return self.post("{}/main/military-unit-post/create/json".format(self.url), data=data)
+
+    def _post_main_military_unit_post_retrieve(self) -> Response:
+        data = {"_token": self.token, "page": 1, "switchedFrom": False}
+        return self.post("{}/main/military-unit-post/retrieve/json".format(self.url), data=data)
+
+    # ## Party
+
+    def _post_main_party_comment_retrieve(self, post_id: int) -> Response:
+        data = {"_token": self.token, "postId": post_id}
+        return self.post("{}/main/party-comment/retrieve/json".format(self.url), data=data)
+
+    def _post_main_party_comment_create(self, post_id: int, comment_message: str) -> Response:
+        data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message}
+        return self.post("{}/main/party-comment/create/json".format(self.url), data=data)
+
+    def _post_main_party_post_create(self, body: str) -> Response:
+        data = {"_token": self.token, "post_message": body}
+        return self.post("{}/main/party-post/create/json".format(self.url), data=data)
+
+    def _post_main_party_post_retrieve(self) -> Response:
+        data = {"_token": self.token, "page": 1, "switchedFrom": False}
+        return self.post("{}/main/party-post/retrieve/json".format(self.url), data=data)
+
+    # ## Friend's Wall
+
+    def _post_main_wall_comment_retrieve(self, post_id: int) -> Response:
+        data = {"_token": self.token, "postId": post_id}
+        return self.post("{}/main/wall-comment/retrieve/json".format(self.url), data=data)
+
+    def _post_main_wall_comment_create(self, post_id: int, comment_message: str) -> Response:
+        data = {"_token": self.token, "postId": post_id, 'comment_message': comment_message}
+        return self.post("{}/main/wall-comment/create/json".format(self.url), data=data)
+
+    def _post_main_wall_post_create(self, body: str) -> Response:
+        data = {"_token": self.token, "post_message": body}
+        return self.post("{}/main/wall-post/create/json".format(self.url), data=data)
+
+    def _post_main_wall_post_retrieve(self) -> Response:
+        data = {"_token": self.token, "page": 1, "switchedFrom": False}
+        return self.post("{}/main/wall-post/retrieve/json".format(self.url), data=data)
+
+    # ## Medal posting
+    def _post_main_wall_post_automatic(self, message: str, achievement_id: int) -> Response:
+        return self.post("{}/main/wall-post/automatic".format(self.url), data=dict(_token=self.token, message=message,
+                                                                                   achievementId=achievement_id))
+
+
+class CitizenAPI(
+    ErepublikArticleAPI, ErepublikCountryAPI, ErepublikCompanyAPI, ErepublikEconomyAPI,
+    ErepublikLeaderBoardAPI, ErepublikLocationAPI, ErepublikMilitaryAPI, ErepublikProfileAPI,
+    ErepublikPresidentAPI, ErepublikPoliticsAPI, ErepublikAnniversaryAPI, ErepublikWallPostAPI,
+    ErepublikTravelAPI
+):
+    pass

erepublik/utils.py

@@ -3,114 +3,136 @@ import inspect
 import os
 import re
 import sys
+import textwrap
 import time
 import traceback
 import unicodedata
 from decimal import Decimal
 from pathlib import Path
-from typing import Any, List, Mapping, NoReturn, Optional, Union
+from typing import Any, List, Mapping, Optional, Union, Dict
 
 import pytz
 import requests
 
+from . import __commit_id__, __version__
+
 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", 'report_promo', 'calculate_hit']
+           "send_email", "normalize_html_json", "process_error", "process_warning",
+           'calculate_hit', 'get_ground_hit_dmg_value', 'get_air_hit_dmg_value']
 
 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(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
-COMMIT_ID = "7b92e19"
+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 = {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*****", }
+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 = {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_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",
+}
 
-COUNTRIES = {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'}
+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
+}
 
-COUNTRY_LINK = {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', 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', 61: 'Slovenia', 63: 'Croatia', 64: 'Chile', 65: 'Serbia',
-                66: 'Malaysia', 67: 'Philippines', 70: 'Estonia', 165: 'Egypt', 14: 'China', 77: 'Peru', 10: 'Italy',
-                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',
-                169: 'Armenia', 83: 'Belarus', 84: 'New-Zealand', 164: 'Saudi-Arabia', 170: 'Nigeria', }
+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'
+}
 
-ISO_CC = {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'}
+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:
@@ -154,9 +176,9 @@ def date_from_eday(eday: int) -> datetime.date:
     return localize_dt(datetime.date(2007, 11, 20)) + datetime.timedelta(days=eday)
 
 
-def get_sleep_seconds(time_untill: datetime.datetime) -> int:
+def get_sleep_seconds(time_until: datetime.datetime) -> int:
     """ time_until aware datetime object Wrapper for sleeping until """
-    sleep_seconds = int((time_untill - now()).total_seconds())
+    sleep_seconds = int((time_until - now()).total_seconds())
     return sleep_seconds if sleep_seconds > 0 else 0
 
 
@@ -186,6 +208,7 @@ silent_sleep = time.sleep
 def _write_log(msg, timestamp: bool = True, should_print: bool = False):
     erep_time_now = now()
     txt = "[{}] {}".format(erep_time_now.strftime('%F %T'), msg) if timestamp else msg
+    txt = "\n".join(["\n".join(textwrap.wrap(line, 120)) for line in txt.splitlines()])
     if not os.path.isdir('log'):
         os.mkdir('log')
     with open("log/%s.log" % erep_time_now.strftime('%F'), 'a', encoding="utf-8") as f:
@@ -300,8 +323,7 @@ def send_email(name: str, content: List[Any], player=None, local_vars: Mapping[A
         if "state_thread" in local_vars:
             local_vars.pop('state_thread', None)
         from erepublik.classes import MyJSONEncoder
-        files.append(('file', ("local_vars.json", json.dumps(local_vars, indent=2,
-                                                             cls=MyJSONEncoder, sort_keys=True), "application/json")))
+        files.append(('file', ("local_vars.json", json.dumps(local_vars, cls=MyJSONEncoder, sort_keys=True), "application/json")))
     if isinstance(player, Citizen):
         files.append(('file', ("instance.json", player.to_json(indent=True), "application/json")))
     requests.post('https://pasts.72.lv', data=data, files=files)
@@ -315,6 +337,10 @@ def normalize_html_json(js: str) -> str:
     return js
 
 
+def caught_error(e: Exception):
+    process_error(str(e), "Unclassified", sys.exc_info(), None, COMMIT_ID, False)
+
+
 def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commit_id: str = None,
                   interactive: Optional[bool] = None):
     """
@@ -329,13 +355,14 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
     :type exc_info: tuple
     :param citizen: Citizen instance
     :type citizen: Citizen
-    :param commit_id: Code's version by commit id
+    :param commit_id: Caller's code version's commit id
     :type commit_id: str
     """
     type_, value_, traceback_ = exc_info
     content = [log_info]
+    content += [f"eRepublik version {VERSION}, commit id {COMMIT_ID}"]
     if commit_id:
-        content += ["Commit id: %s" % commit_id]
+        content += [f"Commit id {commit_id}"]
     content += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]
 
     if interactive:
@@ -378,10 +405,6 @@ def process_warning(log_info: str, name: str, exc_info: tuple, citizen=None, com
     send_email(name, content, citizen, local_vars=trace)
 
 
-def report_promo(kind: str, time_untill: datetime.datetime) -> NoReturn:
-    requests.post('https://api.erep.lv/promos/add/', data=dict(kind=kind, time_untill=time_untill))
-
-
 def slugify(value, allow_unicode=False) -> str:
     """
     Function copied from Django2.2.1 django.utils.text.slugify
@@ -399,7 +422,7 @@ def slugify(value, allow_unicode=False) -> str:
 
 
 def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, booster: int = 0,
-                  weapon: int = 200, is_deploy: bool = False) -> float:
+                  weapon: int = 200, is_deploy: bool = False) -> Decimal:
     dec = 3 if is_deploy else 0
     base_str = (1 + Decimal(str(round(strength, 3))) / 400)
     base_rnk = (1 + Decimal(str(rang / 5)))
@@ -420,7 +443,7 @@ def calculate_hit(strength: float, rang: int, tp: bool, elite: bool, ne: bool, b
 
 
 def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
-                             booster: int = 0, weapon_power: int = 200) -> float:
+                             booster: int = 0, weapon_power: int = 200) -> Decimal:
     r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
     rang = r['military']['militaryData']['ground']['rankNumber']
     strength = r['military']['militaryData']['ground']['strength']
@@ -432,7 +455,7 @@ def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_
 
 
 def get_air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
-                          weapon_power: int = 0) -> float:
+                          weapon_power: int = 0) -> Decimal:
     r = requests.get(f"https://www.erepublik.com/en/main/citizen-profile-json/{citizen_id}").json()
     rang = r['military']['militaryData']['aircraft']['rankNumber']
     elite = r['citizenAttributes']['level'] > 100

examples/battle_launcher.py

@@ -9,7 +9,8 @@ CONFIG = {
     'interactive': True,
     'fight': True,
     'debug': True,
-    'start_battles': {
+    'battle_launcher': {
+        # War id: {auto_attack: bool (attack asap when region is available), regions: [region_ids allowed to attack]}
         121672: {"auto_attack": False, "regions": [661]},
         125530: {"auto_attack": False, "regions": [259]},
         125226: {"auto_attack": True, "regions": [549]},
@@ -24,7 +25,7 @@ def _battle_launcher(player: Citizen):
     time. If player is allowed to fight, do 100 hits on the first round in players division.
 
     :param player: Logged in Citizen instance
-    ":type player: Citizen
+    :type player: Citizen
     """
     global CONFIG
     finished_war_ids = {*[]}
@@ -38,13 +39,13 @@ def _battle_launcher(player: Citizen):
             player.update_war_info()
             running_wars = {b.war_id for b in player.all_battles.values()}
             for war_id in war_ids - finished_war_ids - running_wars:
-                war = war_data[str(war_id)]
+                war = war_data[war_id]
                 war_regions = set(war.get('regions'))
                 auto_attack = war.get('auto_attack')
 
                 status = player.get_war_status(war_id)
                 if status.get('ended', False):
-                    CONFIG['start_battles'].pop(str(war_id), None)
+                    CONFIG['start_battles'].pop(war_id, None)
                     finished_war_ids.add(war_id)
                     continue
                 elif not status.get('can_attack'):
@@ -76,18 +77,19 @@ def _battle_launcher(player: Citizen):
             else:
                 next_attack_time = utils.good_timedelta(next_attack_time, timedelta(minutes=5))
             player.stop_threads.wait(utils.get_sleep_seconds(next_attack_time))
-        except:
-            player.report_error("Task error: start_battles")
+        except Exception as e:
+            player.report_error(f"Task battle launcher ran into error {e}")
 
 
+# noinspection DuplicatedCode
 def main():
     player = Citizen(email=CONFIG['email'], password=CONFIG['password'], auto_login=False)
     player.config.interactive = CONFIG['interactive']
     player.config.fight = CONFIG['fight']
     player.set_debug(CONFIG.get('debug', False))
     player.login()
-    if CONFIG.get('start_battles'):
-        name = "{}-start_battles-{}".format(player.name, threading.active_count() - 1)
+    if CONFIG.get('battle_launcher'):
+        name = "{}-battle_launcher-{}".format(player.name, threading.active_count() - 1)
         state_thread = threading.Thread(target=_battle_launcher, args=(player,), name=name)
         state_thread.start()
 

examples/eat_work_train.py

@@ -10,6 +10,7 @@ CONFIG = {
 }
 
 
+# noinspection DuplicatedCode
 def main():
     player = Citizen(email=CONFIG['email'], password=CONFIG['password'], auto_login=False)
     player.config.interactive = CONFIG['interactive']
@@ -30,72 +31,75 @@ def main():
     if player.config.wam:
         tasks.update({'wam': now.replace(hour=14, minute=0)})
     while True:
-        player.update_all()
-        if tasks.get('work', dt_max) <= now:
-            player.write_log("Doing task: work")
-            player.update_citizen_info()
-            player.work()
-            if player.config.ot:
-                tasks['ot'] = now
-            player.collect_daily_task()
-            next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1))
-            tasks.update({'work': next_time})
+        try:
+            player.update_all()
+            if tasks.get('work', dt_max) <= now:
+                player.write_log("Doing task: work")
+                player.update_citizen_info()
+                player.work()
+                if player.config.ot:
+                    tasks['ot'] = now
+                player.collect_daily_task()
+                next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1))
+                tasks.update({'work': next_time})
 
-        if tasks.get('train', dt_max) <= now:
-            player.write_log("Doing task: train")
-            player.update_citizen_info()
-            player.train()
-            player.collect_daily_task()
-            next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1))
-            tasks.update({'train': next_time})
+            if tasks.get('train', dt_max) <= now:
+                player.write_log("Doing task: train")
+                player.update_citizen_info()
+                player.train()
+                player.collect_daily_task()
+                next_time = utils.good_timedelta(now.replace(hour=0, minute=0, second=0), timedelta(days=1))
+                tasks.update({'train': next_time})
 
-        if tasks.get('wam', dt_max) <= now:
-            player.write_log("Doing task: Work as manager")
-            success = player.work_wam()
-            player.eat()
-            if success:
-                next_time = utils.good_timedelta(now.replace(hour=14, minute=0, second=0, microsecond=0),
-                                                 timedelta(days=1))
-            else:
-                next_time = utils.good_timedelta(now.replace(second=0, microsecond=0), timedelta(minutes=30))
+            if tasks.get('wam', dt_max) <= now:
+                player.write_log("Doing task: Work as manager")
+                success = player.work_as_manager()
+                player.eat()
+                if success:
+                    next_time = utils.good_timedelta(now.replace(hour=14, minute=0, second=0, microsecond=0),
+                                                     timedelta(days=1))
+                else:
+                    next_time = utils.good_timedelta(now.replace(second=0, microsecond=0), timedelta(minutes=30))
 
-            tasks.update({'wam': next_time})
+                tasks.update({'wam': next_time})
 
-        if tasks.get('eat', dt_max) <= now:
-            player.write_log("Doing task: eat")
-            player.eat()
+            if tasks.get('eat', dt_max) <= now:
+                player.write_log("Doing task: eat")
+                player.eat()
 
-            if player.energy.food_fights > player.energy.limit // 10:
-                next_minutes = 12
-            else:
-                next_minutes = (player.energy.limit - 5 * player.energy.interval) // player.energy.interval * 6
+                if player.energy.food_fights > player.energy.limit // 10:
+                    next_minutes = 12
+                else:
+                    next_minutes = (player.energy.limit - 5 * player.energy.interval) // player.energy.interval * 6
 
-            next_time = player.energy.reference_time + timedelta(minutes=next_minutes)
-            tasks.update({'eat': next_time})
+                next_time = player.energy.reference_time + timedelta(minutes=next_minutes)
+                tasks.update({'eat': next_time})
 
-        if tasks.get('ot', dt_max) <= now:
-            player.write_log("Doing task: ot")
-            if now > player.my_companies.next_ot_time:
-                player.work_ot()
-                next_time = now + timedelta(minutes=60)
-            else:
-                next_time = player.my_companies.next_ot_time
-            tasks.update({'ot': next_time})
+            if tasks.get('ot', dt_max) <= now:
+                player.write_log("Doing task: ot")
+                if now > player.my_companies.next_ot_time:
+                    player.work_ot()
+                    next_time = now + timedelta(minutes=60)
+                else:
+                    next_time = player.my_companies.next_ot_time
+                tasks.update({'ot': next_time})
 
-        closest_next_time = dt_max
-        next_tasks = []
-        for task, next_time in sorted(tasks.items(), key=lambda s: s[1]):
-            next_tasks.append("{}: {}".format(next_time.strftime('%F %T'), task))
-            if next_time < closest_next_time:
-                closest_next_time = next_time
-        sleep_seconds = int(utils.get_sleep_seconds(closest_next_time))
-        if sleep_seconds <= 0:
-            player.write_log(f"Loop detected! Offending task: '{next_tasks[0]}'")
-        player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks)))
-        player.write_log("Sleeping until (eRep): {} (sleeping for {}s)".format(
-            closest_next_time.strftime("%F %T"), sleep_seconds))
-        seconds_to_sleep = sleep_seconds if sleep_seconds > 0 else 0
-        player.sleep(seconds_to_sleep)
+            closest_next_time = dt_max
+            next_tasks = []
+            for task, next_time in sorted(tasks.items(), key=lambda s: s[1]):
+                next_tasks.append("{}: {}".format(next_time.strftime('%F %T'), task))
+                if next_time < closest_next_time:
+                    closest_next_time = next_time
+            sleep_seconds = int(utils.get_sleep_seconds(closest_next_time))
+            if sleep_seconds <= 0:
+                player.write_log(f"Loop detected! Offending task: '{next_tasks[0]}'")
+            player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks)))
+            player.write_log("Sleeping until (eRep): {} (sleeping for {}s)".format(
+                closest_next_time.strftime("%F %T"), sleep_seconds))
+            seconds_to_sleep = sleep_seconds if sleep_seconds > 0 else 0
+            player.sleep(seconds_to_sleep)
+        except Exception as e:
+            player.report_error(f"Task main loop ran into error: {e}")
 
 
 if __name__ == "__main__":

requirements_dev.txt

@@ -1,16 +1,17 @@
-bumpversion==0.5.3
-coverage==5.0.2
+bump2version==1.0.0
+coverage==5.1
 edx-sphinx-theme==1.5.0
-flake8==3.7.9
-ipython==7.11.1
+flake8==3.8.3
+ipython==7.15.0
 isort==4.3.21
-pip==19.3.1
+pip==20.1.1
 PyInstaller==3.6
-pytz==2019.3
-requests==2.22.0
-setuptools==44.0.0
-Sphinx==2.3.1
-tox==3.14.3
+pytz==2020.1
+requests==2.23.0
+responses==0.10.15
+setuptools==47.1.1
+Sphinx==3.1.1
+tox==3.15.2
 twine==3.1.1
-watchdog==0.9.0
-wheel==0.33.6
+watchdog==0.10.2
+wheel==0.34.2

set_commit_id.sh

@@ -0,0 +1,5 @@
+#!/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,10 +1,9 @@
 [bumpversion]
-current_version = 0.19.4.1
+current_version = 0.20.1.1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
-serialize = 
-	{major}.{minor}.{patch}.{dev}
+serialize = {major}.{minor}.{patch}.{dev}
 	{major}.{minor}.{patch}
 
 [bumpversion:file:setup.py]
@@ -24,4 +23,3 @@ max-line-length = 120
 ignore = E722 F401
 
 [aliases]
-

setup.py

@@ -11,7 +11,7 @@ with open('README.rst') as readme_file:
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-requirements = ['pytz==2019.3', 'requests==2.22.0']
+requirements = ['pytz==2020.1', 'requests==2.23.0']
 
 setup_requirements = []
 
@@ -38,11 +38,11 @@ setup(
     keywords='erepublik',
     name='eRepublik',
     packages=find_packages(include=['erepublik']),
-    python_requires='>=3.7.*, <4',
+    python_requires='>=3.7, <4',
     setup_requires=setup_requirements,
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.19.4.1',
+    version='0.20.1.1',
     zip_safe=False,
 )

tests/test_erepublik_script.py

@@ -3,7 +3,6 @@
 
 """Tests for `erepublik` package."""
 
-
 import unittest
 
 from erepublik import Citizen
@@ -67,58 +66,64 @@ class TestErepublik(unittest.TestCase):
 
     def test_should_fight(self):
         self.citizen.config.fight = False
-        self.assertEqual(self.citizen.should_fight(), 0)
+        self.assertEqual(self.citizen.should_fight(), (0, "Fighting not allowed!", False))
 
         self.citizen.config.fight = True
 
         # Level up
         self.citizen.energy.limit = 3000
         self.citizen.details.xp = 24705
-        self.assertEqual(self.citizen.should_fight(), 0)
+        self.assertEqual(self.citizen.should_fight(), (0, 'Level up', False))
 
         self.citizen.energy.recovered = 3000
         self.citizen.energy.recoverable = 2950
         self.citizen.energy.interval = 30
-        self.assertEqual(self.citizen.should_fight(), 900)
+        self.assertEqual(self.citizen.should_fight(), (900, 'Level up', True))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 900)
+        self.assertEqual(self.citizen.should_fight(), (900, 'Level up', True))
         self.citizen.my_companies.ff_lockdown = 0
 
         # Level up reachable
         self.citizen.details.xp = 24400
-        self.assertEqual(self.citizen.should_fight(), 305)
+        self.assertEqual(self.citizen.should_fight(), (305, 'Fighting for close Levelup. Doing 305 hits', True))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 305)
+        self.assertEqual(self.citizen.should_fight(), (305, 'Fighting for close Levelup. Doing 305 hits', True))
         self.citizen.my_companies.ff_lockdown = 0
 
         self.citizen.details.xp = 21000
-        self.assertEqual(self.citizen.should_fight(), 75)
+        self.assertEqual(self.citizen.should_fight(), (75, 'Obligatory fighting for at least 75pp', True))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 75)
+        self.assertEqual(self.citizen.should_fight(), (75, 'Obligatory fighting for at least 75pp', True))
         self.citizen.my_companies.ff_lockdown = 0
         self.citizen.details.pp = 80
 
         # All-in (type = all-in and full ff)
         self.citizen.config.all_in = True
-        self.assertEqual(self.citizen.should_fight(), 595)
+        self.assertEqual(self.citizen.should_fight(), (595, 'Fighting all-in. Doing 595 hits', False))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 435)
+        self.assertEqual(self.citizen.should_fight(), (
+            435, 'Fight count modified (old count: 595 | FF: 595 | WAM ff_lockdown: 160 | New count: 435)', False
+        ))
         self.citizen.my_companies.ff_lockdown = 0
 
         self.citizen.config.air = True
         self.citizen.energy.recoverable = 1000
-        self.assertEqual(self.citizen.should_fight(), 400)
+        self.assertEqual(self.citizen.should_fight(), (400, 'Fighting all-in in AIR. Doing 400 hits', False))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 240)
+        self.assertEqual(self.citizen.should_fight(), (
+            240, 'Fight count modified (old count: 400 | FF: 400 | WAM ff_lockdown: 160 | New count: 240)', False
+        ))
         self.citizen.my_companies.ff_lockdown = 0
         self.citizen.config.all_in = False
 
         self.citizen.config.next_energy = True
         self.citizen.energy.limit = 5000
         self.citizen.details.next_pp = [100, 150, 250, 400, 500]
-        self.assertEqual(self.citizen.should_fight(), 320)
+        self.assertEqual(self.citizen.should_fight(), (320, 'Fighting for +1 energy. Doing 320 hits', False))
         self.citizen.my_companies.ff_lockdown = 160
-        self.assertEqual(self.citizen.should_fight(), 160)
+        self.assertEqual(self.citizen.should_fight(), (
+            160, 'Fight count modified (old count: 320 | FF: 400 | WAM ff_lockdown: 160 | New count: 160)', False
+        ))
         self.citizen.my_companies.ff_lockdown = 0
         self.citizen.energy.limit = 3000
         self.citizen.details.next_pp = [19250, 20000]
@@ -126,5 +131,4 @@ class TestErepublik(unittest.TestCase):
 
         # 1h worth of energy
         self.citizen.energy.recoverable = 2910
-        self.assertEqual(self.citizen.should_fight(), 30)
-
+        self.assertEqual(self.citizen.should_fight(), (30, 'Fighting for 1h energy. Doing 30 hits', True))