From f6fc04c6036bebf5466ecf7529b763b5733e248f Mon Sep 17 00:00:00 2001 From: thedragonsinn <98635854+thedragonsinn@users.noreply.github.com> Date: Thu, 16 May 2024 13:47:41 +0530 Subject: [PATCH] adjust code according to core. --- app/plugins/tg_tools/get_message.py | 11 +++++++++-- app/plugins/tg_tools/pm_n_tag_logger.py | 10 ++++++++-- app/plugins/tg_tools/pm_permit.py | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/app/plugins/tg_tools/get_message.py b/app/plugins/tg_tools/get_message.py index e0530e0..de4261b 100644 --- a/app/plugins/tg_tools/get_message.py +++ b/app/plugins/tg_tools/get_message.py @@ -21,16 +21,23 @@ async def get_message(bot: BOT, message: Message): """ if not message.input: await message.reply("Give a Message link.") + return + attr = None + if len(message.text_list) == 3: link, attr = message.text_list[1:] else: link = message.input.strip() + remote_message = await bot.get_messages(*parse_link(link)) + if not attr: - await message.reply(str(remote_message)) + await message.reply(f"```{remote_message}```") return + if hasattr(remote_message, attr): - await message.reply(f"
{getattr(remote_message, attr)}")
+ await message.reply(f"```{getattr(remote_message, attr)}```")
return
+
await message.reply(f"Message object has no attribute '{attr}'")
diff --git a/app/plugins/tg_tools/pm_n_tag_logger.py b/app/plugins/tg_tools/pm_n_tag_logger.py
index 1b5afbe..32b85d3 100644
--- a/app/plugins/tg_tools/pm_n_tag_logger.py
+++ b/app/plugins/tg_tools/pm_n_tag_logger.py
@@ -73,6 +73,7 @@ basic_filters = (
& filters.private
& filters.create(lambda _, __, ___: extra_config.PM_LOGGER),
group=2,
+ is_command=False,
)
async def pm_logger(bot: BOT, message: Message):
cache_message(message)
@@ -82,7 +83,9 @@ tag_filter = filters.create(lambda _, __, ___: extra_config.TAG_LOGGER)
@bot.on_message(
- filters=(basic_filters & filters.reply & tag_filter) & ~filters.private, group=2
+ filters=(basic_filters & filters.reply & tag_filter) & ~filters.private,
+ group=2,
+ is_command=False,
)
async def reply_logger(bot: BOT, message: Message):
if (
@@ -95,7 +98,9 @@ async def reply_logger(bot: BOT, message: Message):
@bot.on_message(
- filters=(basic_filters & filters.mentioned & tag_filter) & ~filters.private, group=2
+ filters=(basic_filters & filters.mentioned & tag_filter) & ~filters.private,
+ group=2,
+ is_command=False,
)
async def mention_logger(bot: BOT, message: Message):
for entity in message.entities or []:
@@ -112,6 +117,7 @@ async def mention_logger(bot: BOT, message: Message):
filters=(basic_filters & (filters.text | filters.media) & tag_filter)
& ~filters.private,
group=2,
+ is_command=False,
)
async def username_logger(bot: BOT, message: Message):
text = message.text or message.caption or ""
diff --git a/app/plugins/tg_tools/pm_permit.py b/app/plugins/tg_tools/pm_permit.py
index 01adb34..d8f70a1 100644
--- a/app/plugins/tg_tools/pm_permit.py
+++ b/app/plugins/tg_tools/pm_permit.py
@@ -32,6 +32,7 @@ async def init_task():
& ~filters.chat(chats=[bot.me.id])
& ~filters.service,
group=0,
+ is_command=False,
)
async def handle_new_pm(bot: BOT, message: Message):
user_id = message.from_user.id
@@ -65,6 +66,7 @@ async def handle_new_pm(bot: BOT, message: Message):
& (~allowed_filter & ~filters.bot)
& ~filters.chat(chats=[bot.me.id]),
group=2,
+ is_command=False,
)
async def auto_approve(bot: BOT, message: Message):
message = Message.parse(message=message)