From 3a7dd9a6faf702177a4537e1b953381320d75f6e Mon Sep 17 00:00:00 2001 From: Eriks Karls Date: Fri, 27 Sep 2019 11:02:26 +0300 Subject: [PATCH] Init update --- erepublik/citizen.py | 10 +++++----- erepublik/classes.py | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/erepublik/citizen.py b/erepublik/citizen.py index dd11cf9..94cea09 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -51,7 +51,7 @@ class Citizen(classes.CitizenAPI): logged_in = False telegram = None - def __init__(self, email: str = "", password: str = "", auto_login: bool = True, telegram: Dict[str, Union[str, int]] = None): + def __init__(self, email: str = "", password: str = "", auto_login: bool = True): super().__init__() self.commit_id = utils.COMMIT_ID self.config = classes.Config() @@ -67,10 +67,10 @@ class Citizen(classes.CitizenAPI): self.stop_threads = threading.Event() if auto_login: self.login() - if telegram is None: - self.telegram.do_init(620981703, "864251270:AAFzZZdjspI-kIgJVk4gF3TViGFoHnf8H4o", self.name) - else: - self.telegram.do_init(telegram['chat_id'], telegram['token']) + if self.config.telegram: + self.telegram.do_init(self.config.telegram_chat_id or 620981703, + self.config.telegram_token or "864251270:AAFzZZdjspI-kIgJVk4gF3TViGFoHnf8H4o", + "" if self.config.telegram_chat_id or self.config.telegram_token else self.name) def login(self, telegram: Dict[str, Union[str, int]] = None): self.get_csrf_token() diff --git a/erepublik/classes.py b/erepublik/classes.py index 67c0888..c980068 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -291,6 +291,9 @@ class Config: force_wam = False sort_battles_time = True force_travel = False + telegram = True + telegram_chat_id = 0 + telegram_token = "" @property def wt(self):