diff --git a/erepublik/__init__.py b/erepublik/__init__.py index 4c09eaf..1c08c80 100644 --- a/erepublik/__init__.py +++ b/erepublik/__init__.py @@ -5,7 +5,7 @@ __author__ = """Eriks Karls""" __email__ = 'eriks@72.lv' __version__ = '0.20.0' -__commit_id__ = "772c09a" +__commit_id__ = "22dc18d" from erepublik import classes, utils from erepublik.citizen import Citizen diff --git a/erepublik/citizen.py b/erepublik/citizen.py index 748e4e4..a267470 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -42,7 +42,7 @@ class BaseCitizen(CitizenAPI): logged_in: bool = False commit_id: str = "" - def __init__(self): + def __init__(self, email: str = "", password: str = ""): super().__init__() self.commit_id = utils.COMMIT_ID self.config = Config() @@ -54,6 +54,9 @@ class BaseCitizen(CitizenAPI): self.stop_threads = Event() self.telegram = TelegramBot(stop_event=self.stop_threads) + self.config.email = email + self.config.password = password + def get_csrf_token(self): """ get_csrf_token is the function which logs you in, and updates csrf tokens @@ -359,54 +362,6 @@ class BaseCitizen(CitizenAPI): self.food["total"] = sum([self.food[q] * utils.FOOD_ENERGY[q] for q in utils.FOOD_ENERGY]) return inventory - def _check_response_for_medals(self, html: str): - new_medals = re.findall(r'(
Congratulations, you have reached experience level (\d+)
", html) - if levelup: - level = levelup.group(1) - msg = f"Level up! Current level {level}" - self.write_log(msg) - if self.config.telegram: - self.telegram.report_medal(f"Level *{level}*") - self.reporter.report_action("LEVEL_UP", value=level) - def write_log(self, *args, **kwargs): if self.config.interactive: utils.write_interactive_log(*args, **kwargs) @@ -561,6 +516,54 @@ class BaseCitizen(CitizenAPI): """ return utils.now() + def _check_response_for_medals(self, html: str): + new_medals = re.findall(r'(Congratulations, you have reached experience level (\d+)
", html) + if levelup: + level = levelup.group(1) + msg = f"Level up! Current level {level}" + self.write_log(msg) + if self.config.telegram: + self.telegram.report_medal(f"Level *{level}*") + self.reporter.report_action("LEVEL_UP", value=level) + def _travel(self, country_id: int, region_id: int = 0) -> Response: data = { "toCountryId": country_id,