fix url match

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"),

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
@@ -84,8 +85,9 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
     if update.message.reply_to_message != context.user_data['message_reply']:
         return
     update_text = update.message.text
-    match = common.message_url_regex.search(update_text).span()
+    match = common.message_url_regex.search(update_text)
     if match:
+        match = match.span()
         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]
         ) + update_text[match[1]:]
@@ -103,6 +105,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']