mirror of
https://github.com/TheFunny/TelegramTwitterMediaBot.git
synced 2026-09-23 23:32:05 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7d144f2ee
|
||
|
|
081ee595b1
|
||
|
|
4272454f9a
|
||
|
|
7d289c9db7
|
@@ -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"\{\w+\}", re.M)
|
message_url_regex = re.compile(r"\{.+\}", re.S)
|
||||||
|
|
||||||
logging.basicConfig(
|
logging.basicConfig(
|
||||||
level=os.getenv("LOG_LEVEL", "WARNING"),
|
level=os.getenv("LOG_LEVEL", "WARNING"),
|
||||||
|
|||||||
@@ -56,7 +56,8 @@ 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="{}"),
|
reply_markup=ForceReply(selective=True, input_field_placeholder="{URL}"),
|
||||||
|
reply_to_message_id=update.message.message_id,
|
||||||
)
|
)
|
||||||
context.user_data['message_reply'] = message_reply
|
context.user_data['message_reply'] = message_reply
|
||||||
context.user_data['message_to_send'] = message_to_send
|
context.user_data['message_to_send'] = message_to_send
|
||||||
@@ -69,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))
|
||||||
|
|
||||||
@@ -84,8 +87,9 @@ 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
|
||||||
update_text = update.message.text
|
update_text = update.message.text
|
||||||
match = common.message_url_regex.search(update_text).span()
|
match = common.message_url_regex.search(update_text)
|
||||||
if match:
|
if match:
|
||||||
|
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'], 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]:]
|
||||||
|
|||||||
Reference in New Issue
Block a user