ryg/royalnet
ryg/royalnet
1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-23 19:44:20 +00:00
Code Activity

Fix diario text bug

Browse source
This commit is contained in:
Steffo 2019-02-09 19:57:49 +01:00
parent 7613e368dc
commit 11b119b08e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
strings.py
View file

@ -7,10 +7,13 @@ class SafeDict(dict):
return key return key
def safely_format_string(string: str, words: typing.Dict[str, str]) -> str: def safely_format_string(string: str, words: typing.Dict[str, str], ignore_escaping=False) -> str:
escaped = {} if ignore_escaping:
for key in words: escaped = words
escaped[key] = words[key].replace("<", "&lt;").replace(">", "&gt;") else:
escaped = {}
for key in words:
escaped[key] = words[key].replace("<", "&lt;").replace(">", "&gt;")
return string.format_map(SafeDict(**escaped)) return string.format_map(SafeDict(**escaped))

3
telegrambot.py
View file

@ -53,8 +53,7 @@ sentry = raven.Client(config["Sentry"]["token"],
def reply_msg(bot: telegram.Bot, chat_id: int, string: str, ignore_escaping=False, **kwargs) -> telegram.Message: def reply_msg(bot: telegram.Bot, chat_id: int, string: str, ignore_escaping=False, **kwargs) -> telegram.Message:
if not ignore_escaping: string = strings.safely_format_string(string, ignore_escaping=ignore_escaping, words=kwargs)
string = strings.safely_format_string(string, words=kwargs)
return bot.send_message(chat_id, string, return bot.send_message(chat_id, string,
parse_mode="HTML", parse_mode="HTML",
disable_web_page_preview=True) disable_web_page_preview=True)