fix edit message url

common.py

@@ -3,7 +3,7 @@ import os
 import re
 
 BOT_TOKEN = os.getenv("BOT_TOKEN")
-ADMIN = os.getenv("BOT_ADMIN").split(",")
+ADMIN = [int(i) for i in os.getenv("BOT_ADMIN").split(",")]
 
 WEBHOOK = os.getenv("WEBHOOK", False)
 if WEBHOOK:
@@ -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"\{.+\}", re.S)
+message_url_regex = re.compile(r"\[.+]", re.S)
 
 logging.basicConfig(
     level=os.getenv("LOG_LEVEL", "WARNING"),

main.py

@@ -1,7 +1,8 @@
+import html
 from functools import wraps
 
 from aiohttp import ClientSession
-from telegram import Update, Chat, InlineKeyboardMarkup, InlineKeyboardButton, ForceReply, Message
+from telegram import Update, Chat, InlineKeyboardMarkup, InlineKeyboardButton, Message
 from telegram.constants import ParseMode, ChatAction, ChatType
 from telegram.ext import (
     Application,
@@ -51,12 +52,19 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
             media,
             caption=tweet.message_text,
             reply_to_message_id=update.message.message_id,
+        ) if not tweet.is_single_gif else await update.effective_message.reply_animation(
+            media[0][0],
+            caption=tweet.message_text,
+            reply_to_message_id=update.message.message_id,
+            has_spoiler=media[0][1]
         )
         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 to edit message. [URL]",
-            reply_markup=ForceReply(selective=True, input_field_placeholder="{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
@@ -70,11 +78,13 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
 async def forward_message(
         update: Update,
         context: ContextTypes.DEFAULT_TYPE,
-        message_sent: tuple[Message, ...],
+        message_to_send: tuple[Message, ...],
 ) -> None:
     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:
         await update.effective_message.reply_text(str(e))
 
@@ -84,28 +94,35 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
         return
     if update.message.reply_to_message != context.user_data['message_reply']:
         return
-    update_text = update.message.text
+    template = context.user_data.get('template', None)
-    match = common.message_url_regex.search(update_text).span()
+    message_url = '<a href="{0}">{1}</a>'
-    if match:
+    url = context.user_data['message_url']
-        update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
+    if template:
-            context.user_data['message_url'], update_text[match[0] + 1:match[1] - 1]
+        update_text = template.replace("[]", message_url.format(
-        ) + update_text[match[1]:]
+            url,
+            html.escape(update.message.text)
+        ))
+    else:
+        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]] + message_url.format(
+                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(
+    if isinstance(message_to_send, tuple):
-        update_text,
+        await message_to_send[0].edit_text(update_text)
-        reply_markup=InlineKeyboardMarkup.from_button(
+    else:
-            InlineKeyboardButton("↩️ Confirm", callback_data="forward")
+        await message_to_send.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.edit_message_reply_markup()
+    await update.callback_query.delete_message()
-    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']
@@ -154,12 +171,33 @@ async def cmd_edit_before_forward(update: Update, context: ContextTypes.DEFAULT_
     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_set_template(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    reply = update.effective_message.reply_to_message
+    if not reply:
+        await update.effective_message.reply_text("Please reply to a message to set as template.")
+        return
+    if '[]' not in reply.text_html:
+        await update.effective_message.reply_text("Please reply to a message with [] to set as template.")
+        return
+    context.user_data['template'] = reply.text_html
+    await update.effective_message.reply_text("Template set.")
+
+
+@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),
@@ -192,8 +230,8 @@ def main():
                    .build()
                    )
 
-    # user_filter = filters.User()
+    user_filter = filters.User()
-    # user_filter.add_user_ids(common.admin)
+    user_filter.add_user_ids(common.ADMIN)
 
     handlers = [
         MessageHandler(filters.Regex(common.x_url_regex) & filters.ChatType.PRIVATE, url_media),
@@ -201,8 +239,10 @@ def main():
         CommandHandler("set_forward_channel", cmd_set_forward_channel),
         CommandHandler("remove_forward_channel", cmd_remove_forward_channel),
         CommandHandler("edit_before_forward", cmd_edit_before_forward),
+        CommandHandler("set_template", cmd_set_template),
         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,3 +1,4 @@
+import html
 from typing import Generator
 
 from aiohttp import ClientSession
@@ -6,8 +7,7 @@ from telegram import (
     InlineQueryResultVideo,
     InlineQueryResultMpeg4Gif,
     InputMediaPhoto,
-    InputMediaVideo,
+    InputMediaVideo
-    InputMediaAnimation
 )
 
 from common import x_url_regex, x_media_regex, x_tco_regex, logger
@@ -124,6 +124,7 @@ class TGTweet(Tweet):
     def __init__(self, url: str):
         self._url: str = url
         self._api_param: tuple[str] = self._tweet_id
+        self._is_single_gif: bool = False
         assert self._api_param
 
     async def __aenter__(self):
@@ -178,17 +179,23 @@ class TGTweet(Tweet):
         sensitive = self._tweet['possibly_sensitive']
         return id, author, author_id, text, media, sensitive
 
+    @property
+    def is_single_gif(self) -> bool:
+        return self._is_single_gif
+
     @property
     def message_text(self) -> str:
         return message_raw_text.format(
             url=self.url,
             author_url=self.author_url,
-            author=self.author,
+            author=html.escape(self.author),
-            text=self.text
+            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":
@@ -196,7 +203,7 @@ class TGTweet(Tweet):
                     id=str(i),
                     photo_url=tweet_media.url,
                     thumbnail_url=tweet_media.thumb,
-                    caption=self.message_text if not i else None
+                    caption=self.message_text
                 )
             elif tweet_media.type == "video":
                 yield InlineQueryResultVideo(
@@ -205,18 +212,18 @@ class TGTweet(Tweet):
                     mime_type="video/mp4",
                     thumbnail_url=tweet_media.thumb,
                     title=self.text,
-                    caption=self.message_text if not i else None
+                    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 if not i else None
+                    caption=self.message_text
                 )
 
     @property
-    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo, None, None]:
+    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo | tuple[str, bool], None, None]:
         for tweet_media in self.media:
             logger.info(str(tweet_media))
             if tweet_media.type == "image":
@@ -231,7 +238,10 @@ class TGTweet(Tweet):
                     thumbnail=tweet_media.thumb
                 )
             elif tweet_media.type == "gif":
-                yield InputMediaAnimation(
+                if len(self.media) == 1:
+                    self._is_single_gif = True
+                    yield tweet_media.url, self.sensitive
+                yield InputMediaVideo(
                     media=tweet_media.url,
                     has_spoiler=self.sensitive,
                     thumbnail=tweet_media.thumb