mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
48bc81898d
|
||
|
|
f660bc2c5e
|
||
|
|
7747dab4a3
|
@@ -58,6 +58,8 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
reply_to_message_id=update.message.message_id,
|
reply_to_message_id=update.message.message_id,
|
||||||
has_spoiler=media[0][1]
|
has_spoiler=media[0][1]
|
||||||
)
|
)
|
||||||
|
if not isinstance(message_to_send, tuple):
|
||||||
|
message_to_send = (message_to_send,)
|
||||||
url = tweet.url
|
url = tweet.url
|
||||||
if context.user_data.get('edit_before_forward', False):
|
if context.user_data.get('edit_before_forward', False):
|
||||||
message_reply = await update.effective_message.reply_text(
|
message_reply = await update.effective_message.reply_text(
|
||||||
@@ -95,22 +97,24 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
|
|||||||
if update.message.reply_to_message != context.user_data['message_reply']:
|
if update.message.reply_to_message != context.user_data['message_reply']:
|
||||||
return
|
return
|
||||||
template = context.user_data.get('template', None)
|
template = context.user_data.get('template', None)
|
||||||
|
message_url = '<a href="{0}">{1}</a>'
|
||||||
|
url = context.user_data['message_url']
|
||||||
if template:
|
if template:
|
||||||
update_text = template.replace("[]", html.escape(update.message.text))
|
update_text = template.replace("[]", message_url.format(
|
||||||
|
url,
|
||||||
|
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]] + message_url.format(
|
||||||
context.user_data['message_url'],
|
url,
|
||||||
update_text[match[0] + 1:match[1] - 1]
|
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']
|
||||||
if isinstance(message_to_send, tuple):
|
await message_to_send[0].edit_text(update_text)
|
||||||
await message_to_send[0].edit_text(update_text)
|
|
||||||
else:
|
|
||||||
await message_to_send.edit_text(update_text)
|
|
||||||
|
|
||||||
|
|
||||||
async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
async def query_forward_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
||||||
|
|||||||
Reference in New Issue
Block a user