fix regex match group

.gitignore

@@ -3,4 +3,4 @@ __pycache__/
 cert/
 data/
 docker-compose.yml
-x.py
+utils/x.py

common.py

@@ -2,8 +2,15 @@ import logging
 import os
 import re
 
+try:
+    import uvloop, asyncio
+
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+except ImportError:
+    uvloop = None
+
 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:
@@ -14,13 +21,16 @@ if WEBHOOK:
     WEBHOOK_CERT = os.getenv("WEBHOOK_CERT", "cert/cert.pem")
     WEBHOOK_SECRET_TOKEN = os.getenv("WEBHOOK_SECRET_TOKEN")
 
-x_url_regex = re.compile(r"^(?:https?://)(?:www\.|mobile\.|)(?:x|twitter)\.com/(.+)/status/(\d+)")
+x_url_regex = re.compile(r"^(?:https?://)(?:www\.|mobile\.|)(?:x|twitter|fixvx|vxtwitter)\.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"),
     format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 )
-logger = logging.getLogger(__name__)
+
+
+def get_logger(name: str) -> logging.Logger:
+    return logging.getLogger(name)

main.py

@@ -1,22 +1,22 @@
-from functools import wraps
+from __future__ import annotations
 
-from aiohttp import ClientSession
+import html
-from telegram import Update, Chat, InlineKeyboardMarkup, InlineKeyboardButton, ForceReply, Message
+from functools import wraps
-from telegram.constants import ParseMode, ChatAction, ChatType
+from typing import TYPE_CHECKING
-from telegram.ext import (
+
-    Application,
+from telegram import InlineKeyboardButton, InlineKeyboardMarkup
-    ApplicationBuilder,
+from telegram.constants import ChatAction, ChatType, ParseMode
-    ContextTypes,
+from telegram.ext import (ApplicationBuilder, CallbackQueryHandler, CommandHandler, Defaults,
-    Defaults,
+                          InlineQueryHandler, MessageHandler, PicklePersistence, filters)
-    filters,
-    InlineQueryHandler,
-    PicklePersistence,
-    MessageHandler,
-    CommandHandler, CallbackQueryHandler
-)
 
 import common
-from tweet import TGTweet
+from utils.tweet import Telegram
+
+if TYPE_CHECKING:
+    from telegram import Chat, Message, Update
+    from telegram.ext import Application, ContextTypes
+
+logger = common.get_logger(__name__)
 
 
 def send_action(action):
@@ -35,8 +35,8 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
     query = update.inline_query.query
     if query == "":
         return
-    common.logger.info(f"Query: {query}")
+    logger.info(f"Query: {query}")
-    async with TGTweet(query) as tweet:
+    async with Telegram(query) as tweet:
         result = list(tweet.inline_query_generator)
         await update.inline_query.answer(result)
 
@@ -44,19 +44,28 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
 @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}")
+    logger.info(f"Receiving url: {url}")
-    async with TGTweet(url) as tweet:
+    async with Telegram(url) as tweet:
-        media = list(tweet.pm_media_generator)
+        media = list(tweet.message_media_generator)
         message_to_send = await update.effective_message.reply_media_group(
             media,
             caption=tweet.message_text,
             reply_to_message_id=update.message.message_id,
+        ) if not isinstance(tuple, media[0]) 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]
         )
+        if not isinstance(message_to_send, tuple):
+            message_to_send = (message_to_send,)
         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 +79,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,27 +95,32 @@ 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)
+    message_url = '<a href="{0}">{1}</a>'
-    if match:
+    url = context.user_data['message_url']
-        match = match.span()
+    if template:
-        update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
+        update_text = template.replace("[]", message_url.format(
-            context.user_data['message_url'], update_text[match[0] + 1:match[1] - 1]
+            url,
-        ) + update_text[match[1]:]
+            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(
+    await message_to_send[0].edit_caption(update_text)
-        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()
+    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']
@@ -153,12 +169,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),
@@ -167,7 +204,7 @@ async def post_init(application: Application) -> None:
     DESCRIPTION = "A bot to fetch tweets from Twitter."
     await application.bot.set_my_description(DESCRIPTION)
     await application.bot.set_my_short_description(DESCRIPTION)
-    TGTweet.set_session(ClientSession())
+    Telegram.init_client()
 
 
 async def post_stop(application: Application) -> None:
@@ -175,7 +212,7 @@ async def post_stop(application: Application) -> None:
 
 
 async def post_shutdown(application: Application) -> None:
-    await TGTweet.close_session()
+    await Telegram.close_client()
 
 
 def main():
@@ -188,20 +225,24 @@ def main():
                    .post_init(post_init)
                    .post_stop(post_stop)
                    .post_shutdown(post_shutdown)
+                   .concurrent_updates(True)
+                   .http_version('2')
                    .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),
         InlineQueryHandler(inline_query, common.x_url_regex),
+        MessageHandler(filters.Regex(common.x_url_regex) & filters.ChatType.PRIVATE, url_media),
         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,3 @@
-python-telegram-bot[webhooks]~=21.0.1
+python-telegram-bot[webhooks]~=21.3
-aiohttp[speedups]~=3.9.3
+httpx[http2]~=0.27.0
+uvloop~=0.19.0; sys_platform != 'win32'

tweet.py

@@ -1,238 +0,0 @@
-from typing import Generator
-
-from aiohttp import ClientSession
-from telegram import (
-    InlineQueryResultPhoto,
-    InlineQueryResultVideo,
-    InlineQueryResultMpeg4Gif,
-    InputMediaPhoto,
-    InputMediaVideo,
-    InputMediaAnimation
-)
-
-from common import x_url_regex, x_media_regex, x_tco_regex, logger
-
-twimg_url = 'https://pbs.twimg.com/'
-vx_api_url = 'https://api.vxtwitter.com/{0}/status/{1}'
-
-message_raw_text = """{url}
-<a href="{author_url}">{author}</a>: {text}
-"""
-
-
-async def fetch_json(session: ClientSession, url: str) -> dict:
-    logger.info(f"Fetching {url}")
-    async with session.get(url) as response:
-        assert response.status == 200, f"Failed to fetch {url}, status code {response.status}"
-        return await response.json()
-
-
-class TweetMedia:
-    def __init__(self, url: str, thumb: str, media_type: str):
-        self._url: str = url
-        self._thumb: str = thumb
-        self._type: str = media_type
-
-    def __str__(self):
-        return f"Media[url: {self.url} thumb: {self.thumb} type: {self.type}]"
-
-    @property
-    def _uri(self) -> str | None:
-        match = x_media_regex.match(self._url)
-        if match:
-            return match.group(2).removesuffix('.jpg').removesuffix('.png')
-        return None
-
-    @property
-    def url(self) -> str:
-        match self._type:
-            case "image":
-                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:
-        match self._type:
-            case "image":
-                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:
-        return self._type
-
-
-class Tweet:
-    def __init__(
-            self,
-            tweet_id: str,
-            author: str,
-            author_id: str,
-            text: str,
-            media: list[TweetMedia],
-            sensitive: bool = False
-    ):
-        self._id: str = tweet_id
-        self._author: str = author
-        self._author_id: str = author_id
-        self._text: str = text
-        self._media: list[TweetMedia] = media
-        self._sensitive: bool = sensitive
-
-    @property
-    def id(self) -> str:
-        return self._id
-
-    @property
-    def url(self) -> str:
-        return f"https://twitter.com/{self._author_id}/status/{self._id}"
-
-    @property
-    def author(self) -> str:
-        return self._author
-
-    @property
-    def author_url(self) -> str:
-        return f"https://twitter.com/{self._author_id}"
-
-    @property
-    def text(self) -> str:
-        return self._text
-
-    @property
-    def media(self) -> list[TweetMedia]:
-        return self._media
-
-    @property
-    def sensitive(self) -> bool:
-        return self._sensitive
-
-
-class TGTweet(Tweet):
-    _session: ClientSession
-
-    def __init__(self, url: str):
-        self._url: str = url
-        self._api_param: tuple[str] = self._tweet_id
-        assert self._api_param
-
-    async def __aenter__(self):
-        self._tweet: dict = await self._fetch_tweet(self._api_param)
-        super().__init__(*self._init_properties)
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        pass
-
-    @classmethod
-    def set_session(cls, session: ClientSession) -> None:
-        cls._session = session
-
-    @classmethod
-    async def close_session(cls) -> None:
-        await cls._session.close()
-
-    async def _fetch_tweet(self, api_param: tuple[str]) -> dict:
-        return await fetch_json(self._session, vx_api_url.format(*api_param))
-
-    @property
-    def _tweet_id(self) -> tuple[str] | None:
-        match = x_url_regex.match(self._url)
-        if match:
-            return match.groups()
-        return None
-
-    @property
-    def _tweet_text(self) -> str:
-        match = x_tco_regex.search(self._tweet['text'])
-        return self._tweet['text'][:match.start()].strip(" ") if match else self._tweet['text']
-
-    @property
-    def _tweet_media(self) -> list[TweetMedia]:
-        return [
-            TweetMedia(
-                url=x['url'],
-                thumb=x['thumbnail_url'],
-                media_type=x['type']
-            )
-            for x in self._tweet['media_extended']
-        ]
-
-    @property
-    def _init_properties(self) -> tuple:
-        id = self._tweet['tweetID']
-        author = self._tweet['user_name']
-        author_id = self._tweet['user_screen_name']
-        text = self._tweet_text
-        media = self._tweet_media
-        sensitive = self._tweet['possibly_sensitive']
-        return id, author, author_id, text, media, sensitive
-
-    @property
-    def message_text(self) -> str:
-        return message_raw_text.format(
-            url=self.url,
-            author_url=self.author_url,
-            author=self.author,
-            text=self.text
-        )
-
-    @property
-    def inline_query_generator(self) -> Generator[InlineQueryResultPhoto | InlineQueryResultVideo, None, None]:
-        for i, tweet_media in enumerate(self.media):
-            logger.info(str(tweet_media))
-            if tweet_media.type == "image":
-                yield InlineQueryResultPhoto(
-                    id=str(i),
-                    photo_url=tweet_media.url,
-                    thumbnail_url=tweet_media.thumb,
-                    caption=self.message_text if not i else None
-                )
-            elif tweet_media.type == "video":
-                yield InlineQueryResultVideo(
-                    id=str(i),
-                    video_url=tweet_media.url,
-                    mime_type="video/mp4",
-                    thumbnail_url=tweet_media.thumb,
-                    title=self.text,
-                    caption=self.message_text if not i else None
-                )
-            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
-                )
-
-    @property
-    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo, None, None]:
-        for tweet_media in self.media:
-            logger.info(str(tweet_media))
-            if tweet_media.type == "image":
-                yield InputMediaPhoto(
-                    media=tweet_media.url,
-                    has_spoiler=self.sensitive
-                )
-            elif tweet_media.type == "video":
-                yield InputMediaVideo(
-                    media=tweet_media.url,
-                    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
-                )

utils/tweet.py

@@ -0,0 +1,285 @@
+from __future__ import annotations
+
+import html
+from functools import cached_property
+from typing import Generator, TYPE_CHECKING
+from uuid import uuid4
+
+from httpx import AsyncClient
+from telegram import (InlineQueryResultMpeg4Gif, InlineQueryResultPhoto, InlineQueryResultVideo, InputMediaPhoto,
+                      InputMediaVideo)
+
+from common import get_logger, x_media_regex, x_tco_regex, x_url_regex
+
+if TYPE_CHECKING:
+    from .types import TweetInfo, TypeInlineQueryResult, TypeMessageMediaResult
+
+logger = get_logger(__name__)
+
+
+twimg_url = 'https://pbs.twimg.com/'
+vx_api_url = 'https://api.vxtwitter.com/{0}/status/{1}'
+
+message_raw_text = """{url}
+<a href="{author_url}">{author}</a>: {text}
+"""
+
+
+def create_client() -> AsyncClient:
+    return AsyncClient(http2=True)
+
+
+async def close_client(_client: AsyncClient) -> None:
+    await _client.aclose()
+
+
+async def fetch_json(_client: AsyncClient, url: str) -> dict:
+    logger.info(f"Fetching {url}")
+    response = await _client.get(url)
+    assert response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
+    return response.json()
+
+
+class TweetMedia:
+    __slots__ = ('_url', '_thumb', '_type', '__dict__')
+
+    def __init__(self, url: str, thumb: str, media_type: str):
+        self._url: str = url
+        self._thumb: str = thumb
+        self._type: str = media_type
+
+    def __str__(self):
+        return f"TweetMedia(url={self.url}, thumb={self.thumb}, type={self.type})"
+
+    @cached_property
+    def _uri(self) -> str | None:
+        if match := x_media_regex.match(self._url):
+            return match.group(2).removesuffix('.jpg').removesuffix('.png')
+        return None
+
+    @cached_property
+    def url(self) -> str:
+        match self._type:
+            case "image":
+                return f"{twimg_url}{self._uri}?format=jpg&name=4096x4096"
+            case "video":
+                return self._url
+            case "gif":
+                return self._url
+            case _:
+                return self._url
+
+    @cached_property
+    def thumb(self) -> str:
+        match self._type:
+            case "image":
+                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:
+        return self._type
+
+
+class Tweet:
+    __slots__ = ('_id', '_author', '_author_id', '_text', '_media', '_sensitive', '__dict__')
+
+    def __init__(
+            self,
+            tweet_id: str,
+            author: str,
+            author_id: str,
+            text: str,
+            media: list[TweetMedia],
+            sensitive: bool = False
+    ):
+        self._id: str = tweet_id
+        self._author: str = author
+        self._author_id: str = author_id
+        self._text: str = text
+        self._media: list[TweetMedia] = media
+        self._sensitive: bool = sensitive
+
+    @property
+    def id(self) -> str:
+        return self._id
+
+    @cached_property
+    def url(self) -> str:
+        return f"https://twitter.com/{self._author_id}/status/{self._id}"
+
+    @property
+    def author(self) -> str:
+        return self._author
+
+    @cached_property
+    def author_url(self) -> str:
+        return f"https://twitter.com/{self._author_id}"
+
+    @property
+    def text(self) -> str:
+        return self._text
+
+    @property
+    def media(self) -> list[TweetMedia]:
+        return self._media
+
+    @property
+    def sensitive(self) -> bool:
+        return self._sensitive
+
+
+class ProcessTweet:
+    __slots__ = ('_httpx_client', '_url', '_tweet')
+
+    def __init__(self, httpx_client: AsyncClient, url: str):
+        self._httpx_client: AsyncClient = httpx_client
+        self._url: str = url
+
+    async def __aenter__(self):
+        self._tweet = await self._fetch_tweet()
+        return Tweet(
+            tweet_id=self._tweet["tweetID"],
+            author=self._tweet["user_name"],
+            author_id=self._tweet["user_screen_name"],
+            text=self._tweet_text,
+            media=self._tweet_media,
+            sensitive=self._tweet["possibly_sensitive"]
+        )
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    async def _fetch_tweet(self) -> TweetInfo:
+        match = x_url_regex.match(self._url)
+        assert match, f"Invalid URL: {self._url}"
+        auther_id, tweet_id = match.groups()
+        return await fetch_json(self._httpx_client, vx_api_url.format(auther_id, tweet_id))
+
+    @property
+    def _tweet_text(self) -> str:
+        match = x_tco_regex.search(self._tweet['text'])
+        return self._tweet['text'][:match.start()].strip(" ") if match else self._tweet['text']
+
+    @property
+    def _tweet_media(self) -> list[TweetMedia]:
+        return [
+            TweetMedia(
+                url=tweet_media['url'],
+                thumb=tweet_media['thumbnail_url'],
+                media_type=tweet_media['type']
+            )
+            for tweet_media in self._tweet['media_extended']
+        ]
+
+
+class TelegramTweet:
+    __slots__ = ('_httpx_client', '_url', '_tweet', '__dict__')
+
+    def __init__(self, httpx_client: AsyncClient, url: str):
+        self._httpx_client: AsyncClient = httpx_client
+        self._url: str = url
+
+    async def __aenter__(self):
+        async with ProcessTweet(self._httpx_client, self._url) as tweet:
+            self._tweet = tweet
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    @cached_property
+    def url(self) -> str:
+        return self._tweet.url
+
+    @cached_property
+    def message_text(self) -> str:
+        tweet = self._tweet
+        return message_raw_text.format(
+            url=tweet.url,
+            author_url=tweet.author_url,
+            author=html.escape(tweet.author),
+            text=html.escape(tweet.text)
+        )
+
+    @property
+    def inline_query_generator(self) -> Generator[TypeInlineQueryResult, None, None]:
+        tweet = self._tweet
+        for tweet_media in tweet.media:
+            logger.info(str(tweet_media))
+            if tweet_media.type == "image":
+                yield InlineQueryResultPhoto(
+                    id=str(uuid4()),
+                    photo_url=tweet_media.url,
+                    thumbnail_url=tweet_media.thumb,
+                    caption=self.message_text
+                )
+            elif tweet_media.type == "video":
+                yield InlineQueryResultVideo(
+                    id=str(uuid4()),
+                    video_url=tweet_media.url,
+                    mime_type="video/mp4",
+                    thumbnail_url=tweet_media.thumb,
+                    title=tweet.text,
+                    caption=self.message_text
+                )
+            elif tweet_media.type == "gif":
+                yield InlineQueryResultMpeg4Gif(
+                    id=str(uuid4()),
+                    mpeg4_url=tweet_media.url,
+                    thumbnail_url=tweet_media.thumb,
+                    caption=self.message_text
+                )
+
+    @property
+    def message_media_generator(self) -> Generator[TypeMessageMediaResult, None, None]:
+        tweet = self._tweet
+        for tweet_media in tweet.media:
+            logger.info(str(tweet_media))
+            if tweet_media.type == "image":
+                yield InputMediaPhoto(
+                    media=tweet_media.url,
+                    has_spoiler=tweet.sensitive
+                )
+            elif tweet_media.type == "video":
+                yield InputMediaVideo(
+                    media=tweet_media.url,
+                    has_spoiler=tweet.sensitive,
+                    thumbnail=tweet_media.thumb
+                )
+            elif tweet_media.type == "gif":
+                if len(tweet.media) == 1:
+                    yield tweet_media.url, tweet.sensitive
+                yield InputMediaVideo(
+                    media=tweet_media.url,
+                    has_spoiler=tweet.sensitive,
+                    thumbnail=tweet_media.thumb
+                )
+
+
+class Telegram:
+    _httpx_client: AsyncClient
+
+    def __init__(self, url: str):
+        self._url = url
+
+    async def __aenter__(self):
+        if x_url_regex.match(self._url):
+            async with TelegramTweet(self._httpx_client, self._url) as tweet:
+                return tweet
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    @classmethod
+    def init_client(cls) -> None:
+        cls._httpx_client = create_client()
+
+    @classmethod
+    async def close_client(cls) -> None:
+        await close_client(cls._httpx_client)

utils/types.py

@@ -0,0 +1,17 @@
+from typing import TypedDict
+
+from telegram import InlineQueryResultMpeg4Gif, InlineQueryResultPhoto, InlineQueryResultVideo, InputMediaPhoto, \
+    InputMediaVideo
+
+TypeInlineQueryResult = InlineQueryResultMpeg4Gif | InlineQueryResultPhoto | InlineQueryResultVideo
+InputMediaAnimation = tuple[str, bool]
+TypeMessageMediaResult = InputMediaPhoto | InputMediaVideo | InputMediaAnimation
+
+
+class TweetInfo(TypedDict):
+    tweetID: str
+    user_name: str
+    user_screen_name: str
+    text: str
+    media_extended: list[dict]
+    possibly_sensitive: bool