eriks/erepublik-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misplaced telegram queueing

Browse Source
This commit is contained in:
Eriks Karls 2019-09-27 11:11:18 +03:00
parent 2aaa4aad65
commit 3f1b0018b2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erepublik/citizen.py
View File

@ -71,13 +71,13 @@ class Citizen(classes.CitizenAPI):
def login(self): def login(self):
self.get_csrf_token() self.get_csrf_token()
self.telegram.send_message("*Started* {:%F %T}".format(utils.now()))
self.update_citizen_info() self.update_citizen_info()
self.reporter.do_init(self.name, self.config.email, self.details.citizen_id) self.reporter.do_init(self.name, self.config.email, self.details.citizen_id)
if self.config.telegram: if self.config.telegram:
self.telegram.do_init(self.config.telegram_chat_id or 620981703, self.telegram.do_init(self.config.telegram_chat_id or 620981703,
self.config.telegram_token or "864251270:AAFzZZdjspI-kIgJVk4gF3TViGFoHnf8H4o", self.config.telegram_token or "864251270:AAFzZZdjspI-kIgJVk4gF3TViGFoHnf8H4o",
"" if self.config.telegram_chat_id or self.config.telegram_token else self.name) "" 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)) self.__last_full_update = utils.good_timedelta(self.now, - datetime.timedelta(minutes=5))
def write_log(self, *args, **kwargs): def write_log(self, *args, **kwargs):

6
erepublik/classes.py
View File

@ -1162,12 +1162,12 @@ class TelegramBot:
self.send_message("\n\n––––––––––––––––––––––\n\n".join(self.__queue)) self.send_message("\n\n––––––––––––––––––––––\n\n".join(self.__queue))
def send_message(self, message: str) -> bool: 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: if not self.__initialized:
self.__queue.append(message) self.__queue.append(message)
return True 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') return response.json().get('ok')
def report_free_bhs(self, battles: List[Tuple[int, int, int, int, datetime.timedelta]]): def report_free_bhs(self, battles: List[Tuple[int, int, int, int, datetime.timedelta]]):