diff --git a/erepublik/citizen.py b/erepublik/citizen.py index a12f620..9f1652c 100644 --- a/erepublik/citizen.py +++ b/erepublik/citizen.py @@ -71,13 +71,13 @@ class Citizen(classes.CitizenAPI): def login(self): self.get_csrf_token() - self.telegram.send_message("*Started* {:%F %T}".format(utils.now())) self.update_citizen_info() self.reporter.do_init(self.name, self.config.email, self.details.citizen_id) 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) + self.telegram.send_message("*Started* {:%F %T}".format(utils.now())) self.__last_full_update = utils.good_timedelta(self.now, - datetime.timedelta(minutes=5)) def write_log(self, *args, **kwargs): diff --git a/erepublik/classes.py b/erepublik/classes.py index c980068..1a46c62 100644 --- a/erepublik/classes.py +++ b/erepublik/classes.py @@ -1162,12 +1162,12 @@ class TelegramBot: self.send_message("\n\n––––––––––––––––––––––\n\n".join(self.__queue)) def send_message(self, message: str) -> bool: - if self.player_name: - message = f"Player *{self.player_name}*\n" + message - response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown")) if not self.__initialized: self.__queue.append(message) return True + if self.player_name: + message = f"Player *{self.player_name}*\n" + message + response = post(self.api_url, json=dict(chat_id=self.chat_id, text=message, parse_mode="Markdown")) return response.json().get('ok') def report_free_bhs(self, battles: List[Tuple[int, int, int, int, datetime.timedelta]]):