Skip to content

fix: send media twice after edit a text message with Media #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jiz4oh wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: send media twice after edit a text message with Media #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e83b74c
fix: send media twice after edit a text message with Media
jiz4oh Apr 27, 2025
d2ed30c
fix: fix caption lost in group chat
jiz4oh May 30, 2025
06e2d9c
fix: add missing reply_markup
jiz4oh May 30, 2025
d38695b
feat: edit media with caption at once
jiz4oh Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion efb_telegram_master/bot_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,9 +489,16 @@ def edit_message_caption(self, *args, **kwargs):
return self.updater.bot.edit_message_caption(*args, **kwargs)

@Decorators.retry_on_timeout
@Decorators.caption_affix_decorator
@Decorators.retry_on_chat_migration
def edit_message_media(self, *args, **kwargs):
return self.updater.bot.edit_message_media(*args, **kwargs)
text = kwargs.pop('caption', None)
parse_mode = kwargs.pop('parse_mode', None)
media = kwargs.pop('media', None)
caption_entities = kwargs.pop('caption_entities', None)
media.caption = text
media.caption_entities = caption_entities
return self.updater.bot.edit_message_media(media=media, *args, **kwargs)

def reply_error(self, update, errmsg):
"""
Expand Down
12 changes: 8 additions & 4 deletions efb_telegram_master/slave_message.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ def slave_message_image(self, msg: Message, tg_dest: TelegramChatID, msg_templat
media = InputMediaDocument(file)
else:
media = InputMediaPhoto(file)
self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=media)
return self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=media, reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
return self.bot.edit_message_caption(chat_id=old_msg_id[0], message_id=old_msg_id[1],
reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
Expand Down Expand Up @@ -535,7 +536,8 @@ def slave_message_animation(self, msg: Message, tg_dest: TelegramChatID, msg_tem
if edit_media:
assert msg.file and msg.path
file = self.process_file_obj(msg.file, msg.path)
self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaAnimation(file))
return self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaAnimation(file), reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
return self.bot.edit_message_caption(chat_id=old_msg_id[0], message_id=old_msg_id[1],
prefix=msg_template, suffix=reactions,
reply_markup=reply_markup,
Expand Down Expand Up @@ -693,7 +695,8 @@ def slave_message_file(self, msg: Message, tg_dest: TelegramChatID, msg_template
if edit_media:
assert msg.file is not None and msg.path is not None
file = self.process_file_obj(msg.file, msg.path)
self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaDocument(file))
return self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaDocument(file), reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
return self.bot.edit_message_caption(chat_id=old_msg_id[0], message_id=old_msg_id[1], reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
assert msg.file is not None and msg.path is not None
Expand Down Expand Up @@ -828,7 +831,8 @@ def slave_message_video(self, msg: Message, tg_dest: TelegramChatID, msg_templat
if edit_media:
assert msg.file is not None and msg.path is not None
file = self.process_file_obj(msg.file, msg.path)
self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaVideo(file))
return self.bot.edit_message_media(chat_id=old_msg_id[0], message_id=old_msg_id[1], media=InputMediaVideo(file), reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
return self.bot.edit_message_caption(chat_id=old_msg_id[0], message_id=old_msg_id[1], reply_markup=reply_markup,
prefix=msg_template, suffix=reactions, caption=text, parse_mode="HTML")
assert msg.file is not None and msg.path is not None
Expand Down
Loading