Skip to content

Commit 1e320a5

Browse files
committed
Add callback query handler.
1 parent 96e06c2 commit 1e320a5

2 files changed

Lines changed: 32 additions & 2 deletions

File tree

‎telebot/__init__.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def __init__(self, token, threaded=True, skip_pending=False):
6868
self.message_handlers = []
6969
self.inline_handlers = []
7070
self.chosen_inline_handlers = []
71+
self.callback_query_handlers = []
7172

7273
self.threaded = threaded
7374
if self.threaded:
@@ -124,6 +125,7 @@ def process_new_updates(self, updates):
124125
new_messages = []
125126
new_inline_querys = []
126127
new_chosen_inline_results = []
128+
new_callback_querys = []
127129
for update in updates:
128130
if update.update_id > self.last_update_id:
129131
self.last_update_id = update.update_id
@@ -133,13 +135,17 @@ def process_new_updates(self, updates):
133135
new_inline_querys.append(update.inline_query)
134136
if update.chosen_inline_result:
135137
new_chosen_inline_results.append(update.chosen_inline_result)
138+
if update.callback_query:
139+
new_callback_querys.append(update.callback_query)
136140
logger.debug('Received {0} new updates'.format(len(updates)))
137141
if len(new_messages) > 0:
138142
self.process_new_messages(new_messages)
139143
if len(new_inline_querys) > 0:
140144
self.process_new_inline_query(new_inline_querys)
141145
if len(new_chosen_inline_results) > 0:
142146
self.process_new_chosen_inline_query(new_chosen_inline_results)
147+
if len(new_callback_querys) > 0:
148+
self.process_new_callback_query(new_callback_querys)
143149

144150
def process_new_messages(self, new_messages):
145151
self._append_pre_next_step_handler()
@@ -154,6 +160,9 @@ def process_new_inline_query(self, new_inline_querys):
154160
def process_new_chosen_inline_query(self, new_chosen_inline_querys):
155161
self._notify_command_handlers(self.chosen_inline_handlers, new_chosen_inline_querys)
156162

163+
def process_new_callback_query(self, new_callback_querys):
164+
self._notify_command_handlers(self.callback_query_handlers, new_callback_querys)
165+
157166
def __notify_update(self, new_messages):
158167
for listener in self.update_listener:
159168
self.__exec_task(listener, new_messages)
@@ -652,6 +661,23 @@ def add_chosen_inline_handler(self, handler, func):
652661

653662
self.chosen_inline_handlers.append(handler_dict)
654663

664+
def callback_query_handler(self, func):
665+
def decorator(handler):
666+
self.add_callback_query_handler(handler, func)
667+
668+
return decorator
669+
670+
def add_callback_query_handler(self, handler, func):
671+
filters = {'lambda': func}
672+
673+
handler_dict = {
674+
'function': handler,
675+
'filters': filters
676+
}
677+
678+
self.callback_query_handlers.append(handler_dict)
679+
680+
655681
@staticmethod
656682
def _test_message_handler(message_handler, message):
657683
for filter, filter_value in six.iteritems(message_handler['filters']):

‎telebot/types.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,23 @@ def de_json(cls, json_type):
8686
message = None
8787
inline_query = None
8888
chosen_inline_result = None
89+
callback_query = None
8990
if 'message' in obj:
9091
message = Message.de_json(obj['message'])
9192
if 'inline_query' in obj:
9293
inline_query = InlineQuery.de_json(obj['inline_query'])
9394
if 'chosen_inline_result' in obj:
9495
chosen_inline_result = ChosenInlineResult.de_json(obj['chosen_inline_result'])
95-
return cls(update_id, message, inline_query, chosen_inline_result)
96+
if 'callback_query' in obj:
97+
callback_query = CallbackQuery.de_json(obj['callback_query'])
98+
return cls(update_id, message, inline_query, chosen_inline_result, callback_query)
9699

97-
def __init__(self, update_id, message, inline_query, chosen_inline_result):
100+
def __init__(self, update_id, message, inline_query, chosen_inline_result, callback_query):
98101
self.update_id = update_id
99102
self.message = message
100103
self.inline_query = inline_query
101104
self.chosen_inline_result = chosen_inline_result
105+
self.callback_query = callback_query
102106

103107

104108
class User(JsonDeserializable):

0 commit comments

Comments
 (0)