Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

support "$$" as a literal "$" in alias arg replacements

Browse source
This commit is contained in:
jesopo 2019-11-20 18:23:57 +00:00
parent 6e005f1569
commit 352df0fa75
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/aliases.py
View file

@ -7,6 +7,8 @@ SETTING_PREFIX = "command-alias-"
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _arg_replace(self, s, args_split): def _arg_replace(self, s, args_split):
parts = s.split("$$")
for i, part in enumerate(parts):
for match in REGEX_ARG_NUMBER.finditer(s): for match in REGEX_ARG_NUMBER.finditer(s):
if match.group(1): if match.group(1):
index = int(match.group(1)) index = int(match.group(1))
@ -21,8 +23,8 @@ class Module(ModuleManager.BaseModule):
replace = " ".join(args_split[index:]) replace = " ".join(args_split[index:])
else: else:
replace = args_split[index] replace = args_split[index]
s = s.replace(match.group(0), replace) parts[i] = part.replace(match.group(0), replace)
return s return "$".join(parts)
def _get_alias(self, server, target, command): def _get_alias(self, server, target, command):
setting = "%s%s" % (SETTING_PREFIX, command) setting = "%s%s" % (SETTING_PREFIX, command)