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-02-17 02:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix serialization of reply_markups (#1889)

Browse source
This commit is contained in:
Bibo-Joshi 2020-04-11 09:44:40 +02:00 • committed by GitHub
parent 38a33581b1
commit 4bbcd51ef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
telegram/bot.py
View file

@ -163,7 +163,9 @@ class Bot(TelegramObject):
if reply_markup is not None: if reply_markup is not None:
if isinstance(reply_markup, ReplyMarkup): if isinstance(reply_markup, ReplyMarkup):
data['reply_markup'] = reply_markup.to_dict() # We need to_json() instead of to_dict() here, because reply_markups may be
# attached to media messages, which aren't json dumped by utils.request
data['reply_markup'] = reply_markup.to_json()
else: else:
data['reply_markup'] = reply_markup data['reply_markup'] = reply_markup
@ -3404,6 +3406,8 @@ class Bot(TelegramObject):
if contains_masks is not None: if contains_masks is not None:
data['contains_masks'] = contains_masks data['contains_masks'] = contains_masks
if mask_position is not None: if mask_position is not None:
# We need to_json() instead of to_dict() here, because we're sending a media
# message here, which isn't json dumped by utils.request
data['mask_position'] = mask_position.to_json() data['mask_position'] = mask_position.to_json()
data.update(kwargs) data.update(kwargs)
@ -3472,6 +3476,8 @@ class Bot(TelegramObject):
if tgs_sticker is not None: if tgs_sticker is not None:
data['tgs_sticker'] = tgs_sticker data['tgs_sticker'] = tgs_sticker
if mask_position is not None: if mask_position is not None:
# We need to_json() instead of to_dict() here, because we're sending a media
# message here, which isn't json dumped by utils.request
data['mask_position'] = mask_position.to_json() data['mask_position'] = mask_position.to_json()
data.update(kwargs) data.update(kwargs)
@ -3726,7 +3732,9 @@ class Bot(TelegramObject):
if reply_markup: if reply_markup:
if isinstance(reply_markup, ReplyMarkup): if isinstance(reply_markup, ReplyMarkup):
data['reply_markup'] = reply_markup.to_dict() # We need to_json() instead of to_dict() here, because reply_markups may be
# attached to media messages, which aren't json dumped by utils.request
data['reply_markup'] = reply_markup.to_json()
else: else:
data['reply_markup'] = reply_markup data['reply_markup'] = reply_markup