alihan/pyTelegramBotAPI
1
0
Fork 0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2021-05-13 03:08:02 +03:00
Code Issues Projects Releases Wiki Activity

Created _make_request and removed check_result in apihelper.py for efficiency and consistency improvements.

Browse Source 
Created JsonSerializable (previously Jsonable) and JsonDeserializable.
All relevant classes now subclass JsonDeserializable to eliminate unneeded json -> string -> json conversions.
This commit is contained in:
pieter
2015-07-01 22:16:13 +02:00
parent b4dc441ffd
commit a03769adde
3 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telebot/__init__.py
View File

@@ -42,13 +42,12 @@ class TeleBot:
self.last_update_id = 0
def get_update(self):
result = apihelper.get_updates(self.token, offset=(self.last_update_id + 1))
updates = result['result']
updates = apihelper.get_updates(self.token, offset=(self.last_update_id + 1))
new_messages = []
for update in updates:
if update['update_id'] > self.last_update_id:
self.last_update_id = update['update_id']
msg = types.Message.de_json(json.dumps(update['message']))
msg = types.Message.de_json(update['message'])
new_messages.append(msg)
if len(new_messages) > 0:
@@ -93,7 +92,7 @@ class TeleBot:
def get_me(self):
result = apihelper.get_me(self.token)
return types.User.de_json(json.dumps(result['result']))
return types.User.de_json(result)
def get_user_profile_photos(self, user_id, offset=None, limit=None):
"""
@@ -105,7 +104,7 @@ class TeleBot:
:return:
"""
result = apihelper.get_user_profile_photos(self.token, user_id, offset, limit)
return types.UserProfilePhotos.de_json(json.dumps(result['result']))
return types.UserProfilePhotos.de_json(result)
def send_message(self, chat_id, text, disable_web_page_preview=None, reply_to_message_id=None, reply_markup=None):
"""