mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ffa9903c4
|
||
|
|
248e7d48e0
|
||
|
|
e915cd13de
|
||
|
|
a7d144f2ee
|
||
|
|
081ee595b1
|
@@ -70,11 +70,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 m.copy(context.user_data['forward_channel_id'])
|
||||
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))
|
||||
|
||||
@@ -105,8 +107,6 @@ async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TY
|
||||
await forward_message(update, context, message_to_send)
|
||||
await update.callback_query.answer('✅ Forwarded')
|
||||
await update.callback_query.edit_message_reply_markup()
|
||||
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']
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import html
|
||||
from typing import Generator
|
||||
|
||||
from aiohttp import ClientSession
|
||||
@@ -183,12 +184,13 @@ class TGTweet(Tweet):
|
||||
return message_raw_text.format(
|
||||
url=self.url,
|
||||
author_url=self.author_url,
|
||||
author=self.author,
|
||||
text=self.text
|
||||
author=html.escape(self.author),
|
||||
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 +198,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 +207,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 | InputMediaAnimation, None, None]:
|
||||
for tweet_media in self.media:
|
||||
logger.info(str(tweet_media))
|
||||
if tweet_media.type == "image":
|
||||
|
||||
Reference in New Issue
Block a user