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
|
@@ -70,11 +70,13 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
async def forward_message(
|
async def forward_message(
|
||||||
update: Update,
|
update: Update,
|
||||||
context: ContextTypes.DEFAULT_TYPE,
|
context: ContextTypes.DEFAULT_TYPE,
|
||||||
message_sent: tuple[Message, ...],
|
message_to_send: tuple[Message, ...],
|
||||||
) -> None:
|
) -> None:
|
||||||
try:
|
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:
|
except Exception as e:
|
||||||
await update.effective_message.reply_text(str(e))
|
await update.effective_message.reply_text(str(e))
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import html
|
||||||
from typing import Generator
|
from typing import Generator
|
||||||
|
|
||||||
from aiohttp import ClientSession
|
from aiohttp import ClientSession
|
||||||
@@ -183,12 +184,13 @@ class TGTweet(Tweet):
|
|||||||
return message_raw_text.format(
|
return message_raw_text.format(
|
||||||
url=self.url,
|
url=self.url,
|
||||||
author_url=self.author_url,
|
author_url=self.author_url,
|
||||||
author=self.author,
|
author=html.escape(self.author),
|
||||||
text=self.text
|
text=html.escape(self.text)
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@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):
|
for i, tweet_media in enumerate(self.media):
|
||||||
logger.info(str(tweet_media))
|
logger.info(str(tweet_media))
|
||||||
if tweet_media.type == "image":
|
if tweet_media.type == "image":
|
||||||
@@ -196,7 +198,7 @@ class TGTweet(Tweet):
|
|||||||
id=str(i),
|
id=str(i),
|
||||||
photo_url=tweet_media.url,
|
photo_url=tweet_media.url,
|
||||||
thumbnail_url=tweet_media.thumb,
|
thumbnail_url=tweet_media.thumb,
|
||||||
caption=self.message_text if not i else None
|
caption=self.message_text
|
||||||
)
|
)
|
||||||
elif tweet_media.type == "video":
|
elif tweet_media.type == "video":
|
||||||
yield InlineQueryResultVideo(
|
yield InlineQueryResultVideo(
|
||||||
@@ -205,18 +207,18 @@ class TGTweet(Tweet):
|
|||||||
mime_type="video/mp4",
|
mime_type="video/mp4",
|
||||||
thumbnail_url=tweet_media.thumb,
|
thumbnail_url=tweet_media.thumb,
|
||||||
title=self.text,
|
title=self.text,
|
||||||
caption=self.message_text if not i else None
|
caption=self.message_text
|
||||||
)
|
)
|
||||||
elif tweet_media.type == "gif":
|
elif tweet_media.type == "gif":
|
||||||
yield InlineQueryResultMpeg4Gif(
|
yield InlineQueryResultMpeg4Gif(
|
||||||
id=str(i),
|
id=str(i),
|
||||||
mpeg4_url=tweet_media.url,
|
mpeg4_url=tweet_media.url,
|
||||||
thumbnail_url=tweet_media.thumb,
|
thumbnail_url=tweet_media.thumb,
|
||||||
caption=self.message_text if not i else None
|
caption=self.message_text
|
||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@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:
|
for tweet_media in self.media:
|
||||||
logger.info(str(tweet_media))
|
logger.info(str(tweet_media))
|
||||||
if tweet_media.type == "image":
|
if tweet_media.type == "image":
|
||||||
|
|||||||
Reference in New Issue
Block a user