Compare commits

...
1 Commits
Author SHA1 Message Date
YoursFunny 8fb53e8412 fix session 2024-03-23 00:17:59 +08:00
2 changed files with 15 additions and 6 deletions
+4 -4
View File
@@ -22,7 +22,7 @@ async def inline_query(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
if query == "": if query == "":
return return
common.logger.info(f"Query: {query}") common.logger.info(f"Query: {query}")
async with TGTweet(context.bot_data['client'], query) as tweet: async with TGTweet(query) as tweet:
result = list(tweet.inline_query_generator) result = list(tweet.inline_query_generator)
await update.inline_query.answer(result) await update.inline_query.answer(result)
@@ -32,7 +32,7 @@ async def reply_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> Non
# url = update.message.text.split(" ")[0] # url = update.message.text.split(" ")[0]
url = update.message.text url = update.message.text
common.logger.info(f"Receiving url: {url}") common.logger.info(f"Receiving url: {url}")
async with TGTweet(context.bot_data['client'], url) as tweet: async with TGTweet(url) as tweet:
media = list(tweet.pm_media_generator) media = list(tweet.pm_media_generator)
message_sent = await update.effective_message.reply_media_group( message_sent = await update.effective_message.reply_media_group(
media, media,
@@ -92,7 +92,7 @@ async def post_init(application: Application) -> None:
DESCRIPTION = "A bot to fetch tweets from Twitter." DESCRIPTION = "A bot to fetch tweets from Twitter."
await application.bot.set_my_description(DESCRIPTION) await application.bot.set_my_description(DESCRIPTION)
await application.bot.set_my_short_description(DESCRIPTION) await application.bot.set_my_short_description(DESCRIPTION)
application.bot_data['client'] = ClientSession() TGTweet.set_session(ClientSession())
async def post_stop(application: Application) -> None: async def post_stop(application: Application) -> None:
@@ -100,7 +100,7 @@ async def post_stop(application: Application) -> None:
async def post_shutdown(application: Application) -> None: async def post_shutdown(application: Application) -> None:
await application.bot_data['client'].close() await TGTweet.close_session()
def main(): def main():
+11 -2
View File
@@ -109,8 +109,9 @@ class Tweet:
class TGTweet(Tweet): class TGTweet(Tweet):
def __init__(self, session: ClientSession, url: str): _session: ClientSession
self._session: ClientSession = session
def __init__(self, url: str):
self._url: str = url self._url: str = url
self._api_param: tuple[str] = self._tweet_id self._api_param: tuple[str] = self._tweet_id
assert self._api_param assert self._api_param
@@ -123,6 +124,14 @@ class TGTweet(Tweet):
async def __aexit__(self, exc_type, exc_val, exc_tb): async def __aexit__(self, exc_type, exc_val, exc_tb):
pass 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: async def _fetch_tweet(self, api_param: tuple[str]) -> dict:
return await fetch_json(self._session, vx_api_url.format(*api_param)) return await fetch_json(self._session, vx_api_url.format(*api_param))