diff options
author | Dico <Dico200@users.noreply.github.com> | 2016-05-25 16:40:31 +0200 |
---|---|---|
committer | Dico <Dico200@users.noreply.github.com> | 2016-05-25 16:40:31 +0200 |
commit | 2d6725df73df9d92a36aea2ab76f8573f32faf75 (patch) | |
tree | 96dd7bb93082c73474a00e9f7c12e4beacefb51a | |
parent | d88baa4899d49b3224732e513bb05ea224b6c9f3 (diff) |
Prevent chained aliases in chatalias
Prevents 1 -> 23 along with 2 -> 3 and similar stuff
-rw-r--r-- | chatalias.py | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/chatalias.py b/chatalias.py index 5560c5f..7163245 100644 --- a/chatalias.py +++ b/chatalias.py @@ -179,8 +179,9 @@ def add(sender, args): msg(sender, "&cCould not create alias: Max_limit reached!") return True args = [args[0]] + [" ".join(args[1:])] - data[str(uid(sender))][str(args[0])] = args[1] - save_data(uid(sender)) + if not add_alias_data(uid(sender), str(args[0]), args[1]): + msg(sender, colorify("&c") + "Could not add this alias because it would cause some sequences to be replaced multiple times" + return True msg(sender, colorify("&7Alias: ") + args[0] + colorify("&7 -> " + args[1] + colorify("&7 was succesfully created!")), usecolor=sender.hasPermission("essentials.chat.color")) return True @@ -203,14 +204,37 @@ def radd(sender, args): return True if len(args) == 3: args += ["true"] - data[str(uid(target))][str(args[1])] = str(args[2]) - save_data(uid(target)) + if not add_alias_data(uid(target), str(args[1]), str(args[2])): + message = colorify("&c") + "Could not add this alias because it would cause some sequences to be replaced multiple times" + msg(sender, message) + if args[3].lower() == "false": + msg(target, message) + return True msg(sender, colorify("&7Alias: ") + args[1] + colorify("&7 -> " + args[2] + colorify("&7 was succesfully created!")), usecolor=target.hasPermission("essentials.chat.color")) if args[3].lower() == "false": msg(target, colorify("&7Alias: ") + args[1] + colorify("&7 -> " + args[2] + colorify("&7 was succesfully created!")), usecolor=target.hasPermission("essentials.chat.color")) return True +def add_alias_data(puuid, aliased, new_alias): + prior = data[puuid] + + # prevent 2 -> 3 if there is 1 -> 2 + if aliased not in prior: + for alias in prior.values(): + if aliased in alias: + return False + + # prevent 1 -> 2 if there is 2 -> 3 + for sequence in prior: + if sequence in new alias: + return False + + prior[aliased] = new_alias + save_data(puuid) + return True + + def remove(sender, args): plugin_header(sender, "Alias") try: @@ -334,5 +358,3 @@ remotes = { "remove": rremove, "list": rlist_alias, } -Status API Training Shop Blog About -© 2016 GitHub, Inc. Terms Privacy Security Contact Help
\ No newline at end of file |