update pixiv regex

.dockerignore

@@ -27,5 +27,5 @@
 .python-version
 LICENSE
 README.md
-pers_data
+data/
 cert/

.github/workflows/docker.yml

@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - v*
+    branches:
+      - master
 
 env:
   APP_NAME: telegram-twitter-media-bot
@@ -13,6 +15,17 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.DOCKERHUB_REPO }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}.{{patch}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -25,18 +38,12 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Generate APP Version
-        run: echo APP_VERSION=`git describe --tags --always` >> $GITHUB_ENV
       -
         name: Build and push
         uses: docker/build-push-action@v5
         with:
           push: true
-          platforms: |
-            linux/amd64
           build-args: |
             APP_NAME=${{ env.APP_NAME }}
-            APP_VERSION=${{ env.APP_VERSION }}
+          tags: ${{ steps.meta.outputs.tags }}
-          tags: |
+          labels: ${{ steps.meta.outputs.labels }}
-            ${{ env.DOCKERHUB_REPO }}:latest
-            ${{ env.DOCKERHUB_REPO }}:${{ env.APP_VERSION }}

.gitignore

@@ -1,6 +1,6 @@
 **/.idea
 __pycache__/
 cert/
-pers_data
+data/
 docker-compose.yml
-x.py
+utils/x.py

Dockerfile

@@ -7,7 +7,7 @@ ENV PYTHONUNBUFFERED=1
 
 RUN set -eux; \
 	apt-get update; \
-	apt-get install -y gosu; \
+	apt-get install -y git gosu; \
 	rm -rf /var/lib/apt/lists/*; \
 # verify that the binary works
 	gosu nobody true

common.py

@@ -1,9 +1,17 @@
-import logging
-import re
 import os
 
+try:
+    import uvloop
+    import asyncio
+
+    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+except ImportError:
+    uvloop = None
+
 BOT_TOKEN = os.getenv("BOT_TOKEN")
-ADMIN = os.getenv("ADMIN").split(",")
+ADMIN = [int(i) for i in os.getenv("BOT_ADMIN").split(",")]
+
+PIXIV_REFRESH_TOKEN = os.getenv("PIXIV_REFRESH_TOKEN")
 
 WEBHOOK = os.getenv("WEBHOOK", False)
 if WEBHOOK:
@@ -13,13 +21,3 @@ if WEBHOOK:
     WEBHOOK_KEY = os.getenv("WEBHOOK_KEY", "cert/private.key")
     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_media_regex = re.compile(r"^(?:https?://)(pbs|video)\.twimg\.com/(.*)")
-x_tco_regex = re.compile(r"(?:https?://)t\.co/.+$", re.M)
-
-logging.basicConfig(
-    level=os.getenv("LOG_LEVEL", "WARNING"),
-    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-)
-logger = logging.getLogger(__name__)

docker-compose.yml.example

@@ -1,13 +1,13 @@
-version: '3.7'
 services:
   tgxmb: image: yoursfunny/telegram-twitter-media-bot: latest
     restart: always
-    ports:
+#    ports:
-      - "8443:8443"
+#      - "8443:8443"
     environment:
       LOCAL_USER_ID: '1000'
       BOT_TOKEN: ''
       BOT_ADMIN: ''
+      PIXIV_REFRESH_TOKEN: ''
       WEBHOOK: false
       WEBHOOK_LISTEN: '127.0.0.1'
       WEBHOOK_PORT: 8443
@@ -16,6 +16,7 @@ services:
       WEBHOOK_CERT: './cert/cert.pem'
       WEBHOOK_SECRET_TOKEN: 'secret-token'
 #      LOG_LEVEL: 'WARNING'
-#    volumes:
+volumes:
+      - ./data: /app/data
 #      - ./cert:/app/cert
     container_name: tgxmb

main.py

@@ -1,77 +1,172 @@
-from aiohttp import ClientSession
+from __future__ import annotations
-from telegram import Update, Chat
+
-from telegram.constants import ParseMode, ChatAction
+import html
-from telegram.ext import (
+from functools import wraps
-    Application,
+from typing import TYPE_CHECKING
-    ApplicationBuilder,
+
-    ContextTypes,
+from telegram import InlineKeyboardButton, InlineKeyboardMarkup
-    Defaults,
+from telegram.constants import ChatAction, ChatType, ParseMode
-    filters,
+from telegram.ext import (ApplicationBuilder, CallbackQueryHandler, CommandHandler, Defaults,
-    InlineQueryHandler,
+                          InlineQueryHandler, MessageHandler, PicklePersistence, filters)
-    PicklePersistence,
-    MessageHandler, CommandHandler
-)
 
 import common
-from tweet import TGTweet
+import utils.regex as regex
+from utils.logger import get_logger
+from utils.net import NetClient
+from utils.pixiv import ProcessPixiv
+from utils.telegram import Telegram
+
+if TYPE_CHECKING:
+    from telegram import Message, Update
+    from telegram.ext import Application, ContextTypes
+
+logger = get_logger(__name__)
+
+
+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 == "":
         return
-    async with TGTweet(context.bot_data['client'], query) as tweet:
+    logger.info(f"Query: {query}")
-        result = list(tweet.inline_query_generator)
+    async with Telegram(query) as tweet:
-        await update.inline_query.answer(result)
+        if not tweet:
+            return
+        await update.inline_query.answer(tweet.inline_query_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
-    async with TGTweet(context.bot_data['client'], url) as tweet:
+    logger.info(f"Receiving url: {url}")
-        media = list(tweet.pm_media_generator)
+    async with Telegram(url) as tweet:
-        message_sent = await update.effective_message.reply_media_group(
+        media = tweet.message_media_result()
-            media, caption=tweet.message_text,
+        if not media:
-            # reply_to_message_id=update.message.message_id
+            await update.effective_message.reply_text("No media found or media type is not supported.")
+            return
+        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(media[0], tuple) 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. [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 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_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
+    template = context.user_data.get('template', None)
+    message_url = '<a href="{0}">{1}</a>'
+    url = context.user_data['message_url']
+    if template:
+        update_text = template.replace("[]", message_url.format(
+            url,
+            html.escape(update.message.text)
+        ))
+    else:
+        update_text = html.escape(update.message.text)
+        match = regex.message_url.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(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
     channel = context.args[0]
     try:
-        channel: Chat = context.bot.get_chat(channel)
+        channel = await context.bot.get_chat(channel)
     except Exception as e:
         await update.effective_message.reply_text(str(e))
         return
-    if channel.type != "CHANNEL":
+    if channel.type != ChatType.CHANNEL:
         await update.effective_message.reply_text("That is not a channel.")
         return
-    channel_admin = await channel.get_administrators()
+    try:
+        channel_admin = await channel.get_administrators()
+    except Exception as e:
+        await update.effective_message.reply_text(str(e) + "\nPlease add the bot to the channel and set as admin")
+        return
+    user = filter(lambda x: x.user.id == update.effective_user.id, channel_admin)
+    user = next(user, None)
+    if not user:
+        await update.effective_message.reply_text("You are not an admin of the channel.")
+        return
     user_bot = filter(lambda x: x.user.id == context.bot.id, channel_admin)
     user_bot = next(user_bot, None)
-    if not user_bot:
-        await update.effective_message.reply_text("I am not an admin in that channel.")
-        return
     if user_bot.can_post_messages:
         context.user_data['forward_channel_id'] = channel.id
         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.")
@@ -79,6 +174,41 @@ 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_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),
@@ -87,7 +217,9 @@ 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)
-    application.bot_data['client'] = ClientSession()
+    NetClient.init_client()
+    if common.PIXIV_REFRESH_TOKEN:
+        await ProcessPixiv.init_client(common.PIXIV_REFRESH_TOKEN)
 
 
 async def post_stop(application: Application) -> None:
@@ -95,13 +227,12 @@ async def post_stop(application: Application) -> None:
 
 
 async def post_shutdown(application: Application) -> None:
-    await application.bot_data['client'].close()
+    await NetClient.close_client()
 
 
 def main():
     defaults = Defaults(parse_mode=ParseMode.HTML, allow_sending_without_reply=True)
-    persistence = PicklePersistence(filepath='pers_data')
+    persistence = PicklePersistence(filepath='data/pers.pkl')
-    # proxy_url = 'http://127.0.0.1:10809'
     application = (ApplicationBuilder()
                    .token(common.BOT_TOKEN)
                    .defaults(defaults)
@@ -109,20 +240,25 @@ def main():
                    .post_init(post_init)
                    .post_stop(post_stop)
                    .post_shutdown(post_shutdown)
-                   # .proxy(proxy_url)
+                   .concurrent_updates(True)
-                   # .get_updates_proxy(proxy_url)
+                   .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, reply_media),
+        InlineQueryHandler(inline_query),
-        # MessageHandler(None, reply_media),
+        MessageHandler((filters.Regex(regex.x_url) | filters.Regex(regex.pixiv_url)) & filters.ChatType.PRIVATE,
-        InlineQueryHandler(inline_query, common.x_url_regex),
+                       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,4 @@
-python-telegram-bot[webhooks]~=21.0.1
+python-telegram-bot[webhooks]~=21.3
-aiohttp[speedups]~=3.9.3
+httpx[http2]~=0.27
+uvloop~=0.19.0; sys_platform != 'win32'
+async-pixiv @ git+https://github.com/TheFunny/async-pixiv@main

tweet.py

@@ -1,201 +0,0 @@
-from typing import Generator
-
-from aiohttp import ClientSession
-from telegram import (
-    InlineQueryResultPhoto,
-    InlineQueryResultVideo,
-    InputMediaPhoto,
-    InputMediaVideo
-)
-from common import x_url_regex, x_media_regex, x_tco_regex
-
-twimg_url = 'https://pbs.twimg.com/'
-vx_api_url = 'https://api.vxtwitter.com/status/'
-
-message_raw_text = """{url}
-<a href="{author_url}">{author}</a>: {text}
-"""
-
-
-async def fetch_json(session: ClientSession, url: str) -> dict:
-    async with session.get(url) as response:
-        assert response.status == 200
-        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
-
-    @property
-    def _uri(self) -> str | None:
-        match = x_media_regex.match(self._url)
-        if match:
-            return match.group(2).removesuffix('.jpg')
-        return None
-
-    @property
-    def url(self) -> str:
-        match self._type:
-            case "image":
-                return f"{twimg_url}{self._uri}?format=jpg&name=orig"
-            case "video":
-                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
-
-    @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):
-    def __init__(self, session: ClientSession, url: str):
-        self._session: ClientSession = session
-        self._url: str = url
-        self._id: str = self._tweet_id
-        assert self._id
-
-    async def __aenter__(self):
-        self._tweet: dict = await self._fetch_tweet(self._id)
-        super().__init__(*self._init_properties)
-        return self
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        pass
-
-    async def _fetch_tweet(self, tweet_id: str) -> dict:
-        return await fetch_json(self._session, vx_api_url + tweet_id)
-
-    @property
-    def _tweet_id(self) -> str | None:
-        match = x_url_regex.match(self._url)
-        if match:
-            return match.group(1).strip('/')
-        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:
-        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 self._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):
-            if tweet_media.type == "image":
-                yield InlineQueryResultPhoto(
-                    id=self.id,
-                    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
-                )
-            elif tweet_media.type == "video":
-                yield InlineQueryResultVideo(
-                    id=self.id,
-                    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
-                )
-
-    @property
-    def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo, None, None]:
-        for tweet_media in self.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
-                )

utils/logger.py

@@ -0,0 +1,11 @@
+import logging
+import os
+
+logging.basicConfig(
+    level=os.getenv("LOG_LEVEL", "WARNING"),
+    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s'
+)
+
+
+def get_logger(name: str) -> logging.Logger:
+    return logging.getLogger(name)

utils/net.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from httpx import AsyncClient
+
+
+def create_client() -> AsyncClient:
+    return AsyncClient(http2=True)
+
+
+async def close_client(_client: AsyncClient) -> None:
+    return await _client.aclose()
+
+
+async def fetch_json(_client: AsyncClient, url: str) -> dict:
+    response = await _client.get(url)
+    assert response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
+    return response.json()
+
+
+class NetClient:
+    _httpx_client: AsyncClient
+
+    @classmethod
+    def init_client(cls) -> None:
+        cls._httpx_client = create_client()
+
+    @classmethod
+    async def close_client(cls) -> None:
+        await close_client(cls._httpx_client)
+
+    @classmethod
+    def get_client(cls) -> AsyncClient:
+        return cls._httpx_client
+
+    @classmethod
+    async def fetch_json(cls, url: str) -> dict:
+        return await fetch_json(cls._httpx_client, url)

utils/pixiv.py

@@ -0,0 +1,212 @@
+from __future__ import annotations
+
+import html
+from typing import Generator, Literal, TYPE_CHECKING
+from uuid import uuid4
+
+from async_pixiv import PixivClient
+from async_pixiv.error import ApiError
+from telegram import InlineQueryResultPhoto, InputMediaPhoto
+
+from utils.logger import get_logger
+
+if TYPE_CHECKING:
+    from async_pixiv.model.illust import Illust
+    from utils.types import TypeInlineQueryResult, TypeMessageMediaResult
+
+logger = get_logger(__name__)
+
+message_raw_text = """<a href="{url}">{text}</a> / <a href="{author_url}">{author}</a>
+{tags}
+"""
+
+
+class PixivMedia:
+    __slots__ = ('_url', '_thumb')
+
+    def __init__(self, url: str, thumb: str):
+        self._url: str = url
+        self._thumb: str = thumb
+
+    def __str__(self):
+        return f"PixivMedia(url={self.url}, thumb={self.thumb}, large={self.large})"
+
+    @property
+    def url(self) -> str:
+        return self._url
+
+    @property
+    def thumb(self) -> str:
+        return self._thumb
+
+    @property
+    def large(self) -> str:
+        url = self._url.replace("img-original", "img-master").removesuffix(".jpg").removesuffix(".png")
+        return url + "_master1200.jpg"
+
+
+class Pixiv:
+    __slots__ = ('_illust',)
+
+    def __init__(self, illust: Illust):
+        self._illust: Illust = illust
+
+    @property
+    def url(self) -> str:
+        return str(self._illust.link).rstrip('/')
+
+    @property
+    def type(self) -> Literal["illust", "manga", "ugoira"]:
+        return self._illust.type.value
+
+    @property
+    def title(self) -> str:
+        return self._illust.title
+
+    @property
+    def author(self) -> str:
+        return self._illust.user.name
+
+    @property
+    def author_url(self) -> str:
+        return str(self._illust.user.link).rstrip('/')
+
+    @property
+    def description(self) -> str:
+        return self._illust.caption
+
+    @property
+    def tags(self) -> list[str]:
+        return [tag.name for tag in self._illust.tags]
+
+    @property
+    def is_multiple_pages(self) -> bool:
+        return self._illust.page_count > 1
+
+    @property
+    def is_nsfw(self) -> bool:
+        return self._illust.is_nsfw
+
+    @property
+    def is_ai(self) -> bool:
+        return self._illust.ai_type.value == 2
+
+    @property
+    def images(self) -> list[PixivMedia]:
+        if self.is_multiple_pages:
+            return [
+                PixivMedia(
+                    url=page.image_urls.original,
+                    thumb=page.image_urls.medium
+                )
+                for page in self._illust.meta_pages
+            ]
+        else:
+            return [
+                PixivMedia(  # should observe if image_url.original is always None for single page
+                    url=self._illust.image_urls.original or self._illust.meta_single_page.original,
+                    thumb=self._illust.image_urls.medium
+                )
+            ]
+
+
+class ProcessPixiv:
+    _client: PixivClient
+
+    __slots__ = ('_url', '_illust')
+
+    @classmethod
+    async def init_client(cls, token: str) -> None:
+        cls._client = PixivClient()
+        await cls._client.login_with_token(token)
+        cls._token = token
+
+    @classmethod
+    async def close_client(cls) -> None:
+        await cls._client.close()
+
+    @classmethod
+    async def refresh_token(cls):
+        await cls._client.login_with_token(cls._token)
+
+    def __init__(self, url: str):
+        self._url: str = url
+
+    async def __aenter__(self):
+        self._illust = await self._fetch_illust()
+        return Pixiv(self._illust)
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    async def _fetch_illust(self) -> Illust:
+        illust_id = self._parse_illust_id()
+        try:
+            return (await self._client.ILLUST.detail(illust_id)).illust
+        except ApiError:
+            await self.refresh_token()
+            return (await self._client.ILLUST.detail(illust_id)).illust  # TODO use retry here
+
+    def _parse_illust_id(self) -> int:
+        return int(self._url.split("/")[-1])
+
+
+class TelegramPixiv:
+    __slots__ = ('_url', '_pixiv')
+
+    def __init__(self, url: str):
+        self._url = url
+
+    async def __aenter__(self):
+        async with ProcessPixiv(self._url) as pixiv:
+            self._pixiv = pixiv
+        return self
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass
+
+    def url(self) -> str:
+        return self._url
+
+    @property
+    def message_text(self) -> str:
+        pixiv = self._pixiv
+        return message_raw_text.format(
+            url=pixiv.url,
+            author_url=pixiv.author_url,
+            author=html.escape(pixiv.author),
+            text=html.escape(pixiv.title),
+            tags=html.escape(" ".join(f"#{name}" for name in pixiv.tags))
+        )
+
+    def inline_query_result(self) -> tuple[TypeInlineQueryResult, ...]:
+        return tuple(self.inline_query_generator())
+
+    def message_media_result(self) -> tuple[TypeMessageMediaResult, ...]:
+        return tuple(self.message_media_generator())
+
+    def inline_query_generator(self) -> Generator[TypeInlineQueryResult, None, None]:
+        pixiv = self._pixiv
+        for media in pixiv.images:
+            logger.info(str(media))
+            if pixiv.type in ("illust", "manga"):
+                yield InlineQueryResultPhoto(
+                    id=str(uuid4()),
+                    photo_url=media.large,
+                    thumbnail_url=media.thumb,
+                    caption=self.message_text
+                )
+            else:
+                yield
+
+    def message_media_generator(self) -> Generator[TypeMessageMediaResult, None, None]:
+        pixiv = self._pixiv
+        for media in pixiv.images:
+            logger.info(str(media))
+            if pixiv.type in ("illust", "manga"):
+                yield InputMediaPhoto(
+                    media=media.large,
+                    has_spoiler=pixiv.is_nsfw
+                )
+            else:
+                yield

utils/regex.py

@@ -0,0 +1,8 @@
+import re
+
+x_url = re.compile(r"^(?:https?://)?(?:www\.|mobile\.)?(?:x|twitter|fixvx|vxtwitter)\.com/(.+)/status/(\d+)")
+x_media_url = re.compile(r"^(?:https?://)(pbs|video)\.twimg\.com/(.*)")
+x_tco_url = re.compile(r"(?:https?://)t\.co/.+$", re.M)
+message_url = re.compile(r"\[.+]", re.S)
+
+pixiv_url = re.compile(r"^(?:https?://)?(?:www\.)?pixiv\.net/(?:en/)?(?:artworks/|i/)(\d+)")

utils/telegram.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from common import PIXIV_REFRESH_TOKEN
+from .pixiv import TelegramPixiv
+from .regex import pixiv_url, x_url
+from .tweet import TelegramTweet
+
+
+class Telegram:
+    def __init__(self, url: str):
+        self._url = url
+
+    async def __aenter__(self):
+        if x_url.match(self._url):
+            async with TelegramTweet(self._url) as tweet:
+                return tweet
+        elif PIXIV_REFRESH_TOKEN and pixiv_url.match(self._url):
+            async with TelegramPixiv(self._url) as pixiv:
+                return pixiv
+        else:
+            return None  # TODO add raise and catch
+
+    async def __aexit__(self, exc_type, exc_val, exc_tb):
+        pass

utils/tweet.py

@@ -0,0 +1,250 @@
+from __future__ import annotations
+
+import html
+from functools import cached_property
+from typing import Generator, TYPE_CHECKING
+from uuid import uuid4
+
+from telegram import (InlineQueryResultMpeg4Gif, InlineQueryResultPhoto, InlineQueryResultVideo, InputMediaPhoto,
+                      InputMediaVideo)
+
+from .logger import get_logger
+from .net import NetClient
+from .regex import x_media_url, x_tco_url, x_url
+
+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}
+"""
+
+
+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_url.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__ = ('_url', '_tweet')
+
+    def __init__(self, url: str):
+        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.match(self._url)
+        assert match, f"Invalid URL: {self._url}"
+        auther_id, tweet_id = match.groups()
+        return await NetClient.fetch_json(vx_api_url.format(auther_id, tweet_id))
+
+    @property
+    def _tweet_text(self) -> str:
+        match = x_tco_url.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__ = ('_url', '_tweet', '__dict__')
+
+    def __init__(self, url: str):
+        self._url: str = url
+
+    async def __aenter__(self):
+        async with ProcessTweet(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)
+        )
+
+    def inline_query_result(self) -> tuple[TypeInlineQueryResult, ...]:
+        return tuple(self.inline_query_generator())
+
+    def message_media_result(self) -> tuple[TypeMessageMediaResult, ...]:
+        return tuple(self.message_media_generator())
+
+    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
+                )
+
+    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
+                )

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