Skip to content

Commit 7fd7ea7

Browse files
committed
Changed apihelper
1 parent b8770e2 commit 7fd7ea7

2 files changed

Lines changed: 165 additions & 4 deletions

File tree

‎telebot/apihelper.py‎

Lines changed: 158 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,168 @@
55
from telebot import types
66
from telebot import util
77

8+
merge = util.merge_dicts
89
logger = telebot.logger
910

1011
API_URL = "https://api.telegram.org/bot{0}/{1}"
1112
FILE_URL = "https://api.telegram.org/file/bot{0}/{1}"
1213

13-
CONNECT_TIMEOUT = 3.5
14-
READ_TIMEOUT = 9999
15-
14+
# CONNECT_TIMEOUT = 3.5
15+
# READ_TIMEOUT = 9999
16+
17+
18+
class RequestExecutorImpl:
19+
DEFAULT_CONNECT_TIMEOUT = 3.5
20+
DEFAULT_READ_TIMEOUT = 9999
21+
22+
def __init__(self, connect_timeout=DEFAULT_CONNECT_TIMEOUT, read_timeout=DEFAULT_READ_TIMEOUT):
23+
self.timeouts = (connect_timeout, read_timeout)
24+
25+
def make_request(self, url, method='get', params=None, files=None):
26+
logger.debug("{} {} params={} files={}".format(method.upper(), url, params, files))
27+
response = requests.request(method, url, params=params, files=files, timeout=self.timeouts)
28+
logger.debug("Server: '{0}'".format(response.text.encode('utf8')))
29+
if response.status_code != 200:
30+
msg = 'The server returned HTTP {0} {1}. Response body:\n[{2}]' \
31+
.format(response.status_code, response.reason, response.text.encode('utf8'))
32+
raise ApiException(msg)
33+
return response
34+
35+
36+
class ApiInterface:
37+
38+
def __init__(self, token, request_executor, api_url=API_URL, file_url=FILE_URL):
39+
self.token = token
40+
self.request_executor = request_executor
41+
self.api_url = api_url
42+
self.file_url = file_url
43+
44+
def make_request(self, method_name, params=None, files=None, method='get'):
45+
request_url = self.api_url.format(self.token, method_name)
46+
response = self.request_executor.make_request(request_url, method, params, files)
47+
return response
48+
49+
def get_me(self):
50+
return self.make_request('getMe')
51+
52+
def get_file(self, file_id):
53+
return self.make_request('getFile', params={'file_id': file_id})
54+
55+
def download_file(self, file_path):
56+
url = self.file_url.format(self.token, file_path)
57+
result = self.request_executor.make_request(url)
58+
return result.content
59+
60+
def send_message(self, chat_id, text, **kwargs):
61+
payload = {'chat_id': str(chat_id), 'text': text}
62+
return self.make_request('sendMessage', merge(payload, kwargs), method='post')
63+
64+
def set_webhook(self, url="", certificate=None):
65+
files = None
66+
if certificate is not None:
67+
files = {'certificate': certificate}
68+
return self.make_request('setWebhook', params={'url': url}, files=files)
69+
70+
def get_updates(self, **kwargs):
71+
return self.make_request('getUpdates', params=kwargs)
72+
73+
def get_user_profile_photos(self, user_id, **kwargs):
74+
params = merge({'user_id': user_id}, kwargs)
75+
return self.make_request('getUserProfilePhotos', params=params)
76+
77+
def forward_message(self, chat_id, from_chat_id, message_id, **kwargs):
78+
params = merge({
79+
'chat_id': chat_id,
80+
'from_chat_id': from_chat_id,
81+
'message_id': message_id
82+
}, kwargs)
83+
return self.make_request('forwardMessage', params=params)
84+
85+
def send_photo(self, chat_id, photo, **kwargs):
86+
params = {'chat_id': chat_id}
87+
files = None
88+
if util.is_string(photo):
89+
files = {'photo': photo}
90+
else:
91+
params['photo'] = photo
92+
params = merge(params, kwargs)
93+
return self.make_request('sendPhoto', params=params, files=files)
94+
95+
def send_location(self, chat_id, latitude, longitude, **kwargs):
96+
params = merge({'chat_id': chat_id, 'latitude': latitude, 'longitude': longitude}, kwargs)
97+
return self.make_request('sendLocation', params=params)
98+
99+
def send_venue(self, chat_id, latitude, longitude, title, address, **kwargs):
100+
params = {'chat_id': chat_id, 'latitude': latitude, 'longitude': longitude, 'title': title, 'address': address}
101+
params.update(kwargs)
102+
return self.make_request('sendVenue', params=params)
103+
104+
def send_contact(self, chat_id, phone_number, first_name, **kwargs):
105+
params = merge({'chat_id': chat_id, 'phone_number': phone_number, 'first_name': first_name}, kwargs)
106+
return self.make_request('sendContact', params=params)
107+
108+
def send_chat_action(self, chat_id, action):
109+
return self.make_request('sendChatAction', params={'chat_id': chat_id, 'action': action})
110+
111+
def send_video(self, chat_id, video, **kwargs):
112+
return self.send_data('video', chat_id, video, **kwargs)
113+
114+
def send_voice(self, chat_id, voice, **kwargs):
115+
return self.send_data('voice', chat_id, voice, **kwargs)
116+
117+
def send_audio(self, chat_id, audio, **kwargs):
118+
return self.send_data('audio', chat_id, audio, **kwargs)
119+
120+
def send_sticker(self, chat_id, sticker, **kwargs):
121+
return self.send_data('sticker', chat_id, sticker, **kwargs)
122+
123+
def send_document(self, chat_id, document, **kwargs):
124+
return self.send_data('document', chat_id, document, **kwargs)
125+
126+
def send_data(self, data_type, chat_id, data, **kwargs):
127+
params = {'chat_id': chat_id}
128+
files = None
129+
if not util.is_string(data):
130+
files = {data_type: data}
131+
else:
132+
params[data_type] = data
133+
params = merge(params, kwargs)
134+
return self.make_request(self.get_method_by_type(data_type), params=params, files=files, method='post')
135+
136+
@staticmethod
137+
def get_method_by_type(data_type):
138+
return {
139+
'document': 'sendDocument',
140+
'sticker': 'sendSticker',
141+
'video': 'sendVideo',
142+
'voice': 'sendVoice',
143+
'audio': 'sendAudio'
144+
}[data_type]
145+
146+
def kick_chat_member(self, chat_id, user_id):
147+
return self.make_request('kickChatMember', params={'chat_id': chat_id, 'user_id': user_id}, method='post')
148+
149+
def unban_chat_member(self, chat_id, user_id):
150+
return self.make_request('unbanChatMember', params={'chat_id': chat_id, 'user_id': user_id}, method='post')
151+
152+
def edit_message_text(self, text, **kwargs):
153+
params = merge({'text': text}, kwargs)
154+
return self.make_request('editMessageText', params=params)
155+
156+
def edit_message_caption(self, caption, **kwargs):
157+
params = merge({'caption': caption}, kwargs)
158+
return self.make_request('editMessageCaption', params=params)
159+
160+
def edit_message_reply_markup(self, **kwargs):
161+
return self.make_request('editMessageReplyMarkup', params=kwargs)
162+
163+
def answer_callback_query(self, callback_query_id, **kwargs):
164+
params = merge({'callback_query_id': callback_query_id}, kwargs)
165+
return self.make_request('answerCallbackQuery', params=params)
166+
167+
def answer_inline_query(self, inline_query_id, results):
168+
params = merge({'inline_query_id': inline_query_id, 'results': results})
169+
return self.make_request('answerInlineQuery', params=params, method='post')
16170

17171
def _make_request(token, method_name, method='get', params=None, files=None, base_url=API_URL):
18172
"""
@@ -428,7 +582,7 @@ class ApiException(Exception):
428582
failed.
429583
"""
430584

431-
def __init__(self, msg, function_name, result):
585+
def __init__(self, msg, function_name=None, result=None):
432586
super(ApiException, self).__init__("A request to the Telegram API was unsuccessful. {0}".format(msg))
433587
self.function_name = function_name
434588
self.result = result

‎telebot/util.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,10 @@ def extract_arguments(text):
241241
regexp = re.compile("\/\w*(@\w*)*\s*([\s\S]*)",re.IGNORECASE)
242242
result = regexp.match(text)
243243
return result.group(2) if is_command(text) else None
244+
245+
246+
def merge_dicts(*dicts):
247+
result = {}
248+
for dictionary in dicts:
249+
result.update(dictionary)
250+
return result

0 commit comments

Comments
 (0)