mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ca9b55ea8
|
||
|
|
ef17b05c14
|
@@ -17,7 +17,7 @@ if WEBHOOK:
|
|||||||
x_url_regex = re.compile(r"^(?:https?://)(?:www\.|mobile\.|)(?:x|twitter)\.com/(.+)/status/(\d+)")
|
x_url_regex = re.compile(r"^(?:https?://)(?:www\.|mobile\.|)(?:x|twitter)\.com/(.+)/status/(\d+)")
|
||||||
x_media_regex = re.compile(r"^(?:https?://)(pbs|video)\.twimg\.com/(.*)")
|
x_media_regex = re.compile(r"^(?:https?://)(pbs|video)\.twimg\.com/(.*)")
|
||||||
x_tco_regex = re.compile(r"(?:https?://)t\.co/.+$", re.M)
|
x_tco_regex = re.compile(r"(?:https?://)t\.co/.+$", re.M)
|
||||||
message_url_regex = re.compile(r"\{.+\}", re.S)
|
message_url_regex = re.compile(r"\[.+]", re.S)
|
||||||
|
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
level=os.getenv("LOG_LEVEL", "WARNING"),
|
level=os.getenv("LOG_LEVEL", "WARNING"),
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ async def url_media(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
|
|||||||
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(
|
||||||
"Reply to edit message.",
|
"Reply to edit message.",
|
||||||
reply_markup=ForceReply(selective=True, input_field_placeholder="{URL}"),
|
reply_markup=ForceReply(selective=True, input_field_placeholder="[URL]"),
|
||||||
reply_to_message_id=update.message.message_id,
|
reply_to_message_id=update.message.message_id,
|
||||||
)
|
)
|
||||||
context.user_data['message_reply'] = message_reply
|
context.user_data['message_reply'] = message_reply
|
||||||
@@ -87,7 +87,7 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
|
|||||||
return
|
return
|
||||||
if update.message.reply_to_message != context.user_data['message_reply']:
|
if update.message.reply_to_message != context.user_data['message_reply']:
|
||||||
return
|
return
|
||||||
update_text = 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()
|
||||||
@@ -95,8 +95,8 @@ async def edit_message(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
|
|||||||
context.user_data['message_url'], update_text[match[0] + 1:match[1] - 1]
|
context.user_data['message_url'], 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(html.escape(update_text))
|
await message_to_send[0].edit_caption(update_text)
|
||||||
await context.user_data['message_reply'].edit_message_reply_markup(
|
await context.user_data['message_reply'].edit_reply_markup(
|
||||||
InlineKeyboardMarkup.from_button(
|
InlineKeyboardMarkup.from_button(
|
||||||
InlineKeyboardButton("↩️ Confirm", callback_data="forward")
|
InlineKeyboardButton("↩️ Confirm", callback_data="forward")
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user