mir/microbot
2
0
Fork 0
mirror of https://github.com/Nick80835/microbot synced 2025-09-02 15:35:43 +00:00
Code Issues Releases Wiki Activity

rework noprefix

Browse Source
This commit is contained in:
Nick80835
2020-06-26 19:17:50 -04:00
parent 0b2d46e756
commit 83b492f40b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ubot/command_handler.py
View File

@@ -28,7 +28,10 @@ class CommandHandler():
prefix = "|".join([escape(i) for i in (self.settings.get_list("cmd_prefix") or ['.'])]) prefix = "|".join([escape(i) for i in (self.settings.get_list("cmd_prefix") or ['.'])])
for value in self.incoming_commands: for value in self.incoming_commands:
pattern_match = search(self.pattern_template.format("" if value["noprefix"] else f"({prefix})", value["pattern"], self.username), event.text) if value["simple_pattern"]:
pattern_match = search(self.inline_pattern_template.format(value["pattern"]), event.text)
else:
pattern_match = search(self.pattern_template.format(f"({prefix})", value["pattern"], self.username), event.text)
if pattern_match: if pattern_match:
if self.is_blacklisted(event): if self.is_blacklisted(event):

4
ubot/loader.py
View File

@@ -72,7 +72,7 @@ class Loader():
self.command_handler.incoming_commands.append({ self.command_handler.incoming_commands.append({
"pattern": pattern, "pattern": pattern,
"function": func, "function": func,
"noprefix": args.get('noprefix', False), "simple_pattern": args.get('simple_pattern', False),
"sudo": args.get('sudo', False), "sudo": args.get('sudo', False),
"extras": args.get('extras', None), "extras": args.get('extras', None),
"nsfw": args.get('nsfw', False), "nsfw": args.get('nsfw', False),
@@ -109,7 +109,7 @@ class Loader():
self.command_handler.incoming_commands.append({ self.command_handler.incoming_commands.append({
"pattern": pattern + pattern_extra, "pattern": pattern + pattern_extra,
"function": func, "function": func,
"noprefix": args.get('noprefix', False), "simple_pattern": args.get('simple_pattern', False),
"sudo": args.get('sudo', False), "sudo": args.get('sudo', False),
"extras": args.get('extras', pattern), "extras": args.get('extras', pattern),
"nsfw": args.get('nsfw', False), "nsfw": args.get('nsfw', False),