Bugfix - auto buy raw bought all available items in offer, not the required amount

Add Config.ot for overtime enabling/disabling

.editorconfig

@@ -19,3 +19,8 @@ insert_final_newline = false
 
 [Makefile]
 indent_style = tab
+
+[*.py]
+line_length=120
+multi_line_output=0
+balanced_wrapping=True

.gitignore

@@ -85,7 +85,7 @@ celerybeat-schedule
 
 # virtualenv
 .venv
-venv/
+venv*/
 ENV/
 
 # Spyder project settings

.travis.yml

@@ -5,7 +5,7 @@ python:
   - 3.7
   - 3.6
 
-# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+# Command to install dependencies, e.g. pip install -r requirements_dev.txt --use-mirrors
 install: pip install -U tox-travis
 
 # Command to run tests, e.g. python setup.py test

CONTRIBUTING.rst

@@ -23,12 +23,6 @@ If you are reporting a bug, please include:
 * Any details about your local setup that might be helpful in troubleshooting.
 * Detailed steps to reproduce the bug.
 
-Fix Bugs
-~~~~~~~~
-
-Look through the GitHub issues for bugs. Anything tagged with "bug" and "help
-wanted" is open to whoever wants to implement it.
-
 Implement Features
 ~~~~~~~~~~~~~~~~~~
 
@@ -59,7 +53,7 @@ Get Started!
 
 Ready to contribute? Here's how to set up `erepublik` for local development.
 
-1. Fork the `erepublik_script` repo on GitHub.
+1. Fork the `erepublik` repo on GitHub.
 2. Clone your fork locally::
 
     $ git clone git@github.com:your_name_here/erepublik.git
@@ -103,7 +97,7 @@ Before you submit a pull request, check that it meets these guidelines:
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
 3. The pull request should work for Python 3.7.1. Check
-   https://travis-ci.org/eeriks/erepublik_script/pull_requests
+   https://travis-ci.org/eeriks/erepublik/pull_requests
    and make sure that the tests pass for all supported Python versions.
 
 Tips
@@ -112,7 +106,7 @@ Tips
 To run a subset of tests::
 
 
-    $ python -m unittest tests.test_erepublik_script
+    $ python -m unittest tests.test_erepublik
 
 Deploying
 ---------

HISTORY.rst

@@ -2,6 +2,20 @@
 History
 =======
 
+0.19.0 (2020-01-13)
+-------------------
+* Created method for current products on sale.
+* Updated inventory to also include products on sale
+* set_default_weapon() - eRepublik should return list with all available weapon qualities, but when a battle is just launched, they return only dict with barehands
+* fight() - no longer calls self.set_default_weapon()
+* find_battle_and_fight() - now calls self.set_default_weapon() just before fighting
+* update_war_info() - returns previous battle list if responses 'last_updated' isn't more than 30s old
+* get_battle_for_war(war_id) - returns Battle instance for specific war, if battle is active for given war
+* Citizen.get_raw_surplus() fixed and moved to Citizen.my_companies.get_wam_raw_usage()
+* Implemented division switching
+* improved multi bomb deploy with auto traveling,
+* Citizen.fight() simplified battle data gathering logic -> Citizen.shoot logic improved
+
 
 0.17.0 (2019-11-21)
 -------------------

Makefile

@@ -43,6 +43,8 @@ clean-pyc: ## remove Python file artifacts
 	find . -name '*.pyo' -exec rm -f {} +
 	find . -name '*~' -exec rm -f {} +
 	find . -name '__pycache__' -exec rm -fr {} +
+	rm -rf debug/
+	rm -rf log/
 
 clean-test: ## remove test and coverage artifacts
 	rm -fr .tox/
@@ -86,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.18.2'
+__version__ = '0.20.0'
+__commit_id__ = "4e33717"
 
 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/classes.py

@@ -1,17 +1,19 @@
 import datetime
 import decimal
 import hashlib
-import random
 import threading
-import time
-from collections import deque
-from json import JSONDecodeError, loads, JSONEncoder
-from typing import Any, Dict, List, Union, Mapping, Iterable, Tuple
+from collections import defaultdict, deque
+from typing import Any, Dict, Iterable, List, NamedTuple, Tuple, Union
 
 from requests import Response, Session, post
 
 from erepublik import utils
 
+try:
+    import simplejson as json
+except ImportError:
+    import json
+
 
 class ErepublikException(Exception):
     def __init__(self, message):
@@ -85,8 +87,7 @@ class MyCompanies:
         ret = {}
         for company_id, company in self.companies.items():
             if company.get('preset_works'):
-                preset_works: int = int(company.get('preset_works', 0))
-                ret.update({company_id: preset_works})
+                ret[company_id] = int(company.get('preset_works', 0))
         return ret
 
     def get_total_wam_count(self) -> int:
@@ -195,108 +196,13 @@ class MyCompanies:
     #     return ret
 
 
-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/77.0.3865.90 Safari/537.36',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.80 Safari/537.36',
-        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.90 Safari/537.36',
-        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.132 Safari/537.36',
-        'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.80 Safari/537.36',
-        # FireFox
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:69.0) Gecko/20100101 Firefox/69.0',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Firefox/68.0',
-        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:67.0) Gecko/20100101 Firefox/67.0',
-        'Mozilla/5.0 (X11; Linux x86_64; rv:69.0) Gecko/20100101 Firefox/69.0',
-        'Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0',
-        'Mozilla/5.0 (X11; Linux x86_64; rv:67.0) Gecko/20100101 Firefox/67.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:
-                loads(resp.text)
-                file_data.update({"ext": "json"})
-            except 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 Config:
     email = ""
     password = ""
     work = True
     train = True
     wam = False
+    ot = True
     auto_sell: List[str] = None
     auto_sell_all = False
     employees = False
@@ -324,14 +230,11 @@ class Config:
     def __init__(self):
         self.auto_sell = []
 
-    @property
-    def wt(self):
-        return self.work and self.train
-
     def reset(self):
         self.work = True
         self.train = True
         self.wam = False
+        self.ot = True
         self.auto_sell = list()
         self.auto_sell_all = False
         self.employees = False
@@ -356,6 +259,18 @@ class Config:
         self.telegram_chat_id = 0
         self.telegram_token = ""
 
+    @property
+    def __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,
+                    next_energy=self.next_energy, boosters=self.boosters, travel_to_fight=self.travel_to_fight,
+                    always_travel=self.always_travel, epic_hunt=self.epic_hunt, epic_hunt_ebs=self.epic_hunt_ebs,
+                    rw_def_side=self.rw_def_side, interactive=self.interactive,
+                    continuous_fighting=self.continuous_fighting, auto_buy_raw=self.auto_buy_raw,
+                    force_wam=self.force_wam, sort_battles_time=self.sort_battles_time, force_travel=self.force_travel,
+                    telegram=self.telegram, telegram_chat_id=self.telegram_chat_id, telegram_token=self.telegram_token)
+
 
 class Energy:
     limit = 500  # energyToRecover
@@ -462,7 +377,7 @@ class Politics:
 class House:
     quality = None
     unactivated_count = 0
-    active_untill = utils.good_timedelta(utils.now(), -datetime.timedelta(days=1))
+    active_until = utils.good_timedelta(utils.now(), -datetime.timedelta(days=1))
 
     def __init__(self, quality: int):
         if 0 < quality < 6:
@@ -470,504 +385,7 @@ class House:
 
     @property
     def next_ot_point(self) -> datetime.datetime:
-        return self.active_untill
-
-
-class CitizenAPI:
-    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_article_json(self, article_id: int) -> Response:
-        return self.get("{}/main/articleJson/{}".format(self.url, article_id))
-
-    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_candidate_party(self, party_slug: str) -> Response:
-        return self.post("{}/candidate/{}".format(self.url, party_slug))
-
-    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_daily_assistant(self) -> Response:
-        return self.get("{}/main/citizenDailyAssistant".format(self.url))
-
-    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})
-
-    def _get_country_military(self, country: str) -> Response:
-        return self.get("{}/country/military/{}".format(self.url, country))
-
-    def _get_economy_citizen_accounts(self, organisation_id: int) -> Response:
-        return self.get("{}/economy/citizen-accounts/{}".format(self.url, organisation_id))
-
-    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 _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 _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))
-
-    def _get_main(self) -> Response:
-        return self.get(self.url)
-
-    def _get_main_messages_paginated(self, page: int = 1) -> Response:
-        return self.get("{}/main/messages-paginated/{}".format(self.url, page))
-
-    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_show_weapons(self, battle_id: int) -> Response:
-        params = {"_token": self.token, "battleId": battle_id}
-        return self.get("{}/military/show-weapons".format(self.url), params=params)
-
-    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 _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_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 _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 _get_wars_show(self, war_id: int) -> Response:
-        return self.get("{}/wars/show/{}".format(self.url, war_id))
-
-    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_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_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 _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_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)
-
-    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_collect_anniversary_reward(self) -> Response:
-        return self.post("{}/main/collect-anniversary-reward".format(self.url), data={"_token": self.token})
-
-    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)})
-
-    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_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_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_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_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 _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_job_market_apply(self, citizen: int, salary: int) -> 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_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)
-
-    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})
-
-    def _post_economy_train(self, tg_ids: List[int]) -> Response:
-        data: Dict[str, Union[int, str]] = {}
-        if not tg_ids:
-            return self._get_main_training_grounds_json()
-        else:
-            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:
-        """
-        :return: requests.Response or None
-        """
-        if employ is None:
-            employ = dict()
-        if wam is None:
-            wam = []
-        data: Dict[str, Union[int, str]] = dict(action_type=action_type, _token=self.token)
-        if action_type == "production":
-            max_idx = 0
-            for company_id in sorted(wam or []):
-                data.update({
-                    "companies[%i][id]" % max_idx: company_id,
-                    "companies[%i][employee_works]" % max_idx: employ.pop(company_id, 0),
-                    "companies[%i][own_work]" % max_idx: 1
-                })
-                max_idx += 1
-            for company_id in sorted(employ or []):
-                data.update({
-                    "companies[%i][id]" % max_idx: company_id,
-                    "companies[%i][employee_works]" % max_idx: employ.pop(company_id),
-                    "companies[%i][own_work]" % max_idx: 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_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_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_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_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_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_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_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_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)
-
-    def _post_main_travel_data(self, **kwargs) -> Response:
-        return self.post("{}/main/travelData".format(self.url), data=dict(_token=self.token, **kwargs))
-
-    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_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)
-
-    def _post_main_write_article(self, title: str, content: str, location: int, kind: int) -> Response:
-        data = dict(_token=self.token, article_name=title, article_body=content, article_location=location,
-                    article_category=kind)
-        return self.post("{}/main/write-article".format(self.url), data=data)
-
-    # Wall Posts
-    # ## 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_automatic(self, **kwargs) -> Response:
-        kwargs.update(_token=self.token)
-        return self.post("{}/main/wall-post/create/json".format(self.url), data=kwargs)
-
-    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)
-
-    # 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_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)
+        return self.active_until
 
 
 class Reporter:
@@ -996,12 +414,11 @@ class Reporter:
         self.citizen_id: int = citizen_id
         self.key: str = ""
         self.__update_key()
+        self.register_account()
         self.allowed = True
 
     def __update_key(self):
         self.key = hashlib.md5(bytes(f"{self.name}:{self.email}", encoding="UTF-8")).hexdigest()
-        self.allowed = True
-        self.register_account()
 
     def __bot_update(self, data: dict) -> Response:
         if self.__to_update:
@@ -1021,6 +438,7 @@ class Reporter:
                                                                                  player_id=self.citizen_id))
             finally:
                 self.__registered = True
+                self.allowed = True
                 self.report_action("STARTED", value=utils.now().strftime("%F %T"))
 
     def send_state_update(self, xp: int, cc: float, gold: float, inv_total: int, inv: int,
@@ -1035,30 +453,34 @@ class Reporter:
             self.__bot_update(data)
 
     def report_action(self, action: str, json_val: Dict[Any, Any] = None, value: str = None):
-        if not self.key:
-            if not all([self.email, self.name, self.citizen_id]):
-                pass
-        json_data = {'player_id': self.citizen_id, 'key': self.key, 'log': dict(action=action)}
+        json_data = dict(
+            player_id=getattr(self, 'citizen_id', None), log={'action': action}, key=getattr(self, 'key', None)
+        )
         if json_val:
             json_data['log'].update(dict(json=json_val))
         if value:
             json_data['log'].update(dict(value=value))
+        if not any([self.key, self.email, self.name, self.citizen_id]):
+            return
         if self.allowed:
             self.__bot_update(json_data)
         else:
             self.__to_update.append(json_data)
 
+    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))
 
-class MyJSONEncoder(JSONEncoder):
+
+class MyJSONEncoder(json.JSONEncoder):
     def default(self, o):
         from erepublik.citizen import Citizen
         if isinstance(o, decimal.Decimal):
             return float("{:.02f}".format(o))
         elif isinstance(o, datetime.datetime):
-            return dict(__type__='datetime', year=o.year, month=o.month, day=o.day, hour=o.hour, minute=o.minute,
-                        second=o.second, microsecond=o.microsecond, tzinfo=o.tzinfo.zone if o.tzinfo else None)
+            return dict(__type__='datetime', date=o.strftime("%Y-%m-%d"), time=o.strftime("%H:%M:%S"),
+                        tzinfo=o.tzinfo.tzname if o.tzinfo else None)
         elif isinstance(o, datetime.date):
-            return dict(__type__='date', year=o.year, month=o.month, day=o.day)
+            return dict(__type__='date', date=o.strftime("%Y-%m-%d"))
         elif isinstance(o, datetime.timedelta):
             return dict(__type__='timedelta', days=o.days, seconds=o.seconds,
                         microseconds=o.microseconds, total_seconds=o.total_seconds())
@@ -1070,7 +492,14 @@ class MyJSONEncoder(JSONEncoder):
             return list(o)
         elif isinstance(o, Citizen):
             return o.to_json()
-        return super().default(o)
+        try:
+            return super().default(o)
+        except TypeError as e:
+            name = None
+            for ___, ____ in globals().copy().items():
+                if id(o) == id(____):
+                    name = ___
+            return dict(__error__=str(e), __type__=str(type(o)), __name__=name)
 
 
 class BattleSide:
@@ -1099,17 +528,25 @@ class BattleDivision:
     def div_end(self) -> bool:
         return utils.now() >= self.end
 
-    def __init__(
-        self, div_id: int, end: datetime.datetime, epic: bool, inv_pts: int, def_pts: int,
-        wall_for: int, wall_dom: float, def_medal: Tuple[int, int], inv_medal: Tuple[int, int]
-    ):
-        self.battle_zone_id = div_id
-        self.end = end
-        self.epic = epic
-        self.dom_pts = dict({"inv": inv_pts, "def": def_pts})
-        self.wall = dict({"for": wall_for, "dom": wall_dom})
-        self.def_medal = {"id": def_medal[0], "dmg": def_medal[1]}
-        self.inv_medal = {"id": inv_medal[0], "dmg": inv_medal[1]}
+    def __init__(self, **kwargs):
+        """Battle division helper class
+
+        :param kwargs: must contain keys:
+            div_id: int, end: datetime.datetime, epic: bool, inv_pts: int, def_pts: int,
+            wall_for: int, wall_dom: float, def_medal: Tuple[int, int], inv_medal: Tuple[int, int]
+        """
+
+        self.battle_zone_id = kwargs.get("div_id", 0)
+        self.end = kwargs.get("end", 0)
+        self.epic = kwargs.get("epic", 0)
+        self.dom_pts = dict({"inv": kwargs.get("inv_pts", 0), "def": kwargs.get("def_pts", 0)})
+        self.wall = dict({"for": kwargs.get("wall_for", 0), "dom": kwargs.get("wall_dom", 0)})
+        self.def_medal = {"id": kwargs.get("def_medal", 0)[0], "dmg": kwargs.get("def_medal", 0)[1]}
+        self.inv_medal = {"id": kwargs.get("inv_medal", 0)[0], "dmg": kwargs.get("inv_medal", 0)[1]}
+
+    @property
+    def id(self):
+        return self.battle_zone_id
 
 
 class Battle:
@@ -1127,44 +564,33 @@ class Battle:
     def is_air(self) -> bool:
         return not bool(self.zone_id % 4)
 
-    def __init__(self, battle: Dict[str, Any] = None):
+    def __init__(self, battle: Dict[str, Any]):
         """Object representing eRepublik battle.
 
         :param battle: Dict object for single battle from '/military/campaignsJson/list' response's 'battles' object
         """
-        if battle is None:
-            battle = {}
-            self.id = 0
-            self.war_id = 0
-            self.zone_id = 0
-            self.is_rw = False
-            self.is_as = False
-            self.is_dict_lib = False
-            self.start = utils.now().min
-            self.invader = BattleSide(0, 0, [], [])
-            self.defender = BattleSide(0, 0, [], [])
-        else:
-            self.id = int(battle.get('id', 0))
-            self.war_id = int(battle.get('war_id', 0))
-            self.zone_id = int(battle.get('zone_id', 0))
-            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.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.id = int(battle.get('id'))
+        self.war_id = int(battle.get('war_id'))
+        self.zone_id = int(battle.get('zone_id'))
+        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.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.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.div = {}
+        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.div = defaultdict(BattleDivision)
         for div, data in battle.get('div', {}).items():
             div = int(data.get('div'))
             if data.get('end'):
@@ -1191,13 +617,14 @@ class Battle:
         now = utils.now()
         is_started = self.start < utils.now()
         if is_started:
-            time_part = "{}".format(now - self.start)
+            time_part = " {}".format(now - self.start)
         else:
-            time_part = "- {}".format(self.start - now)
+            time_part = "-{}".format(self.start - now)
+
         return f"Battle {self.id} | " \
-               f"{utils.COUNTRIES[self.invader.id]:>21.21}:{utils.COUNTRIES[self.defender.id]:<21.21} | " \
+               f"{utils.ISO_CC[self.invader.id]} : {utils.ISO_CC[self.defender.id]} | " \
                f"Round {self.zone_id:2} | " \
-               f"Time since start {time_part}"
+               f"Round time {time_part}"
 
 
 class EnergyToFight:
@@ -1232,11 +659,11 @@ class EnergyToFight:
 
 
 class TelegramBot:
-    __initialized = False
+    __initialized: bool = False
     __queue: List[str]
-    chat_id = 0
-    api_url = ""
-    player_name = ""
+    chat_id: int = 0
+    api_url: str = ""
+    player_name: str = ""
     __thread_stopper: threading.Event
     _last_time: datetime.datetime
     _last_full_energy_report: datetime.datetime
@@ -1247,11 +674,14 @@ class TelegramBot:
         self._threads = []
         self.__queue = []
         self.__thread_stopper = threading.Event() if stop_event is None else stop_event
+        self._last_full_energy_report = self._last_time = utils.good_timedelta(utils.now(), datetime.timedelta(hours=1))
+        self._next_time = utils.now()
 
+    @property
     def __dict__(self):
-        return dict(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)))
+        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))}
 
     def do_init(self, chat_id: int, token: str, player_name: str = ""):
         self.chat_id = chat_id
@@ -1266,9 +696,11 @@ class TelegramBot:
     def send_message(self, message: str) -> bool:
         self.__queue.append(message)
         if not self.__initialized:
+            if self._last_time < utils.now():
+                self.__queue.clear()
             return True
         self._threads = [t for t in self._threads if t.is_alive()]
-        self._next_time = utils.good_timedelta(utils.now(), datetime.timedelta(minutes=1))
+        self._next_time = utils.good_timedelta(utils.now(), datetime.timedelta(seconds=20))
         if not self._threads:
             name = "telegram_{}send".format(f"{self.player_name}_" if self.player_name else "")
             send_thread = threading.Thread(target=self.__send_messages, name=name)
@@ -1299,8 +731,9 @@ class TelegramBot:
             message = f"Full energy ({available}hp/{limit}hp +{interval}hp/6min)"
             self.send_message(message)
 
-    def report_medal(self, msg):
-        self.send_message(f"New award: *{msg}*")
+    def report_medal(self, msg, multiple: bool = True):
+        new_line = '\n' if multiple else ''
+        self.send_message(f"New award: {new_line}*{msg}*")
 
     def __send_messages(self):
         while self._next_time > utils.now():
@@ -1314,6 +747,14 @@ class TelegramBot:
         response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown"))
         self._last_time = utils.now()
         if response.json().get('ok'):
-            self.__queue = []
+            self.__queue.clear()
             return True
         return False
+
+
+class OfferItem(NamedTuple):
+    price: float = 99_999.
+    country: int = 0
+    amount: int = 0
+    offer_id: int = 0
+    citizen_id: int = 0

erepublik/utils.py

@@ -1,97 +1,138 @@
 import datetime
 import inspect
-import json
 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 Union, Any, List, NoReturn, Mapping, Optional
+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']
 
-FOOD_ENERGY = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
-COMMIT_ID = "7b92e19"
+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 = {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'
+}
+
+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:
@@ -113,6 +154,15 @@ def localize_dt(dt: Union[datetime.date, datetime.datetime]) -> datetime.datetim
 
 
 def good_timedelta(dt: datetime.datetime, td: datetime.timedelta) -> datetime.datetime:
+    """Normalize timezone aware datetime object after timedelta to correct jumps over DST switches
+
+    :param dt: Timezone aware datetime object
+    :type dt: datetime.datetime
+    :param td: timedelta object
+    :type td: datetime.timedelta
+    :return: datetime object with correct timezone when jumped over DST
+    :rtype: datetime.datetime
+    """
     return erep_tz.normalize(dt + td)
 
 
@@ -126,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
 
 
@@ -158,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:
@@ -287,21 +338,32 @@ 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):
     """
     Process error logging and email sending to developer
     :param interactive: Should print interactively
+    :type interactive: bool
     :param log_info: String to be written in output
+    :type log_info: str
     :param name: String Instance name
+    :type name: str
     :param exc_info: tuple output from sys.exc_info()
+    :type exc_info: tuple
     :param citizen: Citizen instance
-    :param commit_id: Code's version by commit id
+    :type citizen: Citizen
+    :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:
@@ -311,6 +373,11 @@ def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commi
     trace = inspect.trace()
     if trace:
         trace = trace[-1][0].f_locals
+        if trace.get('__name__') == '__main__':
+            trace = {'commit_id': trace.get('COMMIT_ID'),
+                     'interactive': trace.get('INTERACTIVE'),
+                     'version': trace.get('__version__'),
+                     'config': trace.get('CONFIG')}
     else:
         trace = dict()
     send_email(name, content, citizen, local_vars=trace)
@@ -339,10 +406,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
@@ -360,27 +423,28 @@ 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) -> float:
-    base_dmg = 10 * (1 + strength / 400) * (1 + rang / 5) * (1 + weapon / 100)
-    dmg = int(base_dmg * 10 + 5) // 10
+                  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)))
+    base_wpn = (1 + Decimal(str(weapon / 100)))
+    dmg = 10 * base_str * base_rnk * base_wpn
 
-    booster_multiplier = (100 + booster) / 100
-    booster_dmg = dmg * booster_multiplier
-    dmg = int(booster_dmg * 10 + 5) // 10
+    if elite:
+        dmg = dmg * 11 / 10
 
-    elite = 1.1 if elite else 1
-    elite_dmg = dmg * elite
-    dmg = int(elite_dmg)
+    if tp and rang >= 70:
+        dmg = dmg * (1 + Decimal((rang - 69) / 10))
 
-    legend = 1 if (not tp or rang < 70) else 1 + (rang - 69) / 10
-    legend_dmg = dmg * legend
-    dmg = int(legend_dmg)
+    dmg = dmg * (100 + booster) / 100
 
-    return dmg * (1.1 if ne else 1)
+    if ne:
+        dmg = dmg * 11 / 10
+    return round(dmg, dec)
 
 
-def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
-                         booster: int = 0, weapon_power: int = 200) -> float:
+def get_ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False,
+                             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']
@@ -391,8 +455,8 @@ def ground_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patr
     return calculate_hit(strength, rang, true_patriot, elite, natural_enemy, booster, weapon_power)
 
 
-def air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
-                      weapon_power: int = 0) -> float:
+def get_air_hit_dmg_value(citizen_id: int, natural_enemy: bool = False, true_patriot: bool = False, booster: int = 0,
+                          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

@@ -0,0 +1,98 @@
+import threading
+from datetime import timedelta
+
+from erepublik import Citizen, utils
+
+CONFIG = {
+    'email': 'player@email.com',
+    'password': 'Pa$5w0rd!',
+    'interactive': True,
+    'fight': True,
+    'debug': True,
+    '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]},
+        124559: {"auto_attack": True, "regions": [176]}
+    }
+}
+
+
+def _battle_launcher(player: Citizen):
+    """Launch battles. Check every 5th minute (0,5,10...45,50,55) if any battle could be started on specified regions
+    and after launching wait for 90 minutes before starting next attack so that all battles aren't launched at the same
+    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
+    """
+    global CONFIG
+    finished_war_ids = {*[]}
+    war_data = CONFIG.get('start_battles', {})
+    war_ids = {int(war_id) for war_id in war_data.keys()}
+    next_attack_time = player.now
+    next_attack_time = next_attack_time.replace(minute=next_attack_time.minute // 5 * 5, second=0)
+    while not player.stop_threads.is_set():
+        try:
+            attacked = False
+            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[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(war_id, None)
+                    finished_war_ids.add(war_id)
+                    continue
+                elif not status.get('can_attack'):
+                    continue
+
+                if auto_attack or (player.now.hour > 20 or player.now.hour < 2):
+                    for reg in war_regions:
+                        if attacked:
+                            break
+                        if reg in status.get('regions', {}).keys():
+                            player.launch_attack(war_id, reg, status.get('regions', {}).get(reg))
+                            attacked = True
+                            hits = 100
+                            if player.energy.food_fights >= hits and player.config.fight:
+                                for _ in range(120):
+                                    player.update_war_info()
+                                    battle_id = player.get_war_status(war_id).get("battle_id")
+                                    if battle_id is not None and battle_id in player.all_battles:
+                                        player.fight(battle_id, player.details.citizenship, hits)
+                                        break
+                                    player.sleep(1)
+                        if attacked:
+                            break
+                if attacked:
+                    break
+            war_ids -= finished_war_ids
+            if attacked:
+                next_attack_time = utils.good_timedelta(next_attack_time, timedelta(hours=1, minutes=30))
+            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 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('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()
+
+
+if __name__ == "__main__":
+    main()

examples/eat_work_train.py

@@ -0,0 +1,106 @@
+from datetime import timedelta
+
+from erepublik import Citizen, utils
+
+CONFIG = {
+    'email': 'player@email.com',
+    'password': 'Pa$5w0rd!',
+    'interactive': True,
+    'debug': True
+}
+
+
+# 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()
+    now = player.now.replace(second=0, microsecond=0)
+    dt_max = now.replace(year=9999)
+    tasks = {
+        'eat': now,
+    }
+    if player.config.work:
+        tasks.update({'work': now})
+    if player.config.train:
+        tasks.update({'train': now})
+    if player.config.ot:
+        tasks.update({'ot': now})
+    if player.config.wam:
+        tasks.update({'wam': now.replace(hour=14, minute=0)})
+    while True:
+        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('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})
+
+            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
+
+                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})
+
+            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__":
+    main()

requirements_dev.txt

@@ -1,14 +1,16 @@
-pip==19.1.1
 bumpversion==0.5.3
-wheel==0.33.4
-watchdog==0.9.0
-flake8==3.7.8
-tox==3.13.2
-coverage==4.5.3
-Sphinx==2.2.0
-twine==2.0.0
-ipython
-PyInstaller
-pytz==2019.1
-requests==2.22.0
-edx-sphinx-theme
+coverage==5.0.3
+edx-sphinx-theme==1.5.0
+flake8==3.7.9
+ipython==7.12.0
+isort==4.3.21
+pip==20.0.2
+PyInstaller==3.6
+pytz==2019.3
+requests==2.23.0
+setuptools==45.2.0
+Sphinx==2.4.2
+tox==3.14.5
+twine==3.1.1
+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,7 +1,11 @@
 [bumpversion]
-current_version = 0.18.2
+current_version = 0.20.0
 commit = True
 tag = True
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)\.?(?P<dev>\d+)?
+serialize = 
+	{major}.{minor}.{patch}.{dev}
+	{major}.{minor}.{patch}
 
 [bumpversion:file:setup.py]
 search = version='{current_version}'

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.2', 'requests>=2.22']
+requirements = ['pytz==2019.3', 'requests==2.23.0']
 
 setup_requirements = []
 
@@ -27,6 +27,7 @@ setup(
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     description="Python package for automated eRepublik playing",
     entry_points={},
@@ -42,6 +43,6 @@ setup(
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik/',
-    version='0.18.2',
+    version='0.20.0',
     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))