diff --git a/ubot/command_handler.py b/ubot/command_handler.py index 0b6897d..1f73e8e 100644 --- a/ubot/command_handler.py +++ b/ubot/command_handler.py @@ -13,10 +13,11 @@ class CommandHandler(): self.inline_pattern_template = "(?is)^{0}(?: |$|_)(.*)" self.incoming_commands = {} self.inline_photo_commands = {} + self.inline_article_commands = {} self.logger = logger self.settings = settings client.add_event_handler(self.handle_incoming, events.NewMessage(incoming=True)) - client.add_event_handler(self.handle_inline_photo, events.InlineQuery()) + client.add_event_handler(self.handle_inline, events.InlineQuery()) async def handle_incoming(self, event): prefix = escape(self.settings.get_config("cmd_prefix") or '.') @@ -40,47 +41,82 @@ class CommandHandler(): await event.reply(f"`An error occurred in {value['function'].__name__}: {exception}`") raise exception - - async def handle_inline_photo(self, event): - pattern_match = None - + async def handle_inline(self, event): for key, value in self.inline_photo_commands.items(): pattern_match = search(self.inline_pattern_template.format(key), event.text) if pattern_match: - builder = event.builder - event.pattern_match = pattern_match - event.args = pattern_match.groups()[-1] + await self.handle_inline_photo(event, pattern_match, value) + return - url_list = await value["function"](event) + for key, value in self.inline_article_commands.items(): + pattern_match = search(self.inline_pattern_template.format(key), event.text) - if not url_list: - continue + if pattern_match: + await self.handle_inline_article(event, pattern_match, value) + return - photo_coros = [] + await self.fallback_inline(event) - for url in url_list: - try: - photo_coros += [self.try_coro(builder.photo(url))] - except: - pass + async def handle_inline_photo(self, event, pattern_match, value): + builder = event.builder + event.pattern_match = pattern_match + event.args = pattern_match.groups()[-1] - if photo_coros: - photos = await asyncio.gather(*photo_coros) - else: - continue + url_list = await value["function"](event) - try: - await event.answer([i for i in photos if i]) - except: - pass + if not url_list: + return - if not pattern_match: + photo_coros = [] + + for url in url_list: try: - await event.answer([await event.builder.article(title=key, text=f"{self.settings.get_config('cmd_prefix') or '.'}{value['default']}") for key, value in self.inline_photo_commands.items() if value["default"]]) + photo_coros += [self.try_coro(builder.photo(url))] except: pass + if photo_coros: + photos = await asyncio.gather(*photo_coros) + else: + return + + try: + await event.answer([i for i in photos if i]) + except: + pass + + async def handle_inline_article(self, event, pattern_match, value): + builder = event.builder + event.pattern_match = pattern_match + event.args = pattern_match.groups()[-1] + + result_list = await value["function"](event) + + if not result_list: + return + + articles = [] + + for result in result_list: + try: + articles += [await builder.article(title=result["title"], description=result["description"], text=result["text"])] + except: + pass + + try: + await event.answer([i for i in articles if i]) + except: + pass + + async def fallback_inline(self, event): + defaults_dict = {**self.inline_photo_commands, **self.inline_article_commands} + + try: + await event.answer([await event.builder.article(title=key, text=f"{self.settings.get_config('cmd_prefix') or '.'}{value['default']}") for key, value in defaults_dict.items() if value["default"]]) + except: + pass + async def try_coro(self, coro): try: return await coro diff --git a/ubot/loader.py b/ubot/loader.py index 07af729..dc25f28 100644 --- a/ubot/loader.py +++ b/ubot/loader.py @@ -35,6 +35,7 @@ class Loader(): def reload_all_modules(self): self.command_handler.incoming_commands = {} self.command_handler.inline_photo_commands = {} + self.command_handler.inline_article_commands = {} self.help_dict = {} errors = "" @@ -83,6 +84,19 @@ class Loader(): return decorator + def add_inline_article(self, pattern=None, **args): + pattern = args.get("pattern", pattern) + + def decorator(func): + self.command_handler.inline_article_commands[pattern] = { + "function": func, + "default": args.get("default", None) + } + + return func + + return decorator + async def get_text(self, event, with_reply=True, return_msg=False, default=None): if event.args: if return_msg: