ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-30 15:04:18 +00:00
Code Activity

Fix diario bug

Browse source
This commit is contained in:
Steffo 2019-02-09 02:29:32 +01:00
parent 7f5b346f79
commit ec35e63f4f
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
telegrambot.py
View file

@ -52,16 +52,18 @@ sentry = raven.Client(config["Sentry"]["token"],
hook_libraries=[]) hook_libraries=[])
def reply_msg(bot: telegram.Bot, chat_id: int, string: str, **kwargs) -> telegram.Message: def reply_msg(bot: telegram.Bot, chat_id: int, string: str, ignore_escaping=False, **kwargs) -> telegram.Message:
return bot.send_message(chat_id, strings.safely_format_string(string, words=kwargs), if not ignore_escaping:
string = strings.safely_format_string(string, words=kwargs)
return bot.send_message(chat_id, string,
parse_mode="HTML", parse_mode="HTML",
disable_web_page_preview=True) disable_web_page_preview=True)
def reply(bot: telegram.Bot, update: telegram.Update, string: str, **kwargs) -> telegram.Message: def reply(bot: telegram.Bot, update: telegram.Update, string: str, ignore_escaping=False, **kwargs) -> telegram.Message:
while True: while True:
try: try:
return reply_msg(bot, update.message.chat.id, string, **kwargs) return reply_msg(bot, update.message.chat.id, string, ignore_escaping=ignore_escaping, **kwargs)
except Unauthorized: except Unauthorized:
if update.message.chat.type == telegram.Chat.PRIVATE: if update.message.chat.type == telegram.Chat.PRIVATE:
return reply_msg(bot, main_group_id, strings.TELEGRAM.ERRORS.UNAUTHORIZED_USER, return reply_msg(bot, main_group_id, strings.TELEGRAM.ERRORS.UNAUTHORIZED_USER,
@ -256,11 +258,10 @@ def cmd_diario(bot: telegram.Bot, update: telegram.Update):
return return
diario = db.Diario(timestamp=datetime.datetime.now(), diario = db.Diario(timestamp=datetime.datetime.now(),
saver=saver, saver=saver,
author=author,
text=text) text=text)
session.add(diario) session.add(diario)
session.commit() session.commit()
reply(bot, update, strings.DIARIO.SUCCESS, diario=diario.to_telegram()) reply(bot, update, strings.DIARIO.SUCCESS, ignore_escaping=True, diario=diario.to_telegram())
except Exception: except Exception:
raise raise
finally: finally: