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

Almost done.

Browse Source
This commit is contained in:
eternnoir 2016-01-05 14:07:47 +08:00
parent c706a7aba3
commit 94f1bbd402
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
telebot/__init__.py
View File

@ -415,6 +415,9 @@ class TeleBot:
""" """
return self.send_message(message.chat.id, text, reply_to_message_id=message.message_id, **kwargs) return self.send_message(message.chat.id, text, reply_to_message_id=message.message_id, **kwargs)
def answer_inline_query(self, inline_query_id, results, cache_time=None, is_personal=None, next_offset=None):
return apihelper.answer_inline_query(self.token, inline_query_id, results, cache_time, is_personal, next_offset)
def register_for_reply(self, message, callback): def register_for_reply(self, message, callback):
""" """
Registers a callback function to be notified when a reply to `message` arrives. Registers a callback function to be notified when a reply to `message` arrives.

31
telebot/apihelper.py
View File

@ -42,19 +42,19 @@ def _check_result(method_name, result):
:return: The result parsed to a JSON dictionary. :return: The result parsed to a JSON dictionary.
""" """
if result.status_code != 200: if result.status_code != 200:
msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]'\ msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
.format(result.status_code, result.reason, result.text.encode('utf8')) .format(result.status_code, result.reason, result.text.encode('utf8'))
raise ApiException(msg, method_name, result) raise ApiException(msg, method_name, result)
try: try:
result_json = result.json() result_json = result.json()
except: except:
msg = 'The server returned an invalid JSON response. Response body:\n[{0}]'\ msg = 'The server returned an invalid JSON response. Response body:\n[{0}]' \
.format(result.text.encode('utf8')) .format(result.text.encode('utf8'))
raise ApiException(msg, method_name, result) raise ApiException(msg, method_name, result)
if not result_json['ok']: if not result_json['ok']:
msg = 'Error code: {0} Description: {1}'\ msg = 'Error code: {0} Description: {1}' \
.format(result_json['error_code'], result_json['description']) .format(result_json['error_code'], result_json['description'])
raise ApiException(msg, method_name, result) raise ApiException(msg, method_name, result)
return result_json return result_json
@ -74,7 +74,7 @@ def download_file(token, file_path):
url = FILE_URL.format(token, file_path) url = FILE_URL.format(token, file_path)
result = requests.get(url) result = requests.get(url)
if result.status_code != 200: if result.status_code != 200:
msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]'\ msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
.format(result.status_code, result.reason, result.text) .format(result.status_code, result.reason, result.text)
raise ApiException(msg, 'Download file', result) raise ApiException(msg, 'Download file', result)
return result.content return result.content
@ -258,11 +258,34 @@ def get_method_by_type(data_type):
return r'sendSticker' return r'sendSticker'
def answer_inline_query(token, inline_query_id, results, cache_time=None, is_personal=None, next_offset=None):
method_url = 'answerInlineQuery'
payload = {'inline_query_id': inline_query_id, 'results': _convert_inline_results(results)}
if cache_time:
payload['cache_time'] = cache_time
if is_personal:
payload['is_personal'] = is_personal
if next_offset:
payload['next_offset'] = next_offset
return _make_request(token, method_url, params=payload)
def _convert_inline_results(results):
ret = ''
for r in results:
if isinstance(r, types.JsonSerializable):
ret = ret + r.to_json() + ','
if len(ret) > 0:
ret = ret[:-1]
return '[' + ret + ']'
def _convert_markup(markup): def _convert_markup(markup):
if isinstance(markup, types.JsonSerializable): if isinstance(markup, types.JsonSerializable):
return markup.to_json() return markup.to_json()
return markup return markup
class ApiException(Exception): class ApiException(Exception):
""" """
This class represents an Exception thrown when a call to the Telegram API fails. This class represents an Exception thrown when a call to the Telegram API fails.