From 7d289c9db7bd03f025d15733081f5a16f2dd5658 Mon Sep 17 00:00:00 2001 From: YoursFunny Date: Sun, 24 Mar 2024 22:32:22 +0800 Subject: [PATCH] fix multiple line substitution --- common.py | 2 +- main.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common.py b/common.py index 586376b..95f7d5b 100644 --- a/common.py +++ b/common.py @@ -17,7 +17,7 @@ if WEBHOOK: x_url_regex = re.compile(r"^(?:https?://)(?:www\.|mobile\.|)(?:x|twitter)\.com/(.+)/status/(\d+)") x_media_regex = re.compile(r"^(?:https?://)(pbs|video)\.twimg\.com/(.*)") x_tco_regex = re.compile(r"(?:https?://)t\.co/.+$", re.M) -message_url_regex = re.compile(r"\{\w+\}", re.M) +message_url_regex = re.compile(r"\{.+\}", re.S) logging.basicConfig( level=os.getenv("LOG_LEVEL", "WARNING"), diff --git a/main.py b/main.py index c24af42..d2f0d33 100644 --- a/main.py +++ b/main.py @@ -56,7 +56,8 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None: if context.user_data.get('edit_before_forward', False): message_reply = await update.effective_message.reply_text( "Reply to edit message.", - reply_markup=ForceReply(selective=True, input_field_placeholder="{}"), + reply_markup=ForceReply(selective=True, input_field_placeholder="{URL}"), + reply_to_message_id=update.message.message_id, ) context.user_data['message_reply'] = message_reply context.user_data['message_to_send'] = message_to_send @@ -103,6 +104,8 @@ async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TY await forward_message(update, context, message_to_send) await update.callback_query.answer('✅ Forwarded') 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_to_send'] del context.user_data['message_url']