mir/microbot
2
0
Fork 0
mirror of https://github.com/Nick80835/microbot synced 2025-08-22 10:09:40 +00:00
Code Issues Releases Wiki Activity

add lenient commands

Browse Source
This commit is contained in:
Nick80835 2025-06-19 07:31:45 -04:00
parent f82680b334
commit 6a13085bd4
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ubot/command_handler.py
View File

@ -1,4 +1,5 @@
import asyncio import asyncio
from functools import partial
from inspect import isawaitable from inspect import isawaitable
from random import randint from random import randint
from re import DOTALL, IGNORECASE, escape, search from re import DOTALL, IGNORECASE, escape, search
@ -25,6 +26,7 @@ MODERATION_COMMAND_COOLDOWN_SEC = 3
class CommandHandler(): class CommandHandler():
incoming_commands = [] incoming_commands = []
incoming_lenient_commands = []
inline_photo_commands = [] inline_photo_commands = []
inline_article_commands = [] inline_article_commands = []
callback_queries = [] callback_queries = []
@ -36,22 +38,23 @@ class CommandHandler():
self.logger = loader.logger self.logger = loader.logger
self.db = loader.db self.db = loader.db
self.hard_prefix = self.settings.get_list("hard_cmd_prefix") or ["/"] self.hard_prefix = self.settings.get_list("hard_cmd_prefix") or ["/"]
self.micro_bot.client.add_event_handler(self.report_incoming_excepts, events.NewMessage(incoming=True, forwards=False, func=lambda e: e.raw_text)) self.micro_bot.client.add_event_handler(partial(self.report_incoming_excepts, self.incoming_commands), events.NewMessage(incoming=True, forwards=False, func=lambda e: e.raw_text))
self.micro_bot.client.add_event_handler(partial(self.report_incoming_excepts, self.incoming_lenient_commands), events.NewMessage(incoming=True))
self.micro_bot.client.add_event_handler(self.handle_inline, events.InlineQuery()) self.micro_bot.client.add_event_handler(self.handle_inline, events.InlineQuery())
self.micro_bot.client.add_event_handler(self.handle_callback_query, events.CallbackQuery()) self.micro_bot.client.add_event_handler(self.handle_callback_query, events.CallbackQuery())
async def report_incoming_excepts(self, event): async def report_incoming_excepts(self, command_list, event):
try: try:
await self.handle_incoming(event) await self.handle_incoming(event, command_list)
except Exception as exception: except Exception as exception:
if not isinstance(exception, (ChatAdminRequiredError, ChatWriteForbiddenError)): if not isinstance(exception, (ChatAdminRequiredError, ChatWriteForbiddenError)):
await event.client.send_message(int(self.settings.get_list("owner_id")[0]), str(format_exc())) await event.client.send_message(int(self.settings.get_list("owner_id")[0]), str(format_exc()))
async def handle_incoming(self, event: ExtendedNewMessage): async def handle_incoming(self, event: ExtendedNewMessage, command_list: list[Command]):
chat_db = self.db.get_chat((await event.get_chat()).id) chat_db = self.db.get_chat((await event.get_chat()).id)
chat_prefix = chat_db.prefix chat_prefix = chat_db.prefix
for command in self.incoming_commands: for command in command_list:
if command.simple_pattern: if command.simple_pattern:
pattern_match = search(SIMPLE_PATTERN_TEMPLATE.format(command.pattern + command.pattern_extra), event.raw_text, IGNORECASE|DOTALL) pattern_match = search(SIMPLE_PATTERN_TEMPLATE.format(command.pattern + command.pattern_extra), event.raw_text, IGNORECASE|DOTALL)
elif command.raw_pattern: elif command.raw_pattern:

10
ubot/loader.py
View File

@ -56,6 +56,7 @@ class Loader():
def reload_all_modules(self): def reload_all_modules(self):
self.command_handler.incoming_commands = [] self.command_handler.incoming_commands = []
self.command_handler.incoming_lenient_commands = []
self.command_handler.inline_photo_commands = [] self.command_handler.inline_photo_commands = []
self.command_handler.inline_article_commands = [] self.command_handler.inline_article_commands = []
self.command_handler.callback_queries = [] self.command_handler.callback_queries = []
@ -82,6 +83,15 @@ class Loader():
return decorator return decorator
def add_lenient(self, pattern: str = None, **args):
def decorator(func):
args["pattern"] = args.get("pattern", pattern)
self.command_handler.incoming_lenient_commands.append(Command(func, args))
return func
return decorator
def add_list(self, pattern: list = None, **args): def add_list(self, pattern: list = None, **args):
pattern_list = args.get("pattern", pattern) pattern_list = args.get("pattern", pattern)