diff --git a/app/core/client/handler.py b/app/core/client/handler.py index 0d67637..88e4d69 100644 --- a/app/core/client/handler.py +++ b/app/core/client/handler.py @@ -14,7 +14,8 @@ async def cmd_dispatcher(bot, message) -> None: func = Config.CMD_DICT[message.cmd] coro = func(bot, message) await run_coro(coro, message) - + if message.is_from_owner: + await message.delete() @bot.on_message(filters.convo_filter, group=0) @bot.on_edited_message(filters.convo_filter, group=0) diff --git a/app/core/types/message.py b/app/core/types/message.py index 5f7c07b..4095884 100644 --- a/app/core/types/message.py +++ b/app/core/types/message.py @@ -39,6 +39,12 @@ class Message(Msg): return self.text.split(maxsplit=1)[-1] return "" + @cached_property + def is_from_owner(self) -> bool: + if self.from_user and self.from_user.id == Config.OWNER_ID: + return True + return False + @cached_property def replied(self) -> "Message": if self.reply_to_message: diff --git a/app/plugins/fbans.py b/app/plugins/fbans.py index f7d28cd..6524272 100644 --- a/app/plugins/fbans.py +++ b/app/plugins/fbans.py @@ -66,7 +66,6 @@ async def remove_fed(bot: bot, message: Message): @bot.add_cmd(cmd=["fban", "fbanp"]) async def fed_ban(bot: bot, message: Message): - await message.delete() progress: Message = await message.reply("❯") user, reason = await message.extract_user_n_reason() if isinstance(user, str):