Compare commits

..
3 Commits
Author SHA1 Message Date
YoursFunny 74f42a2df3 fix status code check 2024-06-20 02:51:20 +08:00
YoursFunny ae1f5a8c8c rename 2024-06-20 02:48:06 +08:00
YoursFunny 38adbf0cb8 use cached property 2024-06-20 02:40:35 +08:00
2 changed files with 18 additions and 18 deletions
+5 -5
View File
@@ -36,7 +36,7 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
if query == "":
return
logger.info(f"Query: {query}")
async with TGTweet(query) as tweet:
async with TelegramTweet(query) as tweet:
result = list(tweet.inline_query_generator)
await update.inline_query.answer(result)
@@ -45,8 +45,8 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
url = update.message.text
logger.info(f"Receiving url: {url}")
async with TGTweet(url) as tweet:
media = list(tweet.pm_media_generator)
async with TelegramTweet(url) as tweet:
media = list(tweet.message_media_generator)
message_to_send = await update.effective_message.reply_media_group(
media,
caption=tweet.message_text,
@@ -204,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.init_client()
TelegramTweet.init_client()
async def post_stop(application: Application) -> None:
@@ -212,7 +212,7 @@ async def post_stop(application: Application) -> None:
async def post_shutdown(application: Application) -> None:
await TGTweet.close_client()
await TelegramTweet.close_client()
def main():
+13 -13
View File
@@ -14,6 +14,15 @@ from common import get_logger, x_media_regex, x_tco_regex, x_url_regex
if TYPE_CHECKING:
from typing import Generator, TypedDict
class TweetInfo(TypedDict):
tweetID: str
user_name: str
user_screen_name: str
text: str
media_extended: list[dict]
possibly_sensitive: bool
logger = get_logger(__name__)
@@ -36,7 +45,7 @@ async def close_client(_client: AsyncClient) -> None:
async def fetch_json(_client: AsyncClient, url: str) -> dict:
logger.info(f"Fetching {url}")
response = await _client.get(url)
assert response.status_code == response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
assert response.is_success, f"Failed to fetch {url}, status code {response.status_code}"
return response.json()
@@ -135,16 +144,6 @@ class Tweet:
return self._sensitive
class TGTweet(Tweet):
class TweetInfo(TypedDict):
tweetID: str
user_name: str
user_screen_name: str
text: str
media_extended: list[dict]
possibly_sensitive: bool
class ProcessTweet:
__slots__ = ('_httpx_client', '_url', '_tweet')
@@ -189,7 +188,8 @@ class ProcessTweet:
]
class TelegramTweet:
class TelegramTweet(Tweet):
_httpx_client: AsyncClient
def __init__(self, url: str):
self._url: str = url
@@ -293,7 +293,7 @@ class TelegramTweet:
)
@property
def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo | tuple[str, bool], None, None]:
def message_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":