mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7d144f2ee
|
||
|
|
081ee595b1
|
||
|
|
4272454f9a
|
@@ -70,11 +70,13 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
async def forward_message(
|
async def forward_message(
|
||||||
update: Update,
|
update: Update,
|
||||||
context: ContextTypes.DEFAULT_TYPE,
|
context: ContextTypes.DEFAULT_TYPE,
|
||||||
message_sent: tuple[Message, ...],
|
message_to_send: tuple[Message, ...],
|
||||||
) -> None:
|
) -> None:
|
||||||
try:
|
try:
|
||||||
for i, m in enumerate(message_sent):
|
await update.effective_chat.copy_messages(
|
||||||
await m.copy(context.user_data['forward_channel_id'])
|
context.user_data['forward_channel_id'],
|
||||||
|
[m.id for m in message_to_send]
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
await update.effective_message.reply_text(str(e))
|
await update.effective_message.reply_text(str(e))
|
||||||
|
|
||||||
@@ -85,8 +87,9 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
|
|||||||
if update.message.reply_to_message != context.user_data['message_reply']:
|
if update.message.reply_to_message != context.user_data['message_reply']:
|
||||||
return
|
return
|
||||||
update_text = update.message.text
|
update_text = update.message.text
|
||||||
match = common.message_url_regex.search(update_text).span()
|
match = common.message_url_regex.search(update_text)
|
||||||
if match:
|
if match:
|
||||||
|
match = match.span()
|
||||||
update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
|
update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
|
||||||
context.user_data['message_url'], update_text[match[0] + 1:match[1] - 1]
|
context.user_data['message_url'], update_text[match[0] + 1:match[1] - 1]
|
||||||
) + update_text[match[1]:]
|
) + update_text[match[1]:]
|
||||||
@@ -104,8 +107,6 @@ async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TY
|
|||||||
await forward_message(update, context, message_to_send)
|
await forward_message(update, context, message_to_send)
|
||||||
await update.callback_query.answer('✅ Forwarded')
|
await update.callback_query.answer('✅ Forwarded')
|
||||||
await update.callback_query.edit_message_reply_markup()
|
await update.callback_query.edit_message_reply_markup()
|
||||||
message_reply: Message = context.user_data['message_reply']
|
|
||||||
await message_reply.edit_text("Message forwarded.")
|
|
||||||
del context.user_data['message_reply']
|
del context.user_data['message_reply']
|
||||||
del context.user_data['message_to_send']
|
del context.user_data['message_to_send']
|
||||||
del context.user_data['message_url']
|
del context.user_data['message_url']
|
||||||
|
|||||||
Reference in New Issue
Block a user