X Tutup
Skip to content

Commit acda19b

Browse files
jsmnbomjsmnbom
committed
Merge branch 'may18minor' into beta
2 parents 48fa3d9 + 5a15d1b commit acda19b

File tree

6 files changed

+40
-0
lines changed

6 files changed

+40
-0
lines changed

‎telegram/inlinequeryresultgif.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class InlineQueryResultGif(InlineQueryResult):
3232
thumb_url (str): URL of the static thumbnail for the result (jpeg or gif).
3333
gif_width (Optional[int]): Width of the GIF.
3434
gif_height (Optional[int]): Height of the GIF.
35+
gif_duration (Optional[int]): Duration of the GIF.
3536
title (Optional[str]): Title for the result.
3637
caption (Optional[str]): Caption of the GIF file to be sent, 0-200 characters.
3738
reply_markup (Optional[:class:`telegram.InlineKeyboardMarkup`]): Inline keyboard attached
@@ -45,6 +46,7 @@ class InlineQueryResultGif(InlineQueryResult):
4546
thumb_url (str):
4647
gif_width (Optional[int]):
4748
gif_height (Optional[int]):
49+
gif_duration (Optional[int]):
4850
title (Optional[str]):
4951
caption (Optional[str]):
5052
reply_markup (Optional[:class:`telegram.InlineKeyboardMarkup`]):
@@ -59,6 +61,7 @@ def __init__(self,
5961
thumb_url,
6062
gif_width=None,
6163
gif_height=None,
64+
gif_duration=None,
6265
title=None,
6366
caption=None,
6467
reply_markup=None,
@@ -75,6 +78,8 @@ def __init__(self,
7578
self.gif_width = gif_width
7679
if gif_height:
7780
self.gif_height = gif_height
81+
if gif_duration:
82+
self.gif_duration = gif_duration
7883
if title:
7984
self.title = title
8085
if caption:

‎telegram/inlinequeryresultmpeg4gif.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
3232
thumb_url (str): URL of the static thumbnail (jpeg or gif) for the result.
3333
mpeg4_width (Optional[int]): Video width.
3434
mpeg4_height (Optional[int]): Video height.
35+
mpeg4_duration (Optional[int]): Video duration
3536
title (Optional[str]): Title for the result.
3637
caption (Optional[str]): Caption of the MPEG-4 file to be sent, 0-200 characters.
3738
reply_markup (Optional[:class:`telegram.InlineKeyboardMarkup`]): Inline keyboard attached
@@ -44,6 +45,7 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
4445
thumb_url (str): URL of the static thumbnail (jpeg or gif) for the result.
4546
mpeg4_width (Optional[int]): Video width.
4647
mpeg4_height (Optional[int]): Video height.
48+
mpeg4_duration (Optional[int]): Video duration
4749
title (Optional[str]): Title for the result.
4850
caption (Optional[str]): Caption of the MPEG-4 file to be sent, 0-200 characters.
4951
reply_markup (Optional[:class:`telegram.InlineKeyboardMarkup`]): Inline keyboard attached
@@ -60,6 +62,7 @@ def __init__(self,
6062
thumb_url,
6163
mpeg4_width=None,
6264
mpeg4_height=None,
65+
mpeg4_duration=None,
6366
title=None,
6467
caption=None,
6568
reply_markup=None,
@@ -76,6 +79,8 @@ def __init__(self,
7679
self.mpeg4_width = mpeg4_width
7780
if mpeg4_height:
7881
self.mpeg4_height = mpeg4_height
82+
if mpeg4_duration:
83+
self.mpeg4_duration = mpeg4_duration
7984
if title:
8085
self.title = title
8186
if caption:

‎telegram/message.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ def __init__(self,
132132
location=None,
133133
venue=None,
134134
new_chat_member=None,
135+
new_chat_members=None,
135136
left_chat_member=None,
136137
new_chat_title=None,
137138
new_chat_photo=None,
@@ -173,6 +174,7 @@ def __init__(self,
173174
self.location = location
174175
self.venue = venue
175176
self.new_chat_member = new_chat_member
177+
self.new_chat_members = new_chat_members
176178
self.left_chat_member = left_chat_member
177179
self.new_chat_title = new_chat_title
178180
self.new_chat_photo = new_chat_photo
@@ -232,6 +234,7 @@ def de_json(data, bot):
232234
data['location'] = Location.de_json(data.get('location'), bot)
233235
data['venue'] = Venue.de_json(data.get('venue'), bot)
234236
data['new_chat_member'] = User.de_json(data.get('new_chat_member'), bot)
237+
data['new_chat_members'] = User.de_list(data.get('new_chat_members'), bot)
235238
data['left_chat_member'] = User.de_json(data.get('left_chat_member'), bot)
236239
data['new_chat_photo'] = PhotoSize.de_list(data.get('new_chat_photo'), bot)
237240
data['pinned_message'] = Message.de_json(data.get('pinned_message'), bot)
@@ -267,6 +270,8 @@ def to_dict(self):
267270
data['entities'] = [e.to_dict() for e in self.entities]
268271
if self.new_chat_photo:
269272
data['new_chat_photo'] = [p.to_dict() for p in self.new_chat_photo]
273+
if self.new_chat_members:
274+
data['new_chat_members'] = [u.to_dict() for u in self.new_chat_members]
270275

271276
return data
272277

‎telegram/user.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,22 @@ def get_profile_photos(self, *args, **kwargs):
9999
Shortcut for ``bot.getUserProfilePhotos(update.message.from_user.id, *args, **kwargs)``
100100
"""
101101
return self.bot.getUserProfilePhotos(self.id, *args, **kwargs)
102+
103+
@staticmethod
104+
def de_list(data, bot):
105+
"""
106+
Args:
107+
data (list):
108+
bot (telegram.Bot):
109+
110+
Returns:
111+
List<telegram.User>:
112+
"""
113+
if not data:
114+
return []
115+
116+
users = list()
117+
for user in data:
118+
users.append(User.de_json(user, bot))
119+
120+
return users

‎tests/test_inlinequeryresultgif.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def setUp(self):
3737
self.gif_url = 'gif url'
3838
self.gif_width = 10
3939
self.gif_height = 15
40+
self.gif_duration = 1
4041
self.thumb_url = 'thumb url'
4142
self.title = 'title'
4243
self.caption = 'caption'
@@ -50,6 +51,7 @@ def setUp(self):
5051
'gif_url': self.gif_url,
5152
'gif_width': self.gif_width,
5253
'gif_height': self.gif_height,
54+
'gif_duration': self.gif_duration,
5355
'thumb_url': self.thumb_url,
5456
'title': self.title,
5557
'caption': self.caption,
@@ -65,6 +67,7 @@ def test_gif_de_json(self):
6567
self.assertEqual(gif.gif_url, self.gif_url)
6668
self.assertEqual(gif.gif_width, self.gif_width)
6769
self.assertEqual(gif.gif_height, self.gif_height)
70+
self.assertEqual(gif.gif_duration, self.gif_duration)
6871
self.assertEqual(gif.thumb_url, self.thumb_url)
6972
self.assertEqual(gif.title, self.title)
7073
self.assertEqual(gif.caption, self.caption)

‎tests/test_inlinequeryresultmpeg4gif.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ def setUp(self):
3737
self.mpeg4_url = 'mpeg4 url'
3838
self.mpeg4_width = 10
3939
self.mpeg4_height = 15
40+
self.mpeg4_duration = 1
4041
self.thumb_url = 'thumb url'
4142
self.title = 'title'
4243
self.caption = 'caption'
@@ -50,6 +51,7 @@ def setUp(self):
5051
'mpeg4_url': self.mpeg4_url,
5152
'mpeg4_width': self.mpeg4_width,
5253
'mpeg4_height': self.mpeg4_height,
54+
'mpeg4_duration': self.mpeg4_duration,
5355
'thumb_url': self.thumb_url,
5456
'title': self.title,
5557
'caption': self.caption,
@@ -65,6 +67,7 @@ def test_mpeg4_de_json(self):
6567
self.assertEqual(mpeg4.mpeg4_url, self.mpeg4_url)
6668
self.assertEqual(mpeg4.mpeg4_width, self.mpeg4_width)
6769
self.assertEqual(mpeg4.mpeg4_height, self.mpeg4_height)
70+
self.assertEqual(mpeg4.mpeg4_duration, self.mpeg4_duration)
6871
self.assertEqual(mpeg4.thumb_url, self.thumb_url)
6972
self.assertEqual(mpeg4.title, self.title)
7073
self.assertEqual(mpeg4.caption, self.caption)

0 commit comments

Comments
 (0)
X Tutup