mirror/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00
Code Releases Activity

Merge branch 'Kondra007-patch-3' into feature-changes20160522

Browse Source
This commit is contained in:
eternnoir 2016-05-23 11:05:14 +08:00
commit f9c7497c5c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
telebot/types.py
View File

@ -86,22 +86,26 @@ class Update(JsonDeserializable):
obj = cls.check_json(json_type) obj = cls.check_json(json_type)
update_id = obj['update_id'] update_id = obj['update_id']
message = None message = None
edited_message = None
inline_query = None inline_query = None
chosen_inline_result = None chosen_inline_result = None
callback_query = None callback_query = None
if 'message' in obj: if 'message' in obj:
message = Message.de_json(obj['message']) message = Message.de_json(obj['message'])
if 'edited_message' in obj:
edited_message = Message.de_json(obj['edited_message'])
if 'inline_query' in obj: if 'inline_query' in obj:
inline_query = InlineQuery.de_json(obj['inline_query']) inline_query = InlineQuery.de_json(obj['inline_query'])
if 'chosen_inline_result' in obj: if 'chosen_inline_result' in obj:
chosen_inline_result = ChosenInlineResult.de_json(obj['chosen_inline_result']) chosen_inline_result = ChosenInlineResult.de_json(obj['chosen_inline_result'])
if 'callback_query' in obj: if 'callback_query' in obj:
callback_query = CallbackQuery.de_json(obj['callback_query']) callback_query = CallbackQuery.de_json(obj['callback_query'])
return cls(update_id, message, inline_query, chosen_inline_result, callback_query) return cls(update_id, message, edited_message, inline_query, chosen_inline_result, callback_query)
def __init__(self, update_id, message, inline_query, chosen_inline_result, callback_query): def __init__(self, update_id, message, edited_message, inline_query, chosen_inline_result, callback_query):
self.update_id = update_id self.update_id = update_id
self.message = message self.message = message
self.edited_message = edited_message
self.inline_query = inline_query self.inline_query = inline_query
self.chosen_inline_result = chosen_inline_result self.chosen_inline_result = chosen_inline_result
self.callback_query = callback_query self.callback_query = callback_query