mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3dcb6e59b
|
||
|
|
a1d1dc5ea3
|
||
|
|
e629899a72
|
@@ -52,6 +52,11 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
media,
|
media,
|
||||||
caption=tweet.message_text,
|
caption=tweet.message_text,
|
||||||
reply_to_message_id=update.message.message_id,
|
reply_to_message_id=update.message.message_id,
|
||||||
|
) if not tweet.is_single_gif 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]
|
||||||
)
|
)
|
||||||
url = tweet.url
|
url = tweet.url
|
||||||
if context.user_data.get('edit_before_forward', False):
|
if context.user_data.get('edit_before_forward', False):
|
||||||
@@ -91,16 +96,16 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
|
|||||||
return
|
return
|
||||||
template = context.user_data.get('template', None)
|
template = context.user_data.get('template', None)
|
||||||
if template:
|
if template:
|
||||||
update_text = template
|
update_text = template.replace("[]", html.escape(update.message.text))
|
||||||
else:
|
else:
|
||||||
update_text = html.escape(update.message.text)
|
update_text = html.escape(update.message.text)
|
||||||
match = common.message_url_regex.search(update_text)
|
match = common.message_url_regex.search(update_text)
|
||||||
if match:
|
if match:
|
||||||
match = match.span()
|
match = match.span()
|
||||||
update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
|
update_text = update_text[:match[0]] + '<a href="{0}">{1}</a>'.format(
|
||||||
context.user_data['message_url'],
|
context.user_data['message_url'],
|
||||||
update_text[match[0] + 1:match[1] - 1] if not template else update.message.text
|
update_text[match[0] + 1:match[1] - 1]
|
||||||
) + update_text[match[1]:]
|
) + update_text[match[1]:]
|
||||||
message_to_send = context.user_data['message_to_send']
|
message_to_send = context.user_data['message_to_send']
|
||||||
await message_to_send[0].edit_caption(update_text)
|
await message_to_send[0].edit_caption(update_text)
|
||||||
|
|
||||||
@@ -173,10 +178,11 @@ async def cmd_set_template(update: Update, context: ContextTypes.DEFAULT_TYPE) -
|
|||||||
if not reply:
|
if not reply:
|
||||||
await update.effective_message.reply_text("Please reply to a message to set as template.")
|
await update.effective_message.reply_text("Please reply to a message to set as template.")
|
||||||
return
|
return
|
||||||
if '[]' in reply.text_html:
|
if '[]' not in reply.text_html:
|
||||||
context.user_data['template'] = reply.text_html
|
await update.effective_message.reply_text("Please reply to a message with [] to set as template.")
|
||||||
await update.effective_message.reply_text("Template set.")
|
return
|
||||||
await update.effective_message.reply_text("Please reply to a message with [] to set as template.")
|
context.user_data['template'] = reply.text_html
|
||||||
|
await update.effective_message.reply_text("Template set.")
|
||||||
|
|
||||||
|
|
||||||
@send_action(ChatAction.TYPING)
|
@send_action(ChatAction.TYPING)
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ from telegram import (
|
|||||||
InlineQueryResultVideo,
|
InlineQueryResultVideo,
|
||||||
InlineQueryResultMpeg4Gif,
|
InlineQueryResultMpeg4Gif,
|
||||||
InputMediaPhoto,
|
InputMediaPhoto,
|
||||||
InputMediaVideo,
|
InputMediaVideo
|
||||||
InputMediaAnimation
|
|
||||||
)
|
)
|
||||||
|
|
||||||
from common import x_url_regex, x_media_regex, x_tco_regex, logger
|
from common import x_url_regex, x_media_regex, x_tco_regex, logger
|
||||||
@@ -125,6 +124,7 @@ class TGTweet(Tweet):
|
|||||||
def __init__(self, url: str):
|
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
|
||||||
|
self._is_single_gif: bool = False
|
||||||
assert self._api_param
|
assert self._api_param
|
||||||
|
|
||||||
async def __aenter__(self):
|
async def __aenter__(self):
|
||||||
@@ -179,6 +179,10 @@ class TGTweet(Tweet):
|
|||||||
sensitive = self._tweet['possibly_sensitive']
|
sensitive = self._tweet['possibly_sensitive']
|
||||||
return id, author, author_id, text, media, sensitive
|
return id, author, author_id, text, media, sensitive
|
||||||
|
|
||||||
|
@property
|
||||||
|
def is_single_gif(self) -> bool:
|
||||||
|
return self._is_single_gif
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def message_text(self) -> str:
|
def message_text(self) -> str:
|
||||||
return message_raw_text.format(
|
return message_raw_text.format(
|
||||||
@@ -219,7 +223,7 @@ class TGTweet(Tweet):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo | InputMediaAnimation, None, None]:
|
def pm_media_generator(self) -> Generator[InputMediaPhoto | InputMediaVideo | tuple[str, bool], 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":
|
||||||
@@ -234,7 +238,10 @@ class TGTweet(Tweet):
|
|||||||
thumbnail=tweet_media.thumb
|
thumbnail=tweet_media.thumb
|
||||||
)
|
)
|
||||||
elif tweet_media.type == "gif":
|
elif tweet_media.type == "gif":
|
||||||
yield InputMediaAnimation(
|
if len(self.media) == 1:
|
||||||
|
self._is_single_gif = True
|
||||||
|
yield tweet_media.url, self.sensitive
|
||||||
|
yield InputMediaVideo(
|
||||||
media=tweet_media.url,
|
media=tweet_media.url,
|
||||||
has_spoiler=self.sensitive,
|
has_spoiler=self.sensitive,
|
||||||
thumbnail=tweet_media.thumb
|
thumbnail=tweet_media.thumb
|
||||||
|
|||||||
Reference in New Issue
Block a user