fix url match

common.py

@@ -17,6 +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"\{.+\}", re.S)
 
 logging.basicConfig(
     level=os.getenv("LOG_LEVEL", "WARNING"),

main.py

@@ -1,5 +1,7 @@
+from functools import wraps
+
 from aiohttp import ClientSession
-from telegram import Update, Chat
+from telegram import Update, Chat, InlineKeyboardMarkup, InlineKeyboardButton, ForceReply, Message
 from telegram.constants import ParseMode, ChatAction, ChatType
 from telegram.ext import (
     Application,
@@ -10,13 +12,25 @@ from telegram.ext import (
     InlineQueryHandler,
     PicklePersistence,
     MessageHandler,
-    CommandHandler
+    CommandHandler, CallbackQueryHandler
 )
 
 import common
 from tweet import TGTweet
 
 
+def send_action(action):
+    def decorator(func):
+        @wraps(func)
+        async def command_func(update: Update, context: ContextTypes.DEFAULT_TYPE, *args, **kwargs):
+            await update.effective_chat.send_action(action)
+            return await func(update, context, *args, **kwargs)
+
+        return command_func
+
+    return decorator
+
+
 async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     query = update.inline_query.query
     if query == "":
@@ -27,30 +41,79 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
         await update.inline_query.answer(result)
 
 
-async def reply_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+@send_action(ChatAction.UPLOAD_PHOTO)
-    await update.effective_chat.send_action(ChatAction.UPLOAD_PHOTO)
+async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    # url = update.message.text.split(" ")[0]
     url = update.message.text
     common.logger.info(f"Receiving url: {url}")
     async with TGTweet(url) as tweet:
         media = list(tweet.pm_media_generator)
-        message_sent = await update.effective_message.reply_media_group(
+        message_to_send = await update.effective_message.reply_media_group(
             media,
             caption=tweet.message_text,
-            reply_to_message_id=update.message.message_id
+            reply_to_message_id=update.message.message_id,
         )
+        url = tweet.url
+    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="{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
+        context.user_data['message_url'] = url
+        return
     if 'forward_channel_id' in context.user_data:
-        try:
+        await forward_message(update, context, message_to_send)
-            await update.effective_chat.copy_messages(
-                chat_id=context.user_data['forward_channel_id'],
-                message_ids=[m.id for m in message_sent],
-            )
-        except Exception as e:
-            await update.effective_message.reply_text(str(e))
 
 
+async def forward_message(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE,
+        message_sent: tuple[Message, ...],
+) -> None:
+    try:
+        for i, m in enumerate(message_sent):
+            await m.copy(context.user_data['forward_channel_id'])
+    except Exception as e:
+        await update.effective_message.reply_text(str(e))
+
+
+async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    if 'message_reply' not in context.user_data:
+        return
+    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)
+    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]:]
+    message_to_send = context.user_data['message_to_send']
+    await message_to_send[0].edit_caption(
+        update_text,
+        reply_markup=InlineKeyboardMarkup.from_button(
+            InlineKeyboardButton("↩️ Confirm", callback_data="forward")
+        )
+    )
+
+
+async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    message_to_send = context.user_data['message_to_send']
+    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']
+
+
+@send_action(ChatAction.TYPING)
 async def cmd_set_forward_channel(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    await update.effective_chat.send_action(ChatAction.TYPING)
     if not context.args:
         await update.effective_message.reply_text("Please provide a channel username or id.")
         return
@@ -75,8 +138,8 @@ async def cmd_set_forward_channel(update: Update, context: ContextTypes.DEFAULT_
         await update.effective_message.reply_text("Add successfully.")
 
 
+@send_action(ChatAction.TYPING)
 async def cmd_remove_forward_channel(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
-    await update.effective_chat.send_action(ChatAction.TYPING)
     if 'forward_channel_id' in context.user_data:
         del context.user_data['forward_channel_id']
         await update.effective_message.reply_text("Remove successfully.")
@@ -84,6 +147,20 @@ async def cmd_remove_forward_channel(update: Update, context: ContextTypes.DEFAU
     await update.effective_message.reply_text("No channel to remove.")
 
 
+@send_action(ChatAction.TYPING)
+async def cmd_edit_before_forward(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    if context.user_data.get('forward_channel_id', None) is None:
+        await update.effective_message.reply_text("Please enable forward channel first.")
+        return
+    ebf_status = context.user_data.get('edit_before_forward', False)
+    if ebf_status:
+        context.user_data['edit_before_forward'] = False
+        await update.effective_message.reply_text("Disable edit before forward.")
+        return
+    context.user_data['edit_before_forward'] = True
+    await update.effective_message.reply_text("Enable edit before forward.")
+
+
 async def post_init(application: Application) -> None:
     # commands = [
     #     BotCommand('start', CMD_START),
@@ -120,10 +197,13 @@ def main():
     # user_filter.add_user_ids(common.admin)
 
     handlers = [
-        MessageHandler(filters.Regex(common.x_url_regex) & filters.ChatType.PRIVATE, reply_media),
+        MessageHandler(filters.Regex(common.x_url_regex) & filters.ChatType.PRIVATE, url_media),
         InlineQueryHandler(inline_query, common.x_url_regex),
         CommandHandler("set_forward_channel", cmd_set_forward_channel),
         CommandHandler("remove_forward_channel", cmd_remove_forward_channel),
+        CommandHandler("edit_before_forward", cmd_edit_before_forward),
+        MessageHandler(~filters.COMMAND & filters.ChatType.PRIVATE, edit_message),
+        CallbackQueryHandler(query_forward_message, pattern="forward"),
     ]
 
     application.add_handlers(handlers)