From f6315a23432158756b897e5e6e9d0250052a3b61 Mon Sep 17 00:00:00 2001 From: Who? <155328415+coddrago@users.noreply.github.com> Date: Sun, 24 Nov 2024 01:54:44 +0700 Subject: [PATCH 1/2] deleted join request... --- hikka/modules/fheta.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hikka/modules/fheta.py b/hikka/modules/fheta.py index 1ba9a78..a632f9c 100644 --- a/hikka/modules/fheta.py +++ b/hikka/modules/fheta.py @@ -276,10 +276,6 @@ class FHeta(loader.Module): return found_modules - async def client_ready(self): - from telethon.tl.functions.channels import JoinChannelRequest - await self.client(JoinChannelRequest("fmodules")) - async def format_module(self, module, query): repo_url = f"https://github.com/{module['repo']}" install = module['install'] From 7020900b61fb0f541e0316a1000333b9a3a42fb0 Mon Sep 17 00:00:00 2001 From: Rilliat Date: Sat, 23 Nov 2024 22:40:42 +0300 Subject: [PATCH 2/2] ALLOW NONSTANDART PREFIXES (only if True in .cfg Settings -> allow_nonstandart_prefixes) --- hikka/dispatcher.py | 8 ++++---- hikka/modules/settings.py | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/hikka/dispatcher.py b/hikka/dispatcher.py index 85930fe..3f75dc5 100644 --- a/hikka/dispatcher.py +++ b/hikka/dispatcher.py @@ -286,7 +286,7 @@ class CommandDispatcher: if ( message.out - and len(message.message) > 2 + and len(message.message) > len(prefix) * 2 and ( message.message.startswith(prefix * 2) and any(s != prefix for s in message.message) @@ -297,7 +297,7 @@ class CommandDispatcher: # Allow escaping commands using .'s if not watcher: await message.edit( - message.message[1:], + message.message[len(prefix):], parse_mode=lambda s: ( s, utils.relocate_entities(message.entities, -1, message.message) @@ -342,12 +342,12 @@ class CommandDispatcher: ): return False - if not message.message or len(message.message) == 1: + if not message.message or len(message.message) == len(prefix): return False # Message is just the prefix initiator = getattr(event, "sender_id", 0) - command = message.message[1:].strip().split(maxsplit=1)[0] + command = message.message[len(prefix):].strip().split(maxsplit=1)[0] tag = command.split("@", maxsplit=1) if len(tag) == 2: diff --git a/hikka/modules/settings.py b/hikka/modules/settings.py index 0fb2800..77245ee 100644 --- a/hikka/modules/settings.py +++ b/hikka/modules/settings.py @@ -19,6 +19,16 @@ class CoreMod(loader.Module): strings = {"name": "Settings"} + def __init__(self): + self.config = loader.ModuleConfig( + loader.ConfigValue( + "allow_nonstandart_prefixes", + False, + "Allow non-standard prefixes like premium emojis or multi-symbol prefixes", + validator=loader.validators.Boolean(), + ), + ) + async def blacklistcommon(self, message: Message): args = utils.get_args(message) @@ -138,7 +148,7 @@ class CoreMod(loader.Module): await utils.answer(message, self.strings("what_prefix")) return - if len(args) != 1: + if len(args) != 1 and self.config.get("allow_nonstandart_prefixes") is False: await utils.answer(message, self.strings("prefix_incorrect")) return @@ -157,7 +167,7 @@ class CoreMod(loader.Module): message, self.strings("prefix_set").format( "👍", - newprefix=utils.escape_html(args[0]), + newprefix=utils.escape_html(args), oldprefix=utils.escape_html(oldprefix), ), )