OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-03-23 23:39:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

update inline query results after api change

Browse source
This commit is contained in:
Jannes Höke 2016-01-09 14:42:47 +01:00
parent c69cdfd184
commit 6ece89bc56
1 changed files with 24 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
telegram/inlinequeryresult.py
View file

@ -32,7 +32,7 @@ class InlineQueryResult(TelegramObject):
Args: Args:
type (str): type (str):
id (str): id (str): Unique identifier for this result, 1-64 Bytes
""" """
@ -75,7 +75,7 @@ class InlineQueryResultArticle(InlineQueryResult):
thumb_height (int): thumb_height (int):
Args: Args:
id (str): id (str): Unique identifier for this result, 1-64 Bytes
title (str): title (str):
message_text (str): message_text (str):
@ -147,14 +147,14 @@ class InlineQueryResultPhoto(InlineQueryResult):
disable_web_page_preview (bool): disable_web_page_preview (bool):
Args: Args:
id (str): id (str): Unique identifier for this result, 1-64 Bytes
photo_url (str): photo_url (str):
thumb_url (str):
Keyword Args: Keyword Args:
mime_type (Optional[str]): mime_type (Optional[str]):
photo_width (Optional[int]): photo_width (Optional[int]):
photo_height (Optional[int]): photo_height (Optional[int]):
thumb_url (Optional[str]):
title (Optional[str]): title (Optional[str]):
description (Optional[str]): description (Optional[str]):
caption (Optional[str]): caption (Optional[str]):
@ -166,10 +166,12 @@ class InlineQueryResultPhoto(InlineQueryResult):
def __init__(self, def __init__(self,
id, id,
photo_url, photo_url,
thumb_url,
**kwargs): **kwargs):
# Required # Required
super(InlineQueryResultPhoto, self).__init__('photo', id) super(InlineQueryResultPhoto, self).__init__('photo', id)
self.photo_url = photo_url self.photo_url = photo_url
self.thumb_url = thumb_url
# Optional # Optional
self.mime_type = kwargs.get('mime_type', 'image/jpeg') self.mime_type = kwargs.get('mime_type', 'image/jpeg')
@ -177,7 +179,6 @@ class InlineQueryResultPhoto(InlineQueryResult):
self.photo_width = int(kwargs['photo_width']) self.photo_width = int(kwargs['photo_width'])
if 'photo_height' in kwargs: if 'photo_height' in kwargs:
self.photo_height = int(kwargs['photo_height']) self.photo_height = int(kwargs['photo_height'])
self.thumb_url = kwargs.get('thumb_url', '')
self.title = kwargs.get('title', '') self.title = kwargs.get('title', '')
self.description = kwargs.get('description', '') self.description = kwargs.get('description', '')
self.caption = kwargs.get('caption', '') self.caption = kwargs.get('caption', '')
@ -217,13 +218,13 @@ class InlineQueryResultGif(InlineQueryResult):
disable_web_page_preview (bool): disable_web_page_preview (bool):
Args: Args:
id (str): id (str): Unique identifier for this result, 1-64 Bytes
gif_url (str): gif_url (str):
thumb_url (str):
Keyword Args: Keyword Args:
gif_width (Optional[int]): gif_width (Optional[int]):
gif_height (Optional[int]): gif_height (Optional[int]):
thumb_url (Optional[str]):
title (Optional[str]): title (Optional[str]):
caption (Optional[str]): caption (Optional[str]):
message_text (Optional[str]): message_text (Optional[str]):
@ -234,17 +235,18 @@ class InlineQueryResultGif(InlineQueryResult):
def __init__(self, def __init__(self,
id, id,
gif_url, gif_url,
thumb_url,
**kwargs): **kwargs):
# Required # Required
super(InlineQueryResultGif, self).__init__('gif', id) super(InlineQueryResultGif, self).__init__('gif', id)
self.gif_url = gif_url self.gif_url = gif_url
self.thumb_url = thumb_url
# Optional # Optional
if 'gif_width' in kwargs: if 'gif_width' in kwargs:
self.gif_width = int(kwargs['gif_width']) self.gif_width = int(kwargs['gif_width'])
if 'gif_height' in kwargs: if 'gif_height' in kwargs:
self.gif_height = int(kwargs['gif_height']) self.gif_height = int(kwargs['gif_height'])
self.thumb_url = kwargs.get('thumb_url', '')
self.title = kwargs.get('title', '') self.title = kwargs.get('title', '')
self.caption = kwargs.get('caption', '') self.caption = kwargs.get('caption', '')
self.message_text = kwargs.get('message_text', '') self.message_text = kwargs.get('message_text', '')
@ -283,13 +285,13 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
disable_web_page_preview (bool): disable_web_page_preview (bool):
Args: Args:
id (str): id (str): Unique identifier for this result, 1-64 Bytes
mpeg4_url (str): mpeg4_url (str):
thumb_url (str):
Keyword Args: Keyword Args:
mpeg4_width (Optional[int]): mpeg4_width (Optional[int]):
mpeg4_height (Optional[int]): mpeg4_height (Optional[int]):
thumb_url (Optional[str]):
title (Optional[str]): title (Optional[str]):
caption (Optional[str]): caption (Optional[str]):
message_text (Optional[str]): message_text (Optional[str]):
@ -300,17 +302,18 @@ class InlineQueryResultMpeg4Gif(InlineQueryResult):
def __init__(self, def __init__(self,
id, id,
mpeg4_url, mpeg4_url,
thumb_url,
**kwargs): **kwargs):
# Required # Required
super(InlineQueryResultMpeg4Gif, self).__init__('mpeg4_gif', id) super(InlineQueryResultMpeg4Gif, self).__init__('mpeg4_gif', id)
self.mpeg4_url = mpeg4_url self.mpeg4_url = mpeg4_url
self.thumb_url = thumb_url
# Optional # Optional
if 'mpeg4_width' in kwargs: if 'mpeg4_width' in kwargs:
self.mpeg4_width = int(kwargs['mpeg4_width']) self.mpeg4_width = int(kwargs['mpeg4_width'])
if 'mpeg4_height' in kwargs: if 'mpeg4_height' in kwargs:
self.mpeg4_height = int(kwargs['mpeg4_height']) self.mpeg4_height = int(kwargs['mpeg4_height'])
self.thumb_url = kwargs.get('thumb_url', '')
self.title = kwargs.get('title', '') self.title = kwargs.get('title', '')
self.caption = kwargs.get('caption', '') self.caption = kwargs.get('caption', '')
self.message_text = kwargs.get('message_text', '') self.message_text = kwargs.get('message_text', '')
@ -352,19 +355,19 @@ class InlineQueryResultVideo(InlineQueryResult):
disable_web_page_preview (bool): disable_web_page_preview (bool):
Args: Args:
id (str): id (str): Unique identifier for this result, 1-64 Bytes
video_url (str): video_url (str):
mime_type (str): mime_type (str):
thumb_url (str):
title (str):
message_text (str):
Keyword Args: Keyword Args:
video_width (Optional[int]): video_width (Optional[int]):
video_height (Optional[int]): video_height (Optional[int]):
video_duration (Optional[int]): video_duration (Optional[int]):
thumb_url (Optional[str]):
title (Optional[str]):
description (Optional[str]): description (Optional[str]):
caption (Optional[str]): caption (Optional[str]):
message_text (Optional[str]):
parse_mode (Optional[str]): parse_mode (Optional[str]):
disable_web_page_preview (Optional[bool]): disable_web_page_preview (Optional[bool]):
""" """
@ -373,11 +376,17 @@ class InlineQueryResultVideo(InlineQueryResult):
id, id,
video_url, video_url,
mime_type, mime_type,
thumb_url,
title,
message_text,
**kwargs): **kwargs):
# Required # Required
super(InlineQueryResultVideo, self).__init__('video', id) super(InlineQueryResultVideo, self).__init__('video', id)
self.video_url = video_url self.video_url = video_url
self.mime_type = mime_type self.mime_type = mime_type
self.thumb_url = thumb_url
self.title = title
self.message_text = message_text
# Optional # Optional
if 'video_width' in kwargs: if 'video_width' in kwargs:
@ -386,11 +395,8 @@ class InlineQueryResultVideo(InlineQueryResult):
self.video_height = int(kwargs['video_height']) self.video_height = int(kwargs['video_height'])
if 'video_duration' in kwargs: if 'video_duration' in kwargs:
self.video_duration = int(kwargs['video_duration']) self.video_duration = int(kwargs['video_duration'])
self.thumb_url = kwargs.get('thumb_url', '')
self.title = kwargs.get('title', '')
self.description = kwargs.get('description', '') self.description = kwargs.get('description', '')
self.caption = kwargs.get('caption', '') self.caption = kwargs.get('caption', '')
self.message_text = kwargs.get('message_text', '')
self.parse_mode = kwargs.get('parse_mode', '') self.parse_mode = kwargs.get('parse_mode', '')
self.disable_web_page_preview = kwargs.get('disable_web_page_preview', self.disable_web_page_preview = kwargs.get('disable_web_page_preview',
False) False)