add message user dict debug

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,8 @@
+import html
+from functools import wraps
+
 from aiohttp import ClientSession
-from telegram import Update, Chat
+from telegram import Update, Chat, InlineKeyboardMarkup, InlineKeyboardButton, Message
 from telegram.constants import ParseMode, ChatAction, ChatType
 from telegram.ext import (
     Application,
@@ -10,13 +13,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 +42,76 @@ 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:
-    await update.effective_chat.send_action(ChatAction.UPLOAD_PHOTO)
-    # url = update.message.text.split(" ")[0]
+@send_action(ChatAction.UPLOAD_PHOTO)
+async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
     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. [URL]",
+            reply_markup=InlineKeyboardMarkup.from_button(
+                InlineKeyboardButton("↩️ Confirm", callback_data="forward")
+            ),
+            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 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))
+        await forward_message(update, context, message_to_send)
 
 
+async def forward_message(
+        update: Update,
+        context: ContextTypes.DEFAULT_TYPE,
+        message_to_send: tuple[Message, ...],
+) -> None:
+    try:
+        await update.effective_chat.copy_messages(
+            context.user_data['forward_channel_id'],
+            [m.id for m in message_to_send]
+        )
+    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 = html.escape(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)
+
+
+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.delete_message()
+    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 +136,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 +145,28 @@ 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
+        context.user_data.pop('message_reply', None)
+        context.user_data.pop('message_to_send', None)
+        context.user_data.pop('message_url', None)
+        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.")
+
+
+@send_action(ChatAction.TYPING)
+async def cmd_user_dict(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    await update.effective_message.reply_text(str(context.user_data))
+
+
 async def post_init(application: Application) -> None:
     # commands = [
     #     BotCommand('start', CMD_START),
@@ -116,14 +199,18 @@ def main():
                    .build()
                    )
 
-    # user_filter = filters.User()
-    # user_filter.add_user_ids(common.admin)
+    user_filter = filters.User()
+    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"),
+        CommandHandler("bot_dict", cmd_user_dict, filters=user_filter),
     ]
 
     application.add_handlers(handlers)

requirements.txt

@@ -1,2 +1,2 @@
-python-telegram-bot[webhooks]~=21.0.1
+python-telegram-bot[webhooks]~=21.1.1
 aiohttp[speedups]~=3.9.3

tweet.py

@@ -1,11 +1,14 @@
+import html
 from typing import Generator
 
 from aiohttp import ClientSession
 from telegram import (
     InlineQueryResultPhoto,
     InlineQueryResultVideo,
+    InlineQueryResultMpeg4Gif,
     InputMediaPhoto,
-    InputMediaVideo
+    InputMediaVideo,
+    InputMediaAnimation
 )
 
 from common import x_url_regex, x_media_regex, x_tco_regex, logger
@@ -48,6 +51,10 @@ class TweetMedia:
                 return f"{twimg_url}{self._uri}?format=jpg&name=4096x4096"
             case "video":
                 return self._url
+            case "gif":
+                return self._url
+            case _:
+                return self._url
 
     @property
     def thumb(self) -> str:
@@ -56,6 +63,10 @@ class TweetMedia:
                 return f"{twimg_url}{self._uri}?format=jpg&name=thumb"
             case "video":
                 return self._thumb
+            case "gif":
+                return self._thumb
+            case _:
+                return self._thumb
 
     @property
     def type(self) -> str:
@@ -173,12 +184,14 @@ class TGTweet(Tweet):
         return message_raw_text.format(
             url=self.url,
             author_url=self.author_url,
-            author=self.author,
-            text=self.text
+            author=html.escape(self.author),
+            text=html.escape(self.text)
         )
 
     @property
-    def inline_query_generator(self) -> Generator[InlineQueryResultPhoto | InlineQueryResultVideo, None, None]:
+    def inline_query_generator(self) -> Generator[
+        InlineQueryResultPhoto | InlineQueryResultVideo | InlineQueryResultMpeg4Gif, None, None
+    ]:
         for i, tweet_media in enumerate(self.media):
             logger.info(str(tweet_media))
             if tweet_media.type == "image":
@@ -186,9 +199,7 @@ class TGTweet(Tweet):
                     id=str(i),
                     photo_url=tweet_media.url,
                     thumbnail_url=tweet_media.thumb,
-                    title=self.url,
-                    description=self.text,
-                    caption=self.message_text if not i else None
+                    caption=self.message_text
                 )
             elif tweet_media.type == "video":
                 yield InlineQueryResultVideo(
@@ -196,13 +207,19 @@ class TGTweet(Tweet):
                     video_url=tweet_media.url,
                     mime_type="video/mp4",
                     thumbnail_url=tweet_media.thumb,
-                    title=self.url,
-                    description=self.text,
-                    caption=self.message_text if not i else None
+                    title=self.text,
+                    caption=self.message_text
+                )
+            elif tweet_media.type == "gif":
+                yield InlineQueryResultMpeg4Gif(
+                    id=str(i),
+                    mpeg4_url=tweet_media.url,
+                    thumbnail_url=tweet_media.thumb,
+                    caption=self.message_text
                 )
 
     @property
-    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo, None, None]:
+    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo | InputMediaAnimation, None, None]:
         for tweet_media in self.media:
             logger.info(str(tweet_media))
             if tweet_media.type == "image":
@@ -216,3 +233,9 @@ class TGTweet(Tweet):
                     has_spoiler=self.sensitive,
                     thumbnail=tweet_media.thumb
                 )
+            elif tweet_media.type == "gif":
+                yield InputMediaAnimation(
+                    media=tweet_media.url,
+                    has_spoiler=self.sensitive,
+                    thumbnail=tweet_media.thumb
+                )