Bump version: 0.15.1 → 0.15.2

* 'master' of github.com:eeriks/erepublik_script:
  Bump version: 0.14.5 → 0.14.6

.travis.yml

@@ -2,10 +2,8 @@
 
 language: python
 python:
+  - 3.7
   - 3.6
-  - 3.5
-  - 3.4
-  - 2.7
 
 # Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
 install: pip install -U tox-travis

CONTRIBUTING.rst

@@ -57,7 +57,7 @@ If you are proposing a feature:
 Get Started!
 ------------
 
-Ready to contribute? Here's how to set up `erepublik_script` for local development.
+Ready to contribute? Here's how to set up `erepublik` for local development.
 
 1. Fork the `erepublik_script` repo on GitHub.
 2. Clone your fork locally::
@@ -66,8 +66,8 @@ Ready to contribute? Here's how to set up `erepublik_script` for local developme
 
 3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
 
-    $ mkvirtualenv erepublik_script
-    $ cd erepublik_script/
+    $ mkvirtualenv erepublik
+    $ cd erepublik/
     $ python setup.py develop
 
 4. Create a branch for local development::
@@ -79,7 +79,7 @@ Ready to contribute? Here's how to set up `erepublik_script` for local developme
 5. When you're done making changes, check that your changes pass flake8 and the
    tests, including testing other Python versions with tox::
 
-    $ flake8 erepublik_script tests
+    $ flake8 erepublik tests
     $ python setup.py test or py.test
     $ tox
 
@@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    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 2.7, 3.4, 3.5 and 3.6, and for PyPy. Check
+3. The pull request should work for Python 3.7.1. Check
    https://travis-ci.org/eeriks/erepublik_script/pull_requests
    and make sure that the tests pass for all supported Python versions.
 

HISTORY.rst

@@ -2,6 +2,19 @@
 History
 =======
 
+
+0.15.0 (2019-07-30)
+-------------------
+
+* CitizenAPI class methods renamed to "private", they are intended to be used internally.
+* TODO: None of the Citizen class's methods should return Response object - CitizenAPI is meant for that.
+
+
+0.14.4 (2019-07-23)
+-------------------
+
+* Wall post comment endpoints updated with comment create endpoints.
+
 0.1.0 (2019-07-19)
 ------------------
 

Makefile

@@ -51,7 +51,7 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr .pytest_cache
 
 lint: ## check style with flake8
-	flake8 erepublik_script tests
+	flake8 erepublik tests
 
 test: ## run tests quickly with the default Python
 	python setup.py test
@@ -60,15 +60,15 @@ test-all: ## run tests on every Python version with tox
 	tox
 
 coverage: ## check code coverage quickly with the default Python
-	coverage run --source erepublik_script setup.py test
+	coverage run --source erepublik setup.py test
 	coverage report -m
 	coverage html
 	$(BROWSER) htmlcov/index.html
 
 docs: ## generate Sphinx HTML documentation, including API docs
-	rm -f docs/erepublik_script.rst
+	rm -f docs/erepublik.rst
 	rm -f docs/modules.rst
-	sphinx-apidoc -o docs/ erepublik_script
+	sphinx-apidoc -o docs/ erepublik
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 	$(BROWSER) docs/_build/html/index.html

README.rst

@@ -3,28 +3,19 @@ eRepublik script
 ================
 
 
-.. image:: https://img.shields.io/pypi/v/erepublik_script.svg
-        :target: https://pypi.python.org/pypi/erepublik_script
+.. image:: https://img.shields.io/pypi/v/erepublik.svg
+        :target: https://pypi.python.org/pypi/erepublik
 
-.. image:: https://img.shields.io/travis/eeriks/erepublik_script.svg
-        :target: https://travis-ci.org/eeriks/erepublik_script
-
-.. image:: https://readthedocs.org/projects/erepublik-script/badge/?version=latest
-        :target: https://erepublik-script.readthedocs.io/en/latest/?badge=latest
+.. image:: https://readthedocs.org/projects/erepublik_script/badge/?version=latest
+        :target: https://erepublik_script.readthedocs.io/en/latest/?badge=latest
         :alt: Documentation Status
 
 
-.. image:: https://pyup.io/repos/github/eeriks/erepublik_script/shield.svg
-     :target: https://pyup.io/repos/github/eeriks/erepublik_script/
-     :alt: Updates
-
-
-
-Python package for eRepublik automated playing
+Python package for automated eRepublik playing
 
 
 * Free software: MIT license
-* Documentation: https://erepublik-script.readthedocs.io.
+* Documentation: https://erepublik.readthedocs.io.
 
 
 Features

debug/requests/2019-07-18_23-40-21_login_REDIRECT.html

@@ -1 +0,0 @@
-<html><head><meta http-equiv="refresh" content="0;url=https://www.erepublik.com/en"/></head></html>

debug/requests/2019-07-18_23-40-35_main-weekly-challenge-data.json

@@ -1 +0,0 @@
-{"error":false,"enabled":true,"type":{"anniversary":false,"flavorPacks":false,"springChallenge":false,"summerChallenge":false,"halloweenChallenge":false},"timeLeft":346765,"nextReward":{"maxReward":false,"type":"icon_energy_booster","text":"+1 Energy recovery until the end of Day 4,262"},"maxRewardId":0,"player":{"avatar":"//cdnt.erepublik.net/7efiav4XZ4SMvXAtgEk1NciUmAg=/55x55/smart/avatars/Citizens/2009/07/08/4b57b9ebb0232f0d6c3f6f2c21b8ab95.jpg?c022b6df6f643263dba839cb35b7a9ab","name":"inpoc1","prestigePoints":14170},"progress":0.9141935483871,"rewards":{"normal":[{"id":59,"collectedBefore":58,"percent":0.74193548387097,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":60,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":61,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":62,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":63,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":64,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":65,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":66,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":67,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":68,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_booster"},{"id":69,"collectedBefore":0,"percent":0.016129032258065,"label":"You have already collected this reward","tooltip":"","status":"rewarded","icon":"energy_bars"},{"id":70,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 14,250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 14250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":71,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 14,500 Prestige Points to unlock the following reward: 10 Energy Bars","tooltip":"Reach 14500 Prestige Points to unlock the following reward: 10 Energy Bars","status":"","icon":"energy_bars"},{"id":72,"collectedBefore":0,"percent":0.032258064516129,"label":"Reach 15,000 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 15000 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":73,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 15,250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","tooltip":"Reach 15250 Prestige Points to unlock the following reward: +1 Energy recovery until the end of Day 4,262","status":"","icon":"energy_booster"},{"id":74,"collectedBefore":0,"percent":0.016129032258065,"label":"Reach 15,500 Prestige Points to unlock the following reward: 15 Energy Bars","tooltip":"Reach 15500 Prestige Points to unlock the following reward: 15 Energy Bars","status":"","icon":"energy_bars"}],"extra":[]}}

docs/Makefile

@@ -4,7 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = python -msphinx
-SPHINXPROJ    = erepublik_script
+SPHINXPROJ    = erepublik
 SOURCEDIR     = .
 BUILDDIR      = _build
 

docs/conf.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# erepublik_script documentation build configuration file, created by
+# erepublik documentation build configuration file, created by
 # sphinx-quickstart on Fri Jun  9 13:47:02 2017.
 #
 # This file is execfile()d with the current directory set to its
@@ -22,7 +22,7 @@ import os
 import sys
 sys.path.insert(0, os.path.abspath('..'))
 
-import erepublik_script
+import erepublik
 
 # -- General configuration ---------------------------------------------
 
@@ -56,9 +56,9 @@ author = u"Eriks Karls"
 # the built documents.
 #
 # The short X.Y version.
-version = erepublik_script.__version__
+version = erepublik.__version__
 # The full version, including alpha/beta/rc tags.
-release = erepublik_script.__version__
+release = erepublik.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -101,7 +101,7 @@ html_static_path = ['_static']
 # -- Options for HTMLHelp output ---------------------------------------
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'erepublik_scriptdoc'
+htmlhelp_basename = 'erepublikdoc'
 
 
 # -- Options for LaTeX output ------------------------------------------
@@ -128,7 +128,7 @@ latex_elements = {
 # (source start file, target name, title, author, documentclass
 # [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'erepublik_script.tex',
+    (master_doc, 'erepublik.tex',
      u'eRepublik script Documentation',
      u'Eriks Karls', 'manual'),
 ]
@@ -139,7 +139,7 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    (master_doc, 'erepublik_script',
+    (master_doc, 'erepublik',
      u'eRepublik script Documentation',
      [author], 1)
 ]
@@ -151,10 +151,10 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'erepublik_script',
+    (master_doc, 'erepublik',
      u'eRepublik script Documentation',
      author,
-     'erepublik_script',
+     'erepublik',
      'One line description of project.',
      'Miscellaneous'),
 ]

docs/index.rst

@@ -1,5 +1,5 @@
 Welcome to eRepublik script's documentation!
-======================================
+============================================
 
 .. toctree::
    :maxdepth: 2

docs/installation.rst

@@ -12,7 +12,7 @@ To install eRepublik script, run this command in your terminal:
 
 .. code-block:: console
 
-    $ pip install erepublik_script
+    $ pip install erepublik
 
 This is the preferred method to install eRepublik script, as it will always install the most recent stable release.
 

docs/usage.rst

@@ -4,4 +4,4 @@ Usage
 
 To use eRepublik script in a project::
 
-    import erepublik_script
+    import erepublik

erepublik/__init__.py

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+"""Top-level package for eRepublik script."""
+
+__author__ = """Eriks Karls"""
+__email__ = 'eriks@72.lv'
+__version__ = '0.15.2'
+
+from erepublik import classes, utils
+from erepublik.citizen import Citizen

erepublik/classes.py

@@ -1,4 +1,3 @@
-# pylint: disable=fixme, line-too-long, missing-docstring, invalid-name
 import datetime
 import decimal
 import hashlib
@@ -6,12 +5,11 @@ import random
 import time
 from collections import deque
 from json import JSONDecodeError, loads, JSONEncoder
-from typing import Any, Dict, List, Union
+from typing import Any, Dict, List, Union, Mapping, Iterable
 
 from requests import Response, Session
-from slugify import slugify
 
-from erepublik_script import utils
+from erepublik import utils
 
 
 class ErepublikException(Exception):
@@ -28,11 +26,13 @@ class ErepublikNetworkException(Exception):
 class MyCompanies:
     work_units: int = 0
     next_ot_time: datetime.datetime
-    holdings: Dict[int, Dict] = dict()
-    companies: Dict[int, Dict] = dict()
+    holdings: Dict[int, Dict] = None
+    companies: Dict[int, Dict] = None
     ff_lockdown: int = 0
 
     def __init__(self):
+        self.holdings = dict()
+        self.companies = dict()
         self.next_ot_time = utils.now()
 
     def prepare_holdings(self, holdings: dict):
@@ -43,7 +43,7 @@ class MyCompanies:
         template = dict(id=0, num_factories=0, region_id=0, companies=[])
 
         for holding_id, holding in holdings.items():
-            tmp: Dict[str, Union[List[Any], Any]] = {}
+            tmp: Dict[str, Union[Iterable[Any], Any]] = {}
             for key in template:
                 if key == 'companies':
                     tmp.update({key: []})
@@ -223,12 +223,12 @@ class SlowRequests(Session):
 
             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_script import Citizen
+        from erepublik import Citizen
         if self.debug:
             if resp.history and not redirect:
                 for hist_resp in resp.history:
@@ -239,7 +239,7 @@ class SlowRequests(Session):
             file_data = {
                 "path": 'debug/requests',
                 "time": self.last_time.strftime('%Y-%m-%d_%H-%M-%S'),
-                "name": slugify(url[len(Citizen.url):]),
+                "name": utils.slugify(url[len(Citizen.url):]),
                 "extra": "_REDIRECT" if redirect else ""
             }
 
@@ -358,6 +358,7 @@ class Energy:
     def available(self):
         return self.recovered + self.recoverable
 
+    @property
     def __dict__(self):
         return dict(
             limit=self.limit,
@@ -437,10 +438,14 @@ class House(object):
 
 
 class CitizenAPI:
-    url = "https://www.erepublik.com/en"
-    _req = SlowRequests
+    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, *args, **kwargs) -> Response:
@@ -449,112 +454,126 @@ class CitizenAPI:
     def get(self, url: str, **kwargs) -> Response:
         return self._req.get(url, **kwargs)
 
-    def get_article_json(self, article_id: int) -> Response:
+    def _get_article_json(self, article_id: int) -> Response:
         return self.get("{}/main/articleJson/{}".format(self.url, article_id))
 
-    def get_battlefield_choose_side(self, battle: int, side: int) -> Response:
+    def _get_battlefield_choose_side(self, battle: int, side: int) -> Response:
         return self.get("{}/military/battlefield-choose-side/{}/{}".format(self.url, battle, side))
 
-    def get_candidate_party(self, party_slug: str) -> Response:
+    def _get_candidate_party(self, party_slug: str) -> Response:
         return self.post("{}/candidate/{}".format(self.url, party_slug))
 
-    def get_citizen_hovercard(self, citizen: int) -> Response:
+    def _get_citizen_hovercard(self, citizen: int) -> Response:
         return self.get("{}/main/citizen-hovercard/{}".format(self.url, citizen))
 
-    def get_citizen_profile(self, player_id: int):
+    def _get_citizen_profile(self, player_id: int) -> Response:
         return self.get("{}/main/citizen-profile-json/{}".format(self.url, player_id))
 
-    def get_citizen_daily_assistant(self):
+    def _get_citizen_daily_assistant(self) -> Response:
         return self.get("{}/main/citizenDailyAssistant".format(self.url))
 
-    def get_city_data_residents(self, city: int, page: int = 1, params: Dict[str, Any] = {}):
+    def _get_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:
+    def _get_country_military(self, country: str) -> Response:
         return self.get("{}/country/military/{}".format(self.url, country))
 
-    def get_economy_inventory_items(self) -> Response:
+    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:
+    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:
+    def _get_economy_my_companies(self) -> Response:
         return self.get("{}/economy/myCompanies".format(self.url))
 
-    def get_economy_my_market_offers(self) -> Response:
+    def _get_economy_my_market_offers(self) -> Response:
         return self.get("{}/economy/myMarketOffers".format(self.url))
 
-    def get_job_data(self) -> Response:
+    def _get_job_data(self) -> Response:
         return self.get("{}/main/job-data".format(self.url))
 
-    def get_leaderboards_damage_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response:
+    def _get_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_leaderboards_damage_rankings(self, country: int, weeks: int = 0, mu: int = 0, div: int = 0) -> Response:
+    def _get_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_leaderboards_kills_aircraft_rankings(self, country: int, weeks: int = 0, mu: int = 0) -> Response:
+    def _get_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_leaderboards_kills_rankings(self, country: int, weeks: int = 0, mu: int = 0, div: int = 0) -> Response:
+    def _get_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):
+    def _get_main(self) -> Response:
         return self.get(self.url)
 
-    def get_message_alerts(self, page: int = 1) -> Response:
-        return self.get_message_alerts(page)
+    def _get_messages(self, page: int = 1) -> Response:
+        return self.get("{}/main/messages-paginated/{}".format(self.url, page))
 
-    def get_military_campaigns(self) -> Response:
+    def _get_military_campaigns(self) -> Response:
         return self.get("{}/military/campaigns-new/".format(self.url))
 
-    def get_military_unit_data(self, unit_id: int, page: int = 1) -> Response:
-        params = {"groupId": unit_id, "panel": "members", "currentPage": page}
+    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_money_donation_accept(self, token: str, donation_id: int) -> Response:
-        return self.get("{}/main/money-donation/accept/{}".format(self.url, donation_id), params={"_token": token})
+    def _get_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_money_donation_reject(self, token: str, donation_id: int) -> Response:
-        return self.get("{}/main/money-donation/reject/{}".format(self.url, donation_id), params={"_token": token})
+    def _get_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_party_members(self, party: int) -> Response:
+    def _get_notifications_ajax_community(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/community/{}".format(self.url, page))
+
+    def _get_notifications_ajax_system(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/system/{}".format(self.url, page))
+
+    def _get_notifications_ajax_report(self, page: int = 1) -> Response:
+        return self.get("{}/main/notificationsAjax/report/{}".format(self.url, page))
+
+    def _get_party_members(self, party: int) -> Response:
         return self.get("{}/main/party-members/{}".format(self.url, party))
 
-    def get_rankings_parties(self, country: int) -> Response:
+    def _get_rankings_parties(self, country: int) -> Response:
         return self.get("{}/main/rankings-parties/1/{}".format(self.url, country))
 
-    def get_training_grounds_json(self) -> Response:
+    def _get_training_grounds_json(self) -> Response:
         return self.get("{}/main/training-grounds-json".format(self.url))
 
-    def get_weekly_challenge_data(self) -> Response:
+    def _get_weekly_challenge_data(self) -> Response:
         return self.get("{}/main/weekly-challenge-data".format(self.url))
 
-    def post_activate_battle_effect(self, token: str, battle: int, kind: str, citizen_id: int) -> Response:
-        data = dict(battleId=battle, citizenId=citizen_id, type=kind, _token=token)
+    def _get_wars_show(self, war_id: int) -> Response:
+        return self.get("{}/wars/show/{}".format(self.url, war_id))
+
+    def _post_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_article_comments(self, token: str, article: int, page: int = 0) -> Response:
-        data = dict(_token=token, articleId=article, page=page)
+    def _post_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_article_comments_create(self, token: str, message: str, article: int, parent: int = 0) -> Response:
-        data = dict(_token=token, message=message, articleId=article)
+    def _post_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_battle_console(self, token: str, battle: int, zone: int, round_id: int, division: int, page: int,
-                            damage: bool) -> Response:
+    def _post_battle_console(self, battle: int, zone: int, round_id: int, division: int, page: int,
+                             damage: bool) -> Response:
         data = dict(battleId=battle, zoneId=zone, action="battleStatistics", round=round_id, division=division,
-                    leftPage=page, rightPage=page, _token=token)
+                    leftPage=page, rightPage=page, _token=self.token)
         if damage:
             data.update({"type": "damage"})
         else:
@@ -562,124 +581,125 @@ class CitizenAPI:
 
         return self.post("{}/military/battle-console".format(self.url), data=data)
 
-    def post_buy_gold_items(self, token: str, currency: str, item: str, amount: int) -> Response:
-        data = dict(itemId=item, currency=currency, amount=amount, _token=token)
+    def _post_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, token: str, presentation: str = "") -> Response:
-        data = dict(_token=token, presentation=presentation)
+    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_citizen_add_remove_friend(self, token: str, citizen: int, add: bool) -> Response:
-        data = dict(_token=token, citizenId=citizen, url="//www.erepublik.com/en/main/citizen-addRemoveFriend")
+    def _post_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_collect_anniversary_reward(self, token: str) -> Response:
-        return self.post("{}/main/collect-anniversary-reward".format(self.url), data={"_token": token})
+    def _post_collect_anniversary_reward(self) -> Response:
+        return self.post("{}/main/collect-anniversary-reward".format(self.url), data={"_token": self.token})
 
-    def post_country_donate(self, token: str, country: int, action: str, value: Union[int, float], quality: int = None):
-        json = dict(countryId=country, action=action, _token=token, value=value, quality=quality)
+    def _post_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_daily_task_reward(self, token: str) -> Response:
-        return self.post("{}/main/daily-tasks-reward".format(self.url), data=dict(_token=token))
+    def _post_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, token: str, msg_id: list) -> Response:
-        data = {"_token": token, "delete_message[]": msg_id}
+    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, token: str, color: str) -> Response:
-        data = dict(_token=token, buttonColor=color)
+    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_house(self, token: str, quality: int) -> Response:
-        data = {"action": "activate", "quality": quality, "type": "house", "_token": token}
+    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, token: str, factory: int, holding: int) -> Response:
-        data = dict(_token=token, factoryId=factory, action="assign", holdingCompanyId=holding)
+    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, token: str, industry: int, building_type: int = 1) -> Response:
-        data = {"_token": token, "company[industry_id]": industry, "company[building_type]": building_type}
+    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, token: str, citizen: int, amount: int, industry: int,
-                                         quality: int) -> Response:
-        data = dict(citizen_id=citizen, amount=amount, industry_id=industry, quality=quality, _token=token)
+    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, token: str, citizen: int, amount: float = 0.0,
-                                         currency: int = 62) -> Response:
-        data = dict(citizen_id=citizen, _token=token, currency_id=currency, amount=amount)
+    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, token: str, amount: float, currency: int, offer: int) -> Response:
-        data = dict(_token=token, amount=amount, currencyId=currency, offerId=offer)
+    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, token: str, personal: bool, page: int, currency: int) -> Response:
-        data = dict(_token=token, personalOffers=int(personal), page=page, currencyId=currency)
+    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_job_market_apply(self, token: str, citizen: int, salary: int) -> Response:
-        data = dict(_token=token, citizenId=citizen, salary=salary)
+    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, token: str, country: int, industry: int, quality: int,
-                                 order_asc: bool = True) -> Response:
+    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=token)
+                    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, token: str, amount: int, buy: bool = False, **kwargs) -> Response:
+    def _post_economy_marketplace_actions(self, amount: int, buy: bool = False, **kwargs) -> Response:
         if buy:
-            data = dict(_token=token, offerId=kwargs['offer'], amount=amount, orderBy="price_asc", currentPage=1,
+            data = dict(_token=self.token, offerId=kwargs['offer'], amount=amount, orderBy="price_asc", currentPage=1,
                         buyAction=1)
         else:
-            data = dict(_token=token, countryId=kwargs["country"], price=kwargs["price"], industryId=kwargs["industry"],
-                        quality=kwargs["quality"], amount=amount, sellAction='postOffer')
+            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, token: str) -> Response:
+    def _post_economy_resign(self) -> Response:
         return self.post("{}/economy/resign".format(self.url),
                          headers={"Content-Type": "application/x-www-form-urlencoded"},
-                         data={"_token": token, "action_type": "resign"})
+                         data={"_token": self.token, "action_type": "resign"})
 
-    def post_economy_sell_company(self, token: str, factory: int, pin: int = None, sell: bool = True) -> Response:
+    def _post_economy_sell_company(self, factory: int, pin: int = None, sell: bool = True) -> Response:
         url = "{}/economy/sell-company/{}".format(self.url, factory)
-        data = dict(_token=token, pin="" if pin is None else pin)
+        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(url, data=data, headers={"Referer": url})
 
-    def post_economy_train(self, token: str, tg_ids: List[int]) -> Response:
+    def _post_economy_train(self, tg_ids: List[int]) -> Response:
         data: Dict[str, Union[int, str]] = {}
         if not tg_ids:
-            return self.get_training_grounds_json()
+            return self._get_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'] = token
+            data['_token'] = self.token
         return self.post("{}/economy/train".format(self.url), data=data)
 
-    def post_economy_upgrade_company(self, token: str, factory: int, level: int, pin: str = None) -> Response:
-        data = dict(_token=token, type="upgrade", companyId=factory, level=level, pin="" if pin is None else pin)
+    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, token: str, action_type: str, wam: List[int] = None, employ: Dict[int, int] = None):
+    def _post_economy_work(self, action_type: str, wam: List[int] = None, employ: Dict[int, int] = None) -> Response:
         """
         :return: requests.Response or None
         """
@@ -687,148 +707,168 @@ class CitizenAPI:
             employ = dict()
         if wam is None:
             wam = []
-        data: Dict[str, Union[int, str]] = dict(action_type=action_type, _token=token)
-        if action_type == "work":
-            return self.post("{}/economy/work".format(self.url), data=data)
-        elif action_type == "production":
+        data: Dict[str, Union[int, str]] = dict(action_type=action_type, _token=self.token)
+        if action_type == "production":
             max_idx = 0
-            for idx, company_id in enumerate(sorted(wam or [])):
+            for company_id in sorted(wam or []):
                 data.update({
-                    "companies[%i][id]" % idx: company_id,
-                    "companies[%i][employee_works]" % idx: employ.pop(company_id, 0),
-                    "companies[%i][own_work]" % idx: 1
+                    "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 = idx + 1
-            for idx, company_id in enumerate(sorted(employ or [])):
-                idx_ = idx + max_idx
+                max_idx += 1
+            for company_id in sorted(employ or []):
                 data.update({
-                    "companies[%i][id]" % idx_: company_id,
-                    "companies[%i][employee_works]" % idx_: employ.pop(company_id),
-                    "companies[%i][own_work]" % idx_: 0
+                    "companies[%i][id]" % max_idx: company_id,
+                    "companies[%i][employee_works]" % max_idx: employ.pop(company_id),
+                    "companies[%i][own_work]" % max_idx: 0
                 })
-            return self.post("{}/economy/work".format(self.url), data=data)
-        else:
-            return
+                max_idx += 1
+        return self.post("{}/economy/work".format(self.url), data=data)
 
-    def post_economy_work_overtime(self, token: str) -> Response:
-        data = dict(action_type="workOvertime", _token=token)
+    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, token: str, email: str) -> Response:
-        data = dict(_token=token, email=email, commit="Reset password")
+    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_fight_activate_booster(self, token: str, battle: int, quality: int, duration: int, kind: str) -> Response:
-        data = dict(type=kind, quality=quality, duration=duration, battleId=battle, _token=token)
+    def _post_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_login(self, token: str, email: str, password: str) -> Response:
-        data = dict(csrf_token=token, citizen_email=email, citizen_password=password, remember='on')
+    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_messages_alert(self, token: str, notification_ids: list) -> Response:
-        data = {"_token": token, "delete_alerts[]": notification_ids, "deleteAllAlerts": "1", "delete": "Delete"}
+    def _post_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_messages_compose(self, token: str, subject: str, body: str, citizens: List[int]) -> Response:
+    def _post_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=token, citizen_message=body)
+                    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, token: str, battle_id: int, round_id: int, division: int) -> Response:
-        data = dict(battleId=battle_id, zoneId=round_id, action="battleStatistics", round=round_id, division=division,
-                    type="damage", leftPage=1, rightPage=1, _token=token)
-        return self.post("{}/military/battle-console".format(self.url, battle_id), 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_fight_air(self, token: str, battle_id: int, side_id: int) -> Response:
-        data = dict(sideId=side_id, battleId=battle_id, _token=token)
+    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) -> Response:
+        data = dict(sideId=side_id, battleId=battle_id, _token=self.token)
         return self.post("{}/military/fight-shoooot/{}".format(self.url, battle_id), data=data)
 
-    def post_military_fight_ground(self, token: str, battle_id: int, side_id: int) -> Response:
-        data = dict(sideId=side_id, battleId=battle_id, _token=token)
+    def _post_military_fight_ground(self, battle_id: int, side_id: int) -> Response:
+        data = dict(sideId=side_id, battleId=battle_id, _token=self.token)
         return self.post("{}/military/fight-shooot/{}".format(self.url, battle_id), data=data)
 
-    def post_military_group_missions(self, token: str) -> Response:
-        data = dict(action="check", _token=token)
+    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_travel(self, token: str, check: str, **kwargs) -> Response:
-        data = dict(_token=token, check=check, **kwargs)
+    def _post_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_travel_data(self, token: str, **kwargs) -> Response:
-        return self.post("{}/main/travelData".format(self.url), data=dict(_token=token, **kwargs))
+    def _post_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, token: str, war: int, region: int) -> Response:
-        data = dict(_token=token)
-        return self.post("{}/wars/attack-region/{}/{}".format(self.url, war, region), data=data)
+    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_weekly_challenge_reward(self, token: str, reward_id: int) -> Response:
-        data = dict(_token=token, rewardId=reward_id)
+    def _post_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_write_article(self, token: str, title: str, content: str, location: int, kind: int) -> Response:
-        data = dict(_token=token, article_name=title, article_body=content, article_location=location,
+    def _post_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_country_comment_retrieve(self, token: str, post_id: int):
-        data = {"_token": token, "postId": post_id}
-        return self.post("{}/main/country-comment/retrieve/".format(self.url), data=data)
+    def _post_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_country_post_create(self, token: str, body: str, post_as: int):
-        data = {"_token": token, "post_message": body, "post_as": post_as}
-        return self.post("{}/main/country-post/create/".format(self.url), data=data)
+    def _post_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_country_post_retrieve(self, token: str):
-        data = {"_token": token, "page": 1, "switchedFrom": False}
-        return self.post("{}/main/country-post/retrieve/".format(self.url), data=data)
+    def _post_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_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_military_unit_comment_retrieve(self, token: str, post_id: int):
-        data = {"_token": token, "postId": post_id}
-        return self.post("{}/main/military-unit-comment/retrieve/".format(self.url), data=data)
+    def _post_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_military_unit_post_create(self, token: str, body: str, post_as: int):
-        data = {"_token": token, "post_message": body, "post_as": post_as}
-        return self.post("{}/main/military-unit-post/create/".format(self.url), data=data)
+    def _post_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_military_unit_post_retrieve(self, token: str):
-        data = {"_token": token, "page": 1, "switchedFrom": False}
-        return self.post("{}/main/military-unit-post/retrieve/".format(self.url), data=data)
+    def _post_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_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_party_comment_retrieve(self, token: str, post_id: int):
-        data = {"_token": token, "postId": post_id}
-        return self.post("{}/main/party-comment/retrieve/".format(self.url), data=data)
+    def _post_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_party_post_create(self, token: str, body: str):
-        data = {"_token": token, "post_message": body}
-        return self.post("{}/main/party-post/create/".format(self.url), data=data)
+    def _post_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_party_post_retrieve(self, token: str):
-        data = {"_token": token, "page": 1, "switchedFrom": False}
-        return self.post("{}/main/party-post/retrieve/".format(self.url), data=data)
+    def _post_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_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_wall_comment_retrieve(self, token: str, post_id: int):
-        data = {"_token": token, "postId": post_id}
-        return self.post("{}/main/wall-comment/retrieve/".format(self.url), data=data)
+    def _post_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_wall_post_create(self, token: str, body: str):
-        data = {"_token": token, "post_message": body}
-        return self.post("{}/main/wall-post/create/".format(self.url), data=data)
+    def _post_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_wall_post_retrieve(self, token: str):
-        data = {"_token": token, "page": 1, "switchedFrom": False}
-        return self.post("{}/main/wall-post/retrieve/".format(self.url), data=data)
+    def _post_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_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)
 
 
 class Reporter:
@@ -921,7 +961,7 @@ class MyJSONEncoder(JSONEncoder):
             return dict(__type__='timedelta', days=o.days, seconds=o.seconds,
                         microseconds=o.microseconds, total_seconds=o.total_seconds())
         elif isinstance(o, Response):
-            return dict(_content=o._content.decode("UTF-8"), headers=o.headers.__dict__, url=o.url, text=o.text)
+            return dict(headers=o.headers.__dict__, url=o.url, text=o.text)
         elif hasattr(o, '__dict__'):
             return o.__dict__
         elif isinstance(o, deque):
@@ -932,8 +972,8 @@ class MyJSONEncoder(JSONEncoder):
 class BattleSide:
     id: int
     points: int
-    deployed: List[int] = list()
-    allies: List[int] = list()
+    deployed: List[int] = None
+    allies: List[int] = None
 
     def __init__(self, country_id: int, points: int, allies: List[int], deployed: List[int]):
         self.id = country_id
@@ -945,8 +985,8 @@ class BattleSide:
 class BattleDivision:
     end: datetime.datetime
     epic: bool
-    dom_pts: Dict[str, int] = dict()
-    wall: Dict[str, Union[int, float]] = dict()
+    dom_pts: Dict[str, int] = None
+    wall: Dict[str, Union[int, float]] = None
 
     @property
     def div_end(self) -> bool:
@@ -955,8 +995,8 @@ class BattleDivision:
     def __init__(self, end: datetime.datetime, epic: bool, inv_pts: int, def_pts: int, wall_for: int, wall_dom: float):
         self.end = end
         self.epic = epic
-        self.dom_pts.update({"inv": inv_pts, "def": def_pts})
-        self.wall.update({"for": wall_for, "dom": wall_dom})
+        self.dom_pts = dict({"inv": inv_pts, "def": def_pts})
+        self.wall = dict({"for": wall_for, "dom": wall_dom})
 
 
 class Battle(object):
@@ -968,13 +1008,13 @@ class Battle(object):
     start: datetime.datetime = None
     invader: BattleSide = None
     defender: BattleSide = None
-    div: Dict[int, BattleDivision] = dict()
+    div: Dict[int, BattleDivision] = None
 
     @property
     def is_air(self) -> bool:
         return not bool(self.zone_id % 4)
 
-    def __init__(self, battle: dict):
+    def __init__(self, battle: Dict[str, Any]):
         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))
@@ -991,6 +1031,7 @@ class Battle(object):
                                    [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 = {}
         for div, data in battle.get('div', {}).items():
             div = int(div)
             if data.get('end'):
@@ -998,21 +1039,24 @@ class Battle(object):
             else:
                 end = datetime.datetime.max
 
-            self.div.update({div: BattleDivision(end, data.get('epic_type') in [1, 5],
-                                                 data.get('dom_pts').get("inv"), data.get('dom_pts').get("def"),
-                                                 data.get('wall').get("for"), data.get('wall').get("dom"))})
+            battle_div = BattleDivision(
+                end=end, epic=data.get('epic_type') in [1, 5],
+                inv_pts=data.get('dom_pts').get("inv"), def_pts=data.get('dom_pts').get("def"),
+                wall_for=data.get('wall').get("for"), wall_dom=data.get('wall').get("dom")
+            )
+
+            self.div.update({div: battle_div})
 
     def __repr__(self):
         now = utils.now()
         is_started = self.start < utils.now()
         if is_started:
-            timepart = "{}".format(now - self.start)
+            time_part = "{}".format(now - self.start)
         else:
-            timepart = "- {}".format(self.start - now)
-        return "Battle {} | {:>21.21}:{:<21.21} | Round {:2} | Start {}".format(self.id,
-                                                                                utils.COUNTRIES[self.invader.id],
-                                                                                utils.COUNTRIES[self.defender.id],
-                                                                                self.zone_id, timepart)
+            time_part = "- {}".format(self.start - now)
+        return "Battle {} | {:>21.21}:{:<21.21} | Round {:2} | Start {}".format(
+            self.id, utils.COUNTRIES[self.invader.id], utils.COUNTRIES[self.defender.id], self.zone_id, time_part
+        )
 
 
 class EnergyToFight:

erepublik/utils.py

@@ -0,0 +1,358 @@
+import datetime
+import inspect
+import json
+import os
+import re
+import sys
+import time
+import traceback
+import unicodedata
+from collections import deque
+from decimal import Decimal
+from json import JSONEncoder
+from pathlib import Path
+from typing import Union, Any, List, NoReturn, Mapping
+
+import pytz
+import requests
+from requests import Response
+
+__all__ = ["FOOD_ENERGY", "COMMIT_ID", "COUNTRIES", "erep_tz",
+           "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", ]
+
+
+FOOD_ENERGY = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
+COMMIT_ID = "7b92e19"
+
+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*****", }
+
+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", }
+
+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'}
+
+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', }
+
+
+class MyJSONEncoder(JSONEncoder):
+    def default(self, o):
+        if isinstance(o, 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)
+        elif isinstance(o, datetime.date):
+            return dict(__type__='date', year=o.year, month=o.month, day=o.day)
+        elif isinstance(o, datetime.timedelta):
+            return dict(__type__='timedelta', days=o.days, seconds=o.seconds,
+                        microseconds=o.microseconds, total_seconds=o.total_seconds())
+        elif isinstance(o, Response):
+            return dict(headers=o.headers.__dict__, url=o.url, text=o.text)
+        elif hasattr(o, '__dict__'):
+            return o.__dict__
+        elif isinstance(o, deque):
+            return list(o)
+        return super().default(o)
+
+
+def now() -> datetime.datetime:
+    return datetime.datetime.now(erep_tz).replace(microsecond=0)
+
+
+def localize_timestamp(timestamp: int) -> datetime.datetime:
+    return datetime.datetime.fromtimestamp(timestamp, erep_tz)
+
+
+def localize_dt(dt: Union[datetime.date, datetime.datetime]) -> datetime.datetime:
+    try:
+        try:
+            return erep_tz.localize(dt)
+        except AttributeError:
+            return erep_tz.localize(datetime.datetime.combine(dt, datetime.time(0, 0, 0)))
+    except ValueError:
+        return dt.astimezone(erep_tz)
+
+
+def good_timedelta(dt: datetime.datetime, td: datetime.timedelta) -> datetime.datetime:
+    return erep_tz.normalize(dt + td)
+
+
+def eday_from_date(date: Union[datetime.date, datetime.datetime] = now()) -> int:
+    if isinstance(date, datetime.date):
+        date = datetime.datetime.combine(date, datetime.time(0, 0, 0))
+    return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
+
+
+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:
+    """ time_until aware datetime object Wrapper for sleeping until """
+    sleep_seconds = int((time_untill - now()).total_seconds())
+    return sleep_seconds if sleep_seconds > 0 else 0
+
+
+def interactive_sleep(sleep_seconds: int):
+    while sleep_seconds > 0:
+        seconds = sleep_seconds
+        if (seconds - 1) // 1800:
+            seconds = seconds % 1800 if seconds % 1800 else 1800
+        elif (seconds - 1) // 300:
+            seconds = seconds % 300 if seconds % 300 else 300
+        elif (seconds - 1) // 60:
+            seconds = seconds % 60 if seconds % 60 else 60
+        # elif (seconds - 1) // 30:
+        #     seconds = seconds % 30 if seconds % 30 else 30
+        else:
+            seconds = 1
+        sys.stdout.write("\rSleeping for {:4} more seconds".format(sleep_seconds))
+        sys.stdout.flush()
+        time.sleep(seconds)
+        sleep_seconds -= seconds
+    sys.stdout.write("\r")
+
+
+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
+    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:
+        f.write("%s\n" % txt)
+    if should_print:
+        print(txt)
+
+
+def write_interactive_log(*args, **kwargs):
+    _write_log(should_print=True, *args, **kwargs)
+
+
+def write_silent_log(*args, **kwargs):
+    _write_log(should_print=False, *args, **kwargs)
+
+
+def get_file(filepath: str) -> str:
+    file = Path(filepath)
+    if file.exists():
+        if file.is_dir():
+            return str(file / "new_file.txt")
+        else:
+            version = 1
+            try:
+                version = int(file.suffix[1:]) + 1
+                basename = file.stem
+            except ValueError:
+                basename = file.name
+                version += 1
+
+            full_name = file.parent / f"{basename}.{version}"
+            while full_name.exists():
+                version += 1
+                full_name = file.parent / f"{basename}.{version}"
+            return str(full_name)
+    else:
+        os.makedirs(file.parent, exist_ok=True)
+        return str(file)
+
+
+def write_file(filename: str, content: str) -> int:
+    filename = get_file(filename)
+    with open(filename, 'ab') as f:
+        return f.write(content.encode("utf-8"))
+
+
+def write_request(response: requests.Response, is_error: bool = False):
+    from erepublik import Citizen
+    # Remove GET args from url name
+    url = response.url
+    last_index = url.index("?") if "?" in url else len(response.url)
+
+    name = slugify(response.url[len(Citizen.url):last_index])
+    html = response.text
+
+    try:
+        json.loads(html)
+        ext = "json"
+    except json.decoder.JSONDecodeError:
+        ext = "html"
+
+    if not is_error:
+        filename = "debug/requests/{}_{}.{}".format(now().strftime('%F_%H-%M-%S'), name, ext)
+        write_file(filename, html)
+    else:
+        return {"name": "{}_{}.{}".format(now().strftime('%F_%H-%M-%S'), name, ext),
+                "content": html.encode('utf-8'),
+                "mimetype": "application/json" if ext == "json" else "text/html"}
+
+
+def send_email(name: str, content: List[Any], player=None, local_vars: Mapping[Any, Any] = None,
+               promo: bool = False, captcha: bool = False):
+    if local_vars is None:
+        local_vars = {}
+    from erepublik import Citizen
+
+    file_content_template = "<html><head><title>{title}</title></head><body>{body}</body></html>"
+    if isinstance(player, Citizen):
+        resp = write_request(player.r, is_error=True)
+    else:
+        resp = {"name": "None.html", "mimetype": "text/html",
+                "content": file_content_template.format(body="<br/>".join(content), title="Error"), }
+
+    if promo:
+        resp = {"name": "%s.html" % name, "mimetype": "text/html",
+                "content": file_content_template.format(title="Promo", body="<br/>".join(content))}
+        subject = "[eBot][{}] Promos: {}".format(now().strftime('%F %T'), name)
+
+    elif captcha:
+        resp = {"name": "%s.html" % name, "mimetype": "text/html",
+                "content": file_content_template.format(title="ReCaptcha", body="<br/>".join(content))}
+        subject = "[eBot][{}] RECAPTCHA: {}".format(now().strftime('%F %T'), name)
+    else:
+        subject = "[eBot][%s] Bug trace: %s" % (now().strftime('%F %T'), name)
+
+    body = "".join(traceback.format_stack()) + \
+           "\n\n" + \
+           "\n".join(content)
+    data = dict(send_mail=True, subject=subject, bugtrace=body)
+    if promo:
+        data.update({'promo': True})
+    elif captcha:
+        data.update({'captcha': True})
+    else:
+        data.update({"bug": True})
+
+    files = [('file', (resp.get("name"), resp.get("content"), resp.get("mimetype"))), ]
+    filename = "log/%s.log" % now().strftime('%F')
+    if os.path.isfile(filename):
+        files.append(('file', (filename[4:], open(filename, 'rb'), "text/plain")))
+    if local_vars:
+        if "state_thread" in local_vars:
+            local_vars.pop('state_thread', None)
+        files.append(('file', ("local_vars.json", json.dumps(local_vars, indent=2,
+                                                             cls=MyJSONEncoder, sort_keys=True), "application/json")))
+    if isinstance(player, Citizen):
+        files.append(('file', ("instance.json", player.to_json(indent=True), "application/json")))
+    requests.post('https://pasts.72.lv', data=data, files=files)
+
+
+def normalize_html_json(js: str) -> str:
+    js = re.sub(r' \'(.*?)\'', lambda a: '"%s"' % a.group(1), js)
+    js = re.sub(r'(\d\d):(\d\d):(\d\d)', r'\1\2\3', js)
+    js = re.sub(r'([{\s,])(\w+)(:)(?!"})', r'\1"\2"\3', js)
+    js = re.sub(r',\s*}', '}', js)
+    return js
+
+
+def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commit_id: str = None,
+                  interactive: bool = False):
+    """
+    Process error logging and email sending to developer
+    :param interactive: Should print interactively
+    :param log_info: String to be written in output
+    :param name: String Instance name
+    :param exc_info: tuple output from sys.exc_info()
+    :param citizen: Citizen instance
+    :param commit_id: Code's version by commit id
+    """
+    type_, value_, traceback_ = exc_info
+    bugtrace = [] if not commit_id else ["Commit id: %s" % commit_id, ]
+    bugtrace += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]
+
+    if interactive:
+        write_interactive_log(log_info)
+    else:
+        write_silent_log(log_info)
+    trace = inspect.trace()
+    if trace:
+        trace = trace[-1][0].f_locals
+    else:
+        trace = dict()
+    send_email(name, bugtrace, 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
+    Convert to ASCII if 'allow_unicode' is False. Convert spaces to hyphens.
+    Remove characters that aren't alphanumerics, underscores, or hyphens.
+    Convert to lowercase. Also strip leading and trailing whitespace.
+    """
+    value = str(value)
+    if allow_unicode:
+        value = unicodedata.normalize('NFKC', value)
+    else:
+        value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
+    value = re.sub(r'[^\w\s-]', '', value).strip().lower()
+    return re.sub(r'[-\s]+', '-', value)

erepublik_script/__init__.py

@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""Top-level package for eRepublik script."""
-
-__author__ = """Eriks Karls"""
-__email__ = 'eriks@72.lv'
-__version__ = '0.1.2'
-__all__ = ["Citizen"]
-
-from erepublik_script import classes, utils
-from erepublik_script.citizen import Citizen
-

erepublik_script/cli.py

@@ -1,422 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""Console script for erepublik_script."""
-
-import json
-import os
-import random
-import sys
-import threading
-from collections import defaultdict
-from datetime import timedelta
-from typing import List, Tuple
-
-import click
-
-from erepublik_script import classes, utils
-from erepublik_script.citizen import Citizen
-
-
-__all__ = ["Citizen"]
-
-CONFIG = defaultdict(bool)
-
-
-@click.command()
-@click.option('--silent', help='Run silently', type=bool, is_flag=True)
-def main(silent):
-    global CONFIG
-    assert sys.version_info >= (3, 7, 1)
-    if silent:
-        write_log = utils.write_silent_log
-    else:
-        write_log = utils.write_interactive_log
-
-    try:
-        with open('config.json', 'r') as f:
-            CONFIG = json.load(f)
-
-        write_log('Config file found. Checking...')
-        CONFIG = utils.parse_config(CONFIG)
-    except:
-        CONFIG = utils.parse_config()
-
-    with open('config.json', 'w') as f:
-        json.dump(CONFIG, f, indent=True, sort_keys=True)
-    if CONFIG['interactive']:
-        write_log = utils.write_interactive_log
-    else:
-        write_log = utils.write_silent_log
-    write_log('\nTo quit press [ctrl] + [c]', False)
-    os.chdir(os.path.dirname(os.path.realpath(__file__)))
-    write_log('Version: ' + utils.VERSION)
-    player = None
-    try:  # If errors before player is initialized
-        while True:
-            player = Citizen(email=CONFIG['email'], password=CONFIG['password'])
-            if player.logged_in:
-                break
-            utils.silent_sleep(2)
-        player.config.work = CONFIG['work']
-        player.config.train = CONFIG['train']
-        player.config.ot = CONFIG['ot']
-        player.config.wam = bool(CONFIG['wam'])
-        player.config.employees = bool(CONFIG['employ'])
-        player.config.auto_sell = CONFIG.get('auto_sell', [])
-        player.config.auto_sell_all = CONFIG.get('auto_sell_all', False)
-        player.config.auto_buy_raw = CONFIG.get('auto_buy_raw', False)
-        player.config.force_wam = CONFIG.get('force_wam', False)
-        player.config.fight = CONFIG['fight']
-        player.config.air = CONFIG['air']
-        player.config.ground = CONFIG['ground']
-        player.config.all_in = CONFIG['all_in']
-        player.config.next_energy = CONFIG['next_energy']
-        player.config.boosters = CONFIG['boosters']
-        player.config.travel_to_fight = CONFIG['travel_to_fight']
-        player.config.always_travel = CONFIG.get('always_travel', False)
-        player.config.epic_hunt = CONFIG['epic_hunt']
-        player.config.epic_hunt_ebs = CONFIG['epic_hunt_ebs']
-        player.config.rw_def_side = CONFIG['rw_def_side']
-        player.config.random_sleep = CONFIG['random_sleep']
-        player.config.continuous_fighting = CONFIG['continuous_fighting']
-        player.config.interactive = CONFIG['interactive']
-        player.reporter.allowed = not CONFIG.get('reporting_is_not_allowed')
-
-        player.set_debug(CONFIG.get('debug', False))
-        while True:
-            try:
-                player.update_all()
-                break
-            except:
-                utils.silent_sleep(2)
-
-        now = utils.now()
-        dt_max = now.replace(year=9999)
-        tasks = {
-            'eat': now,
-        }
-        wam_hour = employ_hour = 14
-        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.fight:
-            tasks.update({'fight': now})
-        if player.config.wam:
-            wam_hour = 14
-            if not isinstance(CONFIG['wam'], bool):
-                try:
-                    wam_hour = abs(int(CONFIG['wam'])) % 24
-                except ValueError:
-                    pass
-            tasks.update({'wam': now.replace(hour=wam_hour, minute=0, second=0, microsecond=0)})
-        if player.config.employees:
-            employ_hour = 8
-            if not isinstance(CONFIG['employ'], bool):
-                try:
-                    employ_hour = abs(int(CONFIG['employ'])) % 24
-                except ValueError:
-                    pass
-            tasks.update({'employ': now.replace(hour=employ_hour, minute=0, second=0, microsecond=0)})
-
-        if player.config.epic_hunt:
-            tasks['epic_hunt'] = now
-
-        if CONFIG.get("renew_houses", True):
-            tasks['renew_houses'] = now
-
-        if CONFIG.get('start_battles'):
-            """ {'start_battle': {war_id: {'regions': [region_id, ],
-                                 'timing': ['at', 'hh:mm' | 'before', 'hh:mm' (before autoattack) |
-                                         'auto' (after round for citizenship country's oldest battle or at 00:00)
-                                         'rw', (after first round of RW if you are occupying)]}} """
-            player.allowed_battles = CONFIG.get('start_battles', dict())
-            raise classes.ErepublikException("Battle starting is not implemented")
-
-        if player.reporter.allowed:
-            report = dict(CONFIG)
-            report.pop("email", None)
-            report.pop("password", None)
-            report.update(
-                VERSION=utils.VERSION,
-                COMMIT_ID=utils.COMMIT_ID
-            )
-            player.reporter.report_action("ACTIVE_CONFIG", json_val=report)
-            # -1 because main thread is counted in
-            name = "{}-state_updater-{}".format(player.name, threading.active_count() - 1)
-            state_thread = threading.Thread(target=player.state_update_repeater, name=name)
-            state_thread.start()
-
-        if CONFIG.get("congress", True):
-            tasks['congress'] = now.replace(hour=1, minute=30, second=0)
-
-        if CONFIG.get("party_president", False):
-            tasks['party_president'] = now.replace(hour=1, minute=30, second=0)
-
-        contribute_cc = int(CONFIG.get("contribute_cc", 0))
-        if contribute_cc:
-            tasks['contribute_cc'] = now.replace(hour=2, minute=0, second=0)
-
-        if CONFIG.get("gold_buy"):
-            tasks['gold_buy'] = now.replace(hour=23, minute=57, second=0, microsecond=0)
-
-        error_count = 0
-        while error_count < 3:
-            try:
-                now = utils.now()
-                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 = 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 = now.replace(hour=0, minute=0, second=0) + timedelta(days=1)
-                    tasks.update({'train': next_time})
-
-                if tasks.get('wam', dt_max) <= now:
-                    player.write_log("Doing task: Work as manager")
-                    success = player.work_wam()
-                    player.eat()
-                    if success:
-                        next_time = now.replace(hour=wam_hour, minute=0, second=0, microsecond=0) + timedelta(days=1)
-                    else:
-                        next_time = 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('fight', dt_max) <= now or player.energy.is_energy_full:
-                    fight_energy_debug_log: List[Tuple[int, str]] = []
-                    player.write_log("Doing task: fight")
-                    player.write_log(player.health_info)
-
-                    if player.should_fight():
-                        player.find_battle_and_fight()
-                    else:
-                        player.collect_weekly_reward()
-                    energy = classes.EnergyToFight(player.details.xp_till_level_up * 10 - player.energy.limit + 50)
-                    fight_energy_debug_log.append((
-                        energy.i,
-                        f"Levelup reachable {player.details.xp_till_level_up} * 10 - {player.energy.limit} + 50"
-                    ))
-
-                    # Do levelup
-                    energy.check(player.details.xp_till_level_up * 10 + 50)
-                    fight_energy_debug_log.append((
-                        energy.i, f"Levelup {player.details.xp_till_level_up} * 10 + 50"
-                    ))
-
-                    # if levelup is close stop queueing other fighting
-                    if not player.is_levelup_close:
-
-                        # Obligatory need 75pp
-                        if player.details.pp < 75:
-                            energy.check(75 - player.details.pp)
-                            fight_energy_debug_log.append((energy.i, f"Obligatory need 75pp: 75 - {player.details.pp}"))
-
-                        if player.config.continuous_fighting and player.has_battle_contribution:
-                            energy.check(player.energy.interval)
-                            fight_energy_debug_log.append((energy.i, f"continuous_fighting: {player.energy.interval}"))
-
-                        # All-in
-                        if player.config.all_in:
-                            energy.check(player.energy.limit * 2 - 3 * player.energy.interval)
-                            fight_energy_debug_log.append((
-                                energy.i, f"All-in: {player.energy.limit} * 2 - 3 * {player.energy.interval}"
-                            ))
-                        elif player.energy.limit * 2 - 3 * player.energy.interval >= player.energy.recovered:
-                            # 1h worth of energy
-                            energy.check(player.energy.limit * 2 - 3 * player.energy.interval)
-                            fight_energy_debug_log.append(
-                                (energy.i, f"1h worth of energy: {player.energy.interval} * 10"
-                                 ))
-
-                        # All-in for AIR battles
-                        if all([player.config.air, player.config.all_in,
-                                player.energy.available >= player.energy.limit]):
-                            energy.check(player.energy.limit)
-                            fight_energy_debug_log.append((
-                                energy.i, f"All-in for AIR battles: {player.energy.limit}"
-                            ))
-
-                        # Get to next Energy +1
-                        if player.next_reachable_energy and player.config.next_energy:
-                            energy.check(player.next_reachable_energy * 10)
-                            fight_energy_debug_log.append((
-                                energy.i, f"Get to next Energy +1: {player.next_reachable_energy} * 10"
-                            ))
-
-                    energy = energy.i - player.energy.available
-                    next_minutes = max([6, abs(energy) // player.energy.interval * 6])
-                    # utils.write_silent_log("\n".join([f"{energy} {info}" for energy, info in fight_energy_debug_log]))
-                    next_time = player.energy.reference_time + timedelta(minutes=next_minutes)
-                    tasks.update({'fight': next_time})
-
-                if tasks.get('ot', dt_max) <= now:
-                    player.write_log("Doing task: ot")
-                    if now > player.my_companies.next_ot_time:
-                        player.work_ot()
-                        next_time = now + timedelta(minutes=60)
-                    else:
-                        next_time = player.my_companies.next_ot_time
-                    tasks.update({'ot': next_time})
-
-                if tasks.get('employ', dt_max) <= now:
-                    player.write_log("Doing task: Employee work")
-                    next_time = utils.now().replace(hour=employ_hour, minute=0, second=0) + timedelta(days=1)
-                    next_time = next_time if player.work_employees() else tasks.get('employ') + timedelta(minutes=30)
-                    tasks.update({'employ': next_time})
-
-                if tasks.get('epic_hunt', dt_max) <= now:
-                    player.write_log("Doing task: EPIC check")
-                    player.check_epic_battles()
-                    if player.active_fs:
-                        next_time = now + timedelta(minutes=1)
-                    else:
-                        next_time = tasks.get('eat')
-                    tasks.update({'epic_hunt': next_time})
-
-                if tasks.get('gold_buy', dt_max) <= now:
-                    player.write_log("Doing task: auto buy 10g")
-                    for offer in player.get_monetary_offers():
-                        if offer['amount'] >= 10 and player.details.cc >= 20 * offer["price"]:
-                            # TODO: check allowed amount to buy
-                            if player.buy_monetary_market_offer(offer=offer['offer_id'], amount=10, currency=62):
-                                break
-
-                    next_time = tasks.get('gold_buy') + timedelta(days=1)
-                    tasks.update({'gold_buy': next_time})
-
-                if tasks.get('congress', dt_max) <= now:
-                    if 1 <= now.day < 16:
-                        next_time = now.replace(day=16)
-                    elif 16 <= now.day < 24:
-                        player.write_log("Doing task: candidate for congress")
-                        player.candidate_for_congress()
-                        if not now.month == 12:
-                            next_time = now.replace(month=now.month + 1, day=16)
-                        else:
-                            next_time = now.replace(year=now.year + 1, month=1, day=16)
-                    else:
-                        if not now.month == 12:
-                            next_time = now.replace(month=now.month + 1, day=16)
-                        else:
-                            next_time = now.replace(year=now.year + 1, month=1, day=16)
-                    tasks.update({'congress': next_time.replace(hour=1, minute=30, second=0, microsecond=0)})
-
-                if tasks.get('party_president', dt_max) <= now:
-                    if not now.day == 15:
-                        player.write_log("Doing task: candidate for party president")
-                        player.candidate_for_party_presidency()
-                        if not now.month == 12:
-                            next_time = now.replace(month=now.month + 1)
-                        else:
-                            next_time = now.replace(year=now.year + 1, month=1)
-                    else:
-                        if not now.month == 12:
-                            next_time = now.replace(month=now.month + 1)
-                        else:
-                            next_time = now.replace(year=now.year + 1, month=1)
-                    tasks.update(party_president=next_time.replace(day=16, hour=0, minute=0, second=0, microsecond=0))
-
-                if tasks.get('contribute_cc', dt_max) <= now:
-                    if not now.weekday():
-                        player.update_money()
-                        cc = (player.details.cc // contribute_cc) * contribute_cc
-                        player.write_log("Doing task: Contribute {}cc to Latvia".format(cc))
-                        player.contribute_cc_to_country(cc)
-                    next_time = now + timedelta(days=7 - now.weekday())
-                    next_time = next_time.replace(hour=2, minute=0, second=0)
-                    tasks.update({'contribute_cc': next_time})
-
-                if tasks.get('renew_houses', dt_max) <= now:
-                    player.write_log("Doing task: Renew houses")
-                    end_times = player.renew_houses()
-                    if end_times:
-                        tasks.update(renew_houses=min(end_times.values()) - timedelta(hours=24))
-                    else:
-                        player.write_log("No houses found! Forcing q1 usage...")
-                        end_times = player.buy_and_activate_house(1)
-                        if not end_times:
-                            tasks.update(renew_houses=now + timedelta(hours=6))
-                        else:
-                            tasks.update(renew_houses=min(end_times.values()) - timedelta(hours=24))
-
-                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
-                random_seconds = random.randint(0, 121) if player.config.random_sleep else 0
-                sleep_seconds = int(utils.get_sleep_seconds(closest_next_time))
-                if sleep_seconds <= 0:
-                    raise classes.ErepublikException(f"Loop detected! Offending task: '{next_tasks[0]}'")
-                closest_next_time += timedelta(seconds=random_seconds)
-                player.write_log("My next Tasks and there time:\n" + "\n".join(sorted(next_tasks)))
-                player.write_log("Sleeping until (eRep): {} (sleeping for {}s + random {}s)".format(
-                    closest_next_time.strftime("%F %T"), sleep_seconds, random_seconds))
-                seconds_to_sleep = sleep_seconds + random_seconds if sleep_seconds > 0 else 0
-                player.sleep(seconds_to_sleep)
-
-            except classes.ErepublikNetworkException:
-                player.write_log('Network ERROR detected. Sleeping for 1min...')
-                player.sleep(60)
-            except (KeyboardInterrupt, SystemExit):
-                sys.exit(1)
-            except classes.ErepublikException as e:
-                utils.process_error(f"Known error detected! {e}", player.name, sys.exc_info(), player, utils.COMMIT_ID)
-            except:
-                utils.process_error("Unknown error!", player.name, sys.exc_info(), player, utils.COMMIT_ID)
-                error_count += 1
-                if error_count < 3:
-                    player.sleep(60)
-            finally:
-                if error_count >= 3:
-                    player.stop_threads.set()
-        player.stop_threads.set()
-        player.write_log('Too many errors.')
-    except (KeyboardInterrupt, SystemExit):
-        sys.exit(1)
-    except classes.ErepublikException:
-        utils.process_error("[{}] To many errors.".format(utils.COMMIT_ID), player.name, sys.exc_info(), player,
-                            utils.COMMIT_ID)
-    except:
-        if isinstance(player, Citizen):
-            name = player.name
-        elif CONFIG.get('email', None):
-            name = CONFIG['email']
-        else:
-            name = "Uninitialized"
-        utils.process_error("[{}] Fatal error.".format(utils.COMMIT_ID), name, sys.exc_info(), player, utils.COMMIT_ID)
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    while True:
-        main()
-        utils.write_interactive_log("Restarting after 1h")
-        utils.interactive_sleep(60 * 60)

erepublik_script/utils.py

@@ -1,730 +0,0 @@
-import datetime
-import inspect
-import json
-import os
-import re
-import sys
-import time
-import traceback
-from collections import deque
-from decimal import Decimal
-from json import JSONEncoder
-from pathlib import Path
-from typing import Union
-
-import pytz
-import requests
-from requests import Response
-from slugify import slugify
-
-
-__all__ = ["FOOD_ENERGY", "VERSION", "COMMIT_ID", "COUNTRIES", "erep_tz",
-           "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", ]
-
-
-FOOD_ENERGY = dict(q1=2, q2=4, q3=6, q4=8, q5=10, q6=12, q7=20)
-VERSION = "v0.14.1"
-COMMIT_ID = "7b92e19"
-
-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*****", }
-
-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", }
-
-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'}
-
-
-class MyJSONEncoder(JSONEncoder):
-    def default(self, o):
-        if isinstance(o, 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)
-        elif isinstance(o, datetime.date):
-            return dict(__type__='date', year=o.year, month=o.month, day=o.day)
-        elif isinstance(o, datetime.timedelta):
-            return dict(__type__='timedelta', days=o.days, seconds=o.seconds,
-                        microseconds=o.microseconds, total_seconds=o.total_seconds())
-        elif isinstance(o, Response):
-            return dict(headers=o.headers.__dict__, url=o.url, text=o.text)
-        elif hasattr(o, '__dict__'):
-            return o.__dict__
-        elif isinstance(o, deque):
-            return list(o)
-        return super().default(o)
-
-
-def now():
-    return datetime.datetime.now(erep_tz).replace(microsecond=0)
-
-
-def localize_timestamp(timestamp: int):
-    return datetime.datetime.fromtimestamp(timestamp, erep_tz)
-
-
-def localize_dt(dt: Union[datetime.date, datetime.datetime]):
-    if isinstance(dt, datetime.date):
-        dt = datetime.datetime.combine(dt, datetime.time(0, 0, 0))
-    return erep_tz.localize(dt)
-
-
-def good_timedelta(dt: datetime.datetime, td: datetime.timedelta) -> datetime.datetime:
-    return erep_tz.normalize(dt + td)
-
-
-def eday_from_date(date: Union[datetime.date, datetime.datetime] = now()) -> int:
-    if isinstance(date, datetime.date):
-        date = datetime.datetime.combine(date, datetime.time(0, 0, 0))
-    return (date - datetime.datetime(2007, 11, 20, 0, 0, 0)).days
-
-
-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:
-    """ time_until aware datetime object Wrapper for sleeping until """
-    sleep_seconds = int((time_untill - now()).total_seconds())
-    return sleep_seconds if sleep_seconds > 0 else 0
-
-
-def interactive_sleep(sleep_seconds: int):
-    while sleep_seconds > 0:
-        seconds = sleep_seconds
-        if (seconds - 1) // 1800:
-            seconds = seconds % 1800 if seconds % 1800 else 1800
-        elif (seconds - 1) // 300:
-            seconds = seconds % 300 if seconds % 300 else 300
-        elif (seconds - 1) // 60:
-            seconds = seconds % 60 if seconds % 60 else 60
-        # elif (seconds - 1) // 30:
-        #     seconds = seconds % 30 if seconds % 30 else 30
-        else:
-            seconds = 1
-        sys.stdout.write("\rSleeping for {:4} more seconds".format(sleep_seconds))
-        sys.stdout.flush()
-        time.sleep(seconds)
-        sleep_seconds -= seconds
-    sys.stdout.write("\r")
-
-
-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
-    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:
-        f.write("%s\n" % txt)
-    if should_print:
-        print(txt)
-
-
-def write_interactive_log(*args, **kwargs):
-    _write_log(should_print=True, *args, **kwargs)
-
-
-def write_silent_log(*args, **kwargs):
-    _write_log(should_print=False, *args, **kwargs)
-
-
-def get_file(filepath: str) -> str:
-    file = Path(filepath)
-    if file.exists():
-        if file.is_dir():
-            return str(file / "new_file.txt")
-        else:
-            version = 1
-            try:
-                version = int(file.suffix[1:]) + 1
-                basename = file.stem
-            except ValueError:
-                basename = file.name
-                version += 1
-
-            full_name = file.parent / f"{basename}.{version}"
-            while full_name.exists():
-                version += 1
-                full_name = file.parent / f"{basename}.{version}"
-            return str(full_name)
-    else:
-        os.makedirs(file.parent, exist_ok=True)
-        return str(file)
-
-
-def write_file(filename: str, content: str) -> int:
-    filename = get_file(filename)
-    with open(filename, 'ab') as f:
-        return f.write(content.encode("utf-8"))
-
-
-def write_request(response: requests.Response, is_error: bool = False):
-    from erepublik_script import Citizen
-    # Remove GET args from url name
-    url = response.url
-    last_index = url.index("?") if "?" in url else len(response.url)
-
-    name = slugify(response.url[len(Citizen.url):last_index])
-    html = response.text
-
-    try:
-        json.loads(html)
-        ext = "json"
-    except json.decoder.JSONDecodeError:
-        ext = "html"
-
-    if not is_error:
-        filename = "debug/requests/{}_{}.{}".format(now().strftime('%F_%H-%M-%S'), name, ext)
-        write_file(filename, html)
-    else:
-        return {"name": "{}_{}.{}".format(now().strftime('%F_%H-%M-%S'), name, ext),
-                "content": html.encode('utf-8'),
-                "mimetype": "application/json" if ext == "json" else "text/html"}
-
-
-def send_email(name, content: list, player=None, local_vars=dict, promo: bool = False, captcha: bool = False):
-    from erepublik_script import Citizen
-
-    file_content_template = "<html><head><title>{title}</title></head><body>{body}</body></html>"
-    if isinstance(player, Citizen):
-        resp = write_request(player.r, is_error=True)
-    else:
-        resp = {"name": "None.html", "mimetype": "text/html",
-                "content": file_content_template.format(body="<br/>".join(content), title="Error"), }
-
-    if promo:
-        resp = {"name": "%s.html" % name, "mimetype": "text/html",
-                "content": file_content_template.format(title="Promo", body="<br/>".join(content))}
-        subject = "[eBot][{}] Promos: {}".format(now().strftime('%F %T'), name)
-
-    elif captcha:
-        resp = {"name": "%s.html" % name, "mimetype": "text/html",
-                "content": file_content_template.format(title="ReCaptcha", body="<br/>".join(content))}
-        subject = "[eBot][{}] RECAPTCHA: {}".format(now().strftime('%F %T'), name)
-    else:
-        subject = "[eBot][%s] Bug trace: %s" % (now().strftime('%F %T'), name)
-
-    body = "".join(traceback.format_stack()) + \
-           "\n\n" + \
-           "\n".join(content)
-    data = dict(send_mail=True, subject=subject, bugtrace=body)
-    if promo:
-        data.update({'promo': True})
-    elif captcha:
-        data.update({'captcha': True})
-    else:
-        data.update({"bug": True})
-
-    files = [('file', (resp.get("name"), resp.get("content"), resp.get("mimetype"))), ]
-    filename = "log/%s.log" % now().strftime('%F')
-    if os.path.isfile(filename):
-        files.append(('file', (filename[4:], open(filename, 'rb'), "text/plain")))
-    if local_vars:
-        if "state_thread" in local_vars:
-            local_vars.pop('state_thread', None)
-        files.append(('file', ("local_vars.json", json.dumps(local_vars, indent=2,
-                                                             cls=MyJSONEncoder, sort_keys=True), "application/json")))
-    if isinstance(player, Citizen):
-        files.append(('file', ("instance.json", player.to_json(indent=True), "application/json")))
-    requests.post('https://pasts.72.lv', data=data, files=files)
-
-
-def parse_input(msg: str) -> bool:
-    msg += " (y|n):"
-    data = None
-    while data not in ['', 'y', 'Y', 'n', 'N']:
-        try:
-            data = input(msg)
-        except EOFError:
-            data = 'n'
-
-    return data in ['', 'y', 'Y']
-
-
-def parse_config(config=None) -> dict:
-    if config is None:
-        config = {}
-
-    if not config.get('email'):
-        config['email'] = input("Player email: ")
-
-    if not config.get('password'):
-        config['password'] = input("Player password: ")
-
-    if 'wt' in config:
-        config['work'] = config['wt']
-        config['train'] = config['wt']
-
-    if 'work' not in config:
-        config['work'] = parse_input('Should I work')
-
-    if 'train' not in config:
-        config['train'] = parse_input('Should I train')
-
-    if 'ot' not in config:
-        config['ot'] = parse_input('Should I work overtime')
-
-    if 'wam' not in config:
-        config['wam'] = parse_input('Should I WAM')
-
-    if 'employ' not in config:
-        config['employ'] = parse_input('Should I employ employees')
-
-    if config['wam'] or config['employ']:
-        if "autosell" in config:
-            config.pop("autosell")
-        if "autosell_raw" in config:
-            config.pop("autosell_raw")
-        if "autosell_final" in config:
-            config.pop("autosell_final")
-
-        if 'auto_sell' not in config or not isinstance(config['auto_sell'], list):
-            if parse_input('Should I auto sell produced products'):
-                config['auto_sell'] = []
-                if parse_input("Should I auto sell Food products"):
-                    if parse_input("Should I auto sell Food products"):
-                        config['auto_sell'].append("food")
-                    if parse_input("Should I auto sell Weapon products"):
-                        config['auto_sell'].append("weapon")
-                    if parse_input("Should I auto sell House products"):
-                        config['auto_sell'].append("house")
-                    if parse_input("Should I auto sell Aircraft products"):
-                        config['auto_sell'].append("airplane")
-                if parse_input("Should I auto sell raw products"):
-                    if parse_input("Should I auto sell Food raw"):
-                        config['auto_sell'].append("foodRaw")
-                    if parse_input("Should I auto sell Weapon raw"):
-                        config['auto_sell'].append("weaponRaw")
-                    if parse_input("Should I auto sell House raw"):
-                        config['auto_sell'].append("houseRaw")
-                    if parse_input("Should I auto sell Airplane raw"):
-                        config['auto_sell'].append("airplaneRaw")
-        if config['auto_sell']:
-            if 'auto_sell_all' not in config:
-                print("When selling produced items should I also sell items already in inventory?")
-                config['auto_sell_all'] = parse_input('Y - sell all, N - only just produced')
-        else:
-            config['auto_sell_all'] = False
-
-        if 'auto_buy_raw' not in config:
-            config['auto_buy_raw'] = parse_input('Should I auto buy raw deficit at WAM or employ')
-    else:
-        config['auto_sell'] = []
-        config['auto_sell_all'] = False
-        config['auto_buy_raw'] = False
-
-    if 'fight' not in config:
-        config['fight'] = parse_input('Should I fight')
-
-    if config.get('fight'):
-        if 'air' not in config:
-            config['air'] = parse_input('Should I fight in AIR')
-
-        if 'ground' not in config:
-            config['ground'] = parse_input('Should I fight in GROUND')
-
-        if 'all_in' not in config:
-            print("When full energy should I go all in")
-            config['all_in'] = parse_input('Y - all in, N - 1h worth of energy')
-
-        if 'next_energy' not in config:
-            config['next_energy'] = parse_input('Should I fight when next pp +1 energy available')
-
-        if 'boosters' not in config:
-            config['boosters'] = parse_input('Should I use +50% dmg boosters')
-
-        if 'travel_to_fight' not in config:
-            config['travel_to_fight'] = parse_input('Should I travel to fight')
-
-        if 'epic_hunt' not in config:
-            config['epic_hunt'] = parse_input('Should I check for epic battles')
-            if not config['epic_hunt']:
-                config['epic_hunt_ebs'] = False
-
-        if not config['epic_hunt']:
-            config['epic_hunt_ebs'] = False
-        elif 'epic_hunt_ebs' not in config:
-            config['epic_hunt_ebs'] = parse_input('Should I eat EBs when fighting in epic battle')
-
-        if 'rw_def_side' not in config:
-            config['rw_def_side'] = parse_input('Should I fight on defenders side in RWs')
-
-        if 'continuous_fighting' not in config:
-            config['continuous_fighting'] = parse_input('If already fought in any battle, \n'
-                                                        'should I continue to fight all FF in that battle')
-    else:
-        config['air'] = False
-        config['ground'] = False
-        config['all_in'] = False
-        config['next_energy'] = False
-        config['boosters'] = False
-        config['travel_to_fight'] = False
-        config['epic_hunt'] = False
-        config['epic_hunt_ebs'] = False
-        config['rw_def_side'] = False
-        config['continuous_fighting'] = False
-
-    if 'debug' not in config:
-        config['debug'] = parse_input('Should I generate debug files')
-
-    if 'random_sleep' not in config:
-        config['random_sleep'] = parse_input('Should I add random amount (0-120sec) to sleep time')
-
-    if 'gold_buy' not in config:
-        config['gold_buy'] = parse_input('Should I auto buy 10g every day')
-
-    if 'interactive' not in config:
-        config['interactive'] = parse_input('Should I print output to console?')
-
-    return config
-
-
-def normalize_html_json(js: str) -> str:
-    js = re.sub(r' \'(.*?)\'', lambda a: '"%s"' % a.group(1), js)
-    js = re.sub(r'(\d\d):(\d\d):(\d\d)', r'\1\2\3', js)
-    js = re.sub(r'([{\s,])(\w+)(:)(?!"})', r'\1"\2"\3', js)
-    js = re.sub(r',\s*}', '}', js)
-    return js
-
-
-def process_error(log_info: str, name: str, exc_info: tuple, citizen=None, commit_id: str = None,
-                  interactive: bool = False):
-    """
-    Process error logging and email sending to developer
-    :param error:
-    :param interactive: Should print interactively
-    :param log_info: String to be written in output
-    :param name: String Instance name
-    :param exc_info: tuple output from sys.exc_info()
-    :param citizen: Citizen instance
-    :param commit_id: Code's version by commit id
-    """
-    type_, value_, traceback_ = exc_info
-    bugtrace = [] if not commit_id else ["Commit id: %s" % commit_id, ]
-    bugtrace += [str(value_), str(type_), ''.join(traceback.format_tb(traceback_))]
-
-    if interactive:
-        write_interactive_log(log_info)
-    else:
-        write_silent_log(log_info)
-    send_email(name, bugtrace, citizen, local_vars=inspect.trace()[-1][0].f_locals)
-
-
-def aviator_support(citizen, send_food=False, free_food=None):
-    forbidden_ids = []
-    if free_food is None:
-        free_food = {}  # {"q1": 0, "q2": 1000, ...}
-    context = {'PLAYER_COUNT': 0, 'TABLE': "",
-               'STARTING_ENERGY': sum([amount * FOOD_ENERGY[q] for q, amount in free_food.items()]),
-               'TOTAL_CC': 0, 'TOTAL_ENERGY': 0, 'END_ENERGY': 0}
-    from erepublik_script import Citizen
-    if not isinstance(citizen, Citizen):
-        from .classes import ErepublikException
-        raise ErepublikException("\"citizen\" must be instance of erepublik.Citizen")
-    citizen.config.interactive = True
-    aviators = dict()
-    time_string = "%Y-%m-%d %H:%M:%S"
-    latest_article = requests.get('https://erep.lv/aviator/latest_article/').json()
-    for quality, amount in latest_article.get('free_food', {}).items():
-        free_food[quality] = free_food.get(quality, 0) + amount
-
-    if not latest_article.get('status'):
-        from .classes import ErepublikException
-        raise ErepublikException('Article ID and week problem')
-    context.update(WEEK=latest_article.get('week', 0) + 1)
-    comments = citizen.post_article_comments(citizen.token, latest_article.get('article_id'), 1).json()
-    ranking = citizen.get_leaderboards_kills_aircraft_rankings(71, 1, 0).json()
-
-    if not comments.get("comments", {}):
-        from .classes import ErepublikException
-        raise ErepublikException("No comments found")
-    for comment_data in comments.get("comments", {}).values():
-        if comment_data.get('authorId') == 1954361:
-            start_dt = localize_dt(datetime.datetime.strptime(comment_data.get('createdAt'), time_string))
-            days_ahead = 1 - start_dt.weekday()
-            if days_ahead <= 0:
-                days_ahead += 7
-            end_dt = (good_timedelta(start_dt, datetime.timedelta(days_ahead))).replace(hour=0, minute=0, second=0)
-            if not comment_data.get('replies', {}):
-                from .classes import ErepublikException
-                raise ErepublikException("No replies found")
-
-            for reply_data in comment_data.get('replies').values():
-                if localize_dt(datetime.datetime.strptime(reply_data.get('createdAt'), time_string)) > end_dt:
-                    continue
-                if re.search(r'piesakos', reply_data.get('message'), re.I):
-                    aviators.update({int(reply_data.get('authorId')): dict(
-                        id=reply_data.get('authorId'), name="", kills=0, rank=0, residency=None, health=0, extra=[],
-                        factories=0
-                    )})
-
-    context['PLAYER_COUNT'] = len(aviators)
-    write_interactive_log("{:^9} | {:<28} | {:4} | {:26} | {:6} | {}".format(
-        "ID", "Vārds", "Kili", "Gaisa rangs", "Energy", "Aktivizētās mājas"
-    ))
-
-    for player_top_data in ranking.get('top'):
-        player_id = int(player_top_data.get('id'))
-        if player_id in aviators:
-            aviators[player_id]["kills"] = int(player_top_data['values'])
-
-    for aviator_id, aviator_data in aviators.items():
-        aviator_info = citizen.get_citizen_profile(aviator_id).json()
-        aviator_data.update({
-            'rank': aviator_info['military']['militaryData']['aircraft']['rankNumber'],
-            'name': aviator_info['citizen']['name'],
-            'residency': aviator_info['city']['residenceCityId']
-        })
-
-        if aviator_info.get("isBanned"):
-            aviator_data.update({'health': 0, 'extra': ["BANNED", ]})
-        else:
-            if aviator_data['rank'] < 44:
-                if aviator_data['rank'] < 38:
-                    health = aviator_data['kills'] * 30
-                else:
-                    health = aviator_data['kills'] * 20
-                has_pp = False
-                if aviator_info.get("activePacks"):
-                    has_pp = bool(aviator_info.get("activePacks").get("power_pack"))
-                max_health = 7 * 24 * (500 if has_pp else 300)
-                if health < max_health:
-                    aviator_data['health'] = health
-                else:
-                    aviator_data['health'] = max_health
-
-                if not aviator_data["residency"]:
-                    aviator_data['health'] = 0
-                    aviator_data['extra'].append("No residency set")
-                else:
-                    residency = citizen.get_city_data_residents(
-                        aviator_data["residency"], params={"search": aviator_data['name']}
-                    ).json()
-
-                    for resident in residency.get('widgets', {}).get('residents', {}).get('residents'):
-                        if int(resident.get('citizenId')) == aviator_id:
-                            if resident['numFactories']:
-                                aviator_data['factories'] = resident['numFactories']
-                            else:
-                                aviator_data['factories'] = 0
-                            if not resident.get('activeHouses'):
-                                aviator_data['health'] = 0
-                            if resident['numHouses']:
-                                aviator_data['extra'].append(", ".join(resident['activeHouses']))
-                            else:
-                                aviator_data['extra'].append("Nav māja")
-                                aviator_data['health'] = 0
-
-            else:
-                aviator_data['extra'].append("Rank")
-
-        write_interactive_log("{id:>9} | {name:<28} | {kills:4} | {:26} | {health:6} | {}".format(
-            AIR_RANKS[aviator_data['rank']],
-            ", ".join(aviator_data["extra"]),
-            **aviator_data)
-        )
-
-    db_post_data = []
-    for aviator_id, aviator_data in aviators.items():
-        db_post_data.append(dict(id=aviator_id, name=aviator_data['name'],
-                                 rank=aviator_data['rank'], factory_count=aviator_data['factories']))
-    requests.post('https://erep.lv/aviator/set/', json=db_post_data)
-
-    for aviator_id, new in aviators.items():
-        resp = requests.get('https://erep.lv/aviator/check/{}/'.format(aviator_id))
-        if not resp.json()['status']:
-            aviators[aviator_id]['health'] = 0
-            aviators[aviator_id]['extra'] = ["Nav izmaiņas fabriku skaitā", ]
-
-    for player_id in forbidden_ids:
-        if player_id in aviators:
-            aviators[player_id]['health'] = 0
-            if "BANNED" not in aviators[player_id]['extra']:
-                aviators[player_id]['extra'] = ["Aizliegta pieteikšanās", ]
-
-    sent_data = []
-    if send_food:
-        for aviator_data in sorted(aviators.values(), key=lambda t: (-t["health"], -t['kills'])):
-            remaining = aviator_data['health']
-            if not remaining:
-                sent_data.append({
-                    "player_id": aviator_data['id'], "name": aviator_data['name'], "quality": 0,
-                    "amount": 0, "energy": 0, "price": 0, "cost": 0,
-                })
-            while remaining > 0:
-                o = []
-                if free_food:
-                    # Reversed because need to start with higher qualities so that q1 stays available
-                    for quality in reversed(list(free_food.keys())):
-                        if free_food[quality]:
-                            o.append((quality, {'price': 0., 'amount': free_food[quality]}))
-                        else:
-                            free_food.pop(quality)
-                if not free_food:
-                    offers = citizen.get_market_offers(71, product="food")
-                    o += sorted(offers.items(), key=lambda v: (v[1]['price'] / FOOD_ENERGY[v[0]],
-                                                               -v[1]['amount'] * FOOD_ENERGY[v[0]]))
-
-                for _o in o:
-                    q, q_data = _o
-                    if FOOD_ENERGY[q] <= remaining:
-                        break
-                else:
-                    write_interactive_log(
-                        "{name} needs to receive extra {remaining}hp".format(name=aviator_data['name'],
-                                                                             remaining=remaining))
-                    break
-
-                if q_data['amount'] * FOOD_ENERGY[q] <= remaining:
-                    amount = q_data['amount']
-                else:
-                    amount = remaining // FOOD_ENERGY[q]
-
-                if q_data['price']:
-                    # print(f"citizen._buy_market_offer(offer={q_data['offer_id']}, amount={amount})")
-                    citizen.post_economy_marketplace_actions(citizen.token, amount=amount, buy=True,
-                                                             offer=q_data["offer_id"])
-                else:
-                    free_food[q] -= amount
-
-                # print(f"citizen.donate_items(citizen_id={aviator_data['id']},
-                #                              amount={amount}, industry_id=1, quality={int(q[1])})")
-                citizen.donate_items(citizen_id=aviator_data['id'], amount=amount, industry_id=1, quality=int(q[1]))
-                remaining -= amount * FOOD_ENERGY[q]
-                context['TOTAL_CC'] += q_data['price'] * amount
-                context['TOTAL_ENERGY'] += amount * FOOD_ENERGY[q]
-                sent_data.append(
-                    {"player_id": aviator_data['id'], "name": aviator_data['name'], "quality": q, "amount": amount,
-                     "energy": amount * FOOD_ENERGY[q], "price": q_data['price'],
-                     "cost": q_data['price'] * amount, })
-
-    with open(get_file("{eday}.csv".format(eday=eday_from_date(now()))), 'a') as f:
-        f.write('PlayerID, Quality, Amount, Energy, Price, Cost\n')
-        for player_data in sent_data:
-            f.write('{player_id}, {quality}, {amount}, {energy}, {price}, {cost}\n'.format(**player_data))
-
-    columns = ('[columns][b]Spēlētajs[/b]\n'
-               '{players}[nextcol][b]Kili[/b]\n'
-               '{kills}\n'
-               '[nextcol][right][b]Enerģija[/b]\n'
-               '{health}\n'
-               '[/right][/columns]')
-    player_template = '[b][url=https://www.erepublik.com/en/citizen/profile/{id}]{name}[/url][/b]'
-    players = []
-    kills = []
-    health = []
-    write_interactive_log("\n".join(["{}: {}".format(q, a) for q, a in free_food.items()]))
-    context['TOTAL_CC'] = round(context['TOTAL_CC'], 2)
-    context["END_ENERGY"] = sum([amount * FOOD_ENERGY[q] for q, amount in free_food.items()])
-    data = {}
-    for row in sent_data:
-        pid = int(row['player_id'])
-        if pid not in data:
-            data.update({pid: dict(id=pid, name=row['name'], energy=0, cost=0, kills=aviators[pid]['kills'])})
-
-        data[pid]["energy"] += row['energy']
-        data[pid]["cost"] += row['cost']
-
-    for pid, player_data in sorted(aviators.items(), key=lambda t: (-t[1]["health"], -t[1]['kills'])):
-        players.append(player_template.format(id=pid, name=player_data['name']))
-        kills.append(str(player_data['kills']))
-        health.append(str(player_data['health'] or ", ".join(player_data['extra'])))
-    else:
-        context['TABLE'] = columns.format(
-            players="\n".join(players),
-            kills="\n".join(kills),
-            health="\n".join(health)
-        )
-
-    if os.path.isfile("scripts/KM_piloti.txt"):
-        with open("scripts/KM_piloti.txt") as f:
-            template = f.read()
-        article = template.format(**context)
-        with open(get_file("{eday}.txt".format(eday=eday_from_date(now()))), "w") as f:
-            f.write(article)
-        if send_food:
-            article_data = dict(
-                title="[KM] Gaisa maizītes [d{} {}]".format(citizen.eday, citizen.now.strftime("%H:%M")),
-                content=article,
-                kind=3
-            )
-            from_eday = eday_from_date(good_timedelta(now(), - datetime.timedelta(days=now().weekday() + 6)))
-            till_eday = eday_from_date(good_timedelta(now(), - datetime.timedelta(days=now().weekday())))
-            comment_data = dict(
-                message="★★★★ MAIZE PAR NEDĒĻU [DAY {}-{}] IZDALĪTA ★★★★\n★ Apgādei piesakāmies šī komentāra reply "
-                        "komentāros ar saucienu - piesakos! ★".format(from_eday, till_eday))
-            total_cc = int(round(context['TOTAL_CC']))
-            wall_body = ("★★★ [ KONGRESA BALSOJUMS ] ★★★\n\nDotācija pilotiem par d{}-{} {}cc apmērā.\n\n"
-                         "Balsot ar Par/Pret\nBalsošanas laiks 24h līdz d{} {}").format(
-                from_eday, till_eday, total_cc, citizen.eday + 1, citizen.now.strftime("%H:%M"))
-
-            citizen.write_log("Publishing info:\n\n### Article ###\n{}\n\n{}\n\n### Wall ###\n{}".format(
-                article_data['title'], comment_data['message'], wall_body
-            ))
-
-            KM_account: Citizen = Citizen("kara-ministrija@erep.lv", "KMPar0le")
-            KM_account.set_debug(True)
-            KM_account.update_citizen_info()
-            resp = KM_account.publish_article(**article_data)
-            article_id = resp.history[1].url.split("/")[-3]
-            comment_data.update({"article_id": article_id})
-            KM_account.write_article_comment(**comment_data)
-            citizen.write_on_country_wall(wall_body)
-            requests.post('https://erep.lv/aviator/latest_article/',
-                          data=dict(week=context["WEEK"], article_id=article_id))

requirements.txt

@@ -1,7 +0,0 @@
-ipython==7.3.0
-pycryptodome==3.7.3
-PyInstaller==3.4
-python-slugify==2.0.1
-pytz==2018.9
-requests==2.21.0
-Click>=6.0

requirements_dev.txt

@@ -1,10 +1,15 @@
 pip==19.1.1
 bumpversion==0.5.3
-wheel==0.32.1
+wheel==0.33.4
 watchdog==0.9.0
-flake8==3.5.0
-tox==3.5.2
-coverage==4.5.1
-Sphinx==1.8.1
-twine==1.12.1
-ipython==7.3.0
+flake8==3.7.8
+tox==3.13.2
+coverage==4.5.3
+Sphinx==2.1.2
+twine==1.13.0
+ipython==7.6.1
+PyInstaller==3.5
+pytz==2019.1
+requests==2.22.0
+pycryptodome==3.8.2
+python-slugify==2.0.1

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.2
+current_version = 0.15.2
 commit = True
 tag = True
 
@@ -7,7 +7,7 @@ tag = True
 search = version='{current_version}'
 replace = version='{new_version}'
 
-[bumpversion:file:erepublik_script/__init__.py]
+[bumpversion:file:erepublik/__init__.py]
 search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 
@@ -17,7 +17,7 @@ universal = 1
 [flake8]
 exclude = docs
 max-line-length = 120
-ignore = E722
+ignore = E722 F401
 
 [aliases]
 

setup.py

@@ -11,7 +11,7 @@ with open('README.rst') as readme_file:
 with open('HISTORY.rst') as history_file:
     history = history_file.read()
 
-requirements = ['Click>=6.0', 'pytz==2018.9', 'requests==2.21.0', 'python-slugify==2.0.1']
+requirements = ['pytz==2019.1', 'requests==2.22.0']
 
 setup_requirements = [ ]
 
@@ -21,30 +21,27 @@ setup(
     author="Eriks Karls",
     author_email='eriks@72.lv',
     classifiers=[
-        'Development Status :: 2 - Pre-Alpha',
+        'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.7',
     ],
-    description="Python package for eRepublik automated playing",
-    entry_points={
-        'console_scripts': [
-            'erepublik_script=erepublik_script.cli:main',
-        ],
-    },
+    description="Python package for automated eRepublik playing",
+    entry_points={},
     install_requires=requirements,
     license="MIT license",
     long_description=readme + '\n\n' + history,
     include_package_data=True,
-    keywords='erepublik_script',
-    name='erepublik_script',
-    packages=find_packages(include=['erepublik_script']),
+    keywords='erepublik',
+    name='eRepublik',
+    packages=find_packages(include=['erepublik']),
+    python_requires='>=3.7.*, <4',
     setup_requires=setup_requirements,
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/eeriks/erepublik_script',
-    version='0.1.2',
+    version='0.15.2',
     zip_safe=False,
 )

tests/__init__.py

@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-"""Unit test package for erepublik_script."""
+"""Unit test package for erepublik."""

tests/test_erepublik_script.py

@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-"""Tests for `erepublik_script` package."""
+"""Tests for `erepublik` package."""
 
 
 import unittest
 from click.testing import CliRunner
 
-from erepublik_script import Citizen
-from erepublik_script import cli
+from erepublik import Citizen
+from erepublik import cli
 
 
 class TestErepublik_script(unittest.TestCase):
-    """Tests for `erepublik_script` package."""
+    """Tests for `erepublik` package."""
 
     def setUp(self):
         """Set up test fixtures, if any."""
@@ -28,7 +28,7 @@ class TestErepublik_script(unittest.TestCase):
         runner = CliRunner()
         result = runner.invoke(cli.main)
         assert result.exit_code == 0
-        assert 'erepublik_script.cli.main' in result.output
+        assert 'erepublik.cli.main' in result.output
         help_result = runner.invoke(cli.main, ['--help'])
         assert help_result.exit_code == 0
         assert '--help  Show this message and exit.' in help_result.output