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

32
modules/aliases.py
View file

@ -7,22 +7,24 @@ SETTING_PREFIX = "command-alias-"
class Module(ModuleManager.BaseModule):
def _arg_replace(self, s, args_split):
for match in REGEX_ARG_NUMBER.finditer(s):
if match.group(1):
index = int(match.group(1))
continuous = match.group(2) == "-"
if index >= len(args_split):
raise IndexError("Unknown alias arg index")
else:
index = 0
continuous = True
parts = s.split("$$")
for i, part in enumerate(parts):
for match in REGEX_ARG_NUMBER.finditer(s):
if match.group(1):
index = int(match.group(1))
continuous = match.group(2) == "-"
if index >= len(args_split):
raise IndexError("Unknown alias arg index")
else:
index = 0
continuous = True
if continuous:
replace = " ".join(args_split[index:])
else:
replace = args_split[index]
s = s.replace(match.group(0), replace)
return s
if continuous:
replace = " ".join(args_split[index:])
else:
replace = args_split[index]
parts[i] = part.replace(match.group(0), replace)
return "$".join(parts)
def _get_alias(self, server, target, command):
setting = "%s%s" % (SETTING_PREFIX, command)