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 'sgomez-fix-video-type' into develop

Browse Source
This commit is contained in:
eternnoir 2015-07-26 20:15:57 +08:00
commit 9219404a9a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
telebot/types.py
View File

@ -162,6 +162,8 @@ class Message(JsonDeserializable):
if 'group_chat_created' in obj:
opts['group_chat_created'] = obj['group_chat_created']
content_type = 'group_chat_created'
if 'caption' in obj:
opts['caption'] = obj['caption']
return Message(message_id, from_user, date, chat, content_type, opts)
@classmethod
@ -285,19 +287,18 @@ class Video(JsonDeserializable):
width = obj['width']
height = obj['height']
duration = obj['duration']
thumb = PhotoSize.de_json(obj['thumb'])
caption = None
thumb = None
mime_type = None
file_size = None
if 'caption' in obj:
caption = obj['caption']
if 'mine_type' in obj:
if 'thumb' in obj:
thumb = PhotoSize.de_json(obj['thumb'])
if 'mime_type' in obj:
mime_type = obj['mime_type']
if 'file_size' in obj:
file_size = obj['file_size']
return Video(file_id, width, height, duration, thumb, mime_type, file_size, caption)
return Video(file_id, width, height, duration, thumb, mime_type, file_size)
def __init__(self, file_id, width, height, duration, thumb, mime_type=None, file_size=None, caption=None):
def __init__(self, file_id, width, height, duration, thumb=None, mime_type=None, file_size=None):
self.file_id = file_id
self.width = width
self.height = height
@ -305,7 +306,6 @@ class Video(JsonDeserializable):
self.thumb = thumb
self.mime_type = mime_type
self.file_size = file_size
self.caption = caption
class Contact(JsonDeserializable):