Davte/davtelepot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chosen_inline_result handler refactored

Browse Source
This commit is contained in:
Davte 2019-07-16 16:40:59 +02:00
parent 7e461be1bd
commit 434d09c317
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
davtelepot/bot.py
View File

@ -489,33 +489,32 @@ class Bot(TelegramBot, ObjectWithDatabase):
async def chosen_inline_result_handler(self, update, user_record): async def chosen_inline_result_handler(self, update, user_record):
"""Handle Telegram `chosen_inline_result` update.""" """Handle Telegram `chosen_inline_result` update."""
user_id = update['from']['id'] if user_record is not None:
user_id = user_record['telegram_id']
else:
user_id = update['from']['id']
if user_id in self.chosen_inline_result_handlers: if user_id in self.chosen_inline_result_handlers:
result_id = update['result_id'] result_id = update['result_id']
handlers = self.chosen_inline_result_handlers[user_id] handlers = self.chosen_inline_result_handlers[user_id]
if result_id in handlers: if result_id in handlers:
func = handlers[result_id] await handlers[result_id](update)
if asyncio.iscoroutinefunction(func):
await func(update)
else:
func(update)
return return
def set_inline_result_handler(self, user_id, result_id, func): def set_chosen_inline_result_handler(self, user_id, result_id, handler):
"""Associate a func to a result_id. """Associate a `handler` to a `result_id` for `user_id`.
When an inline result is chosen having that id, function will When an inline result is chosen having that id, `handler` will
be passed the update as argument. be called and passed the update as argument.
""" """
if type(user_id) is dict: if type(user_id) is dict:
user_id = user_id['from']['id'] user_id = user_id['from']['id']
assert type(user_id) is int, "user_id must be int!" assert type(user_id) is int, "user_id must be int!"
# Query result ids are parsed as str by telegram # Query result ids are parsed as str by telegram
result_id = str(result_id) result_id = str(result_id)
assert callable(func), "func must be a callable" assert callable(handler), "Handler must be callable"
if user_id not in self.chosen_inline_result_handlers: if user_id not in self.chosen_inline_result_handlers:
self.chosen_inline_result_handlers[user_id] = {} self.chosen_inline_result_handlers[user_id] = {}
self.chosen_inline_result_handlers[user_id][result_id] = func self.chosen_inline_result_handlers[user_id][result_id] = handler
return return
async def callback_query_handler(self, update, user_record): async def callback_query_handler(self, update, user_record):