From 2d6725df73df9d92a36aea2ab76f8573f32faf75 Mon Sep 17 00:00:00 2001 From: Dico Date: Wed, 25 May 2016 16:40:31 +0200 Subject: [PATCH 1/7] Prevent chained aliases in chatalias Prevents 1 -> 23 along with 2 -> 3 and similar stuff --- chatalias.py | 34 ++++++++++++++++++++++++++++------ 1 file 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 -- 2.45.2 From 16e78a267766192486b88195bac1ee6c6ea45667 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 16:44:09 +0200 Subject: [PATCH 2/7] Add missing ) to chatalias --- chatalias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatalias.py b/chatalias.py index 7163245..708179c 100644 --- a/chatalias.py +++ b/chatalias.py @@ -180,7 +180,7 @@ def add(sender, args): return True args = [args[0]] + [" ".join(args[1:])] 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" + msg(sender, colorify("&c") + "Could not add this alias because it would cause some sequences to be replaced multiple times", usecolor = False) 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 -- 2.45.2 From 1fdf97f77a3c5f1a263fa252802a7840416a7bc5 Mon Sep 17 00:00:00 2001 From: Dico200 Date: Wed, 25 May 2016 16:46:49 +0200 Subject: [PATCH 3/7] Add missing _ ... lol --- chatalias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatalias.py b/chatalias.py index 708179c..07f132f 100644 --- a/chatalias.py +++ b/chatalias.py @@ -227,7 +227,7 @@ def add_alias_data(puuid, aliased, new_alias): # prevent 1 -> 2 if there is 2 -> 3 for sequence in prior: - if sequence in new alias: + if sequence in new_alias: return False prior[aliased] = new_alias -- 2.45.2 From a19f0b5bdc5b05496b2d70c78f891fbc7cc7711e Mon Sep 17 00:00:00 2001 From: Pepich Date: Sat, 28 May 2016 22:33:38 +0200 Subject: [PATCH 4/7] Added support for /rl; Made comments more precise --- chatalias.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/chatalias.py b/chatalias.py index 07f132f..7295cca 100644 --- a/chatalias.py +++ b/chatalias.py @@ -55,11 +55,18 @@ permission_FINFO = "utils.alias.finfo" # CODE # ######## -# OnEnable +# OnModuleLoad enabled = helpers_version in helpers_versions if not enabled: error = colorify("&6Incompatible versions detected (&chelpers.py&6)") - +for player in Server.getOnlinePlayers(): + if enabled: + t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), )) + t.daemon = True + t.start() + else: + if event.getPlayer().hasPermission(permission_FINFO): + disabled_fallback(event.getPlayer()) def safe_open_json(uuid): if not os.path.exists("plugins/redstoner-utils.py.dir/files/aliases"): -- 2.45.2 From 7da3fd5b717c9bb73576802a8b1e73ac40e8214f Mon Sep 17 00:00:00 2001 From: Pepich Date: Sat, 28 May 2016 22:35:28 +0200 Subject: [PATCH 5/7] That's an "s", not an "S" ._. --- chatalias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chatalias.py b/chatalias.py index 7295cca..1069ef3 100644 --- a/chatalias.py +++ b/chatalias.py @@ -59,7 +59,7 @@ permission_FINFO = "utils.alias.finfo" enabled = helpers_version in helpers_versions if not enabled: error = colorify("&6Incompatible versions detected (&chelpers.py&6)") -for player in Server.getOnlinePlayers(): +for player in server.getOnlinePlayers(): if enabled: t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), )) t.daemon = True -- 2.45.2 From c534d9316a06ed732ff1f3d0daca19dd693b1761 Mon Sep 17 00:00:00 2001 From: Pepich Date: Sat, 28 May 2016 22:40:08 +0200 Subject: [PATCH 6/7] Moved OnModuleLoad to bottom of file --- chatalias.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/chatalias.py b/chatalias.py index 1069ef3..cb7d80c 100644 --- a/chatalias.py +++ b/chatalias.py @@ -55,19 +55,6 @@ permission_FINFO = "utils.alias.finfo" # CODE # ######## -# OnModuleLoad -enabled = helpers_version in helpers_versions -if not enabled: - error = colorify("&6Incompatible versions detected (&chelpers.py&6)") -for player in server.getOnlinePlayers(): - if enabled: - t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), )) - t.daemon = True - t.start() - else: - if event.getPlayer().hasPermission(permission_FINFO): - disabled_fallback(event.getPlayer()) - def safe_open_json(uuid): if not os.path.exists("plugins/redstoner-utils.py.dir/files/aliases"): os.makedirs("plugins/redstoner-utils.py.dir/files/aliases") @@ -365,3 +352,17 @@ remotes = { "remove": rremove, "list": rlist_alias, } + +# OnModuleLoad + +enabled = helpers_version in helpers_versions +if not enabled: + error = colorify("&6Incompatible versions detected (&chelpers.py&6)") +for player in server.getOnlinePlayers(): + if enabled: + t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), )) + t.daemon = True + t.start() + else: + if event.getPlayer().hasPermission(permission_FINFO): + disabled_fallback(event.getPlayer()) -- 2.45.2 From c3189639f09723500f6597917369e601a44c68cb Mon Sep 17 00:00:00 2001 From: Dico200 Date: Sat, 28 May 2016 23:05:43 +0200 Subject: [PATCH 7/7] Fixes and stuff --- chatalias.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/chatalias.py b/chatalias.py index cb7d80c..449a68f 100644 --- a/chatalias.py +++ b/chatalias.py @@ -191,6 +191,8 @@ def radd(sender, args): if args[3].lower() == "false": plugin_header(target, "Alias") msg(target, "&cPlayer " + sender_name + " &cis creating an alias for you!") + elif args[3].lower() != "true": + args[2] += " " + args[3] if not sender.hasPermission(permission_ALL) and len(data[uid(sender)]) >= int(get_permission_content(target, permission_AMOUNT)): msg(sender, "&cCould not create alias: Max_limit reached!") if args[3].lower() == "false": @@ -274,7 +276,7 @@ def rlist_alias(sender, args): plugin_header(sender, "Alias") target = get_player(args[0]) if is_player(sender): - sender_name = colorify(sender.getDisplayName) + sender_name = colorify(sender.getDisplayName()) else: sender_name = colorify("&6Console") if len(args) == 1: @@ -282,11 +284,9 @@ def rlist_alias(sender, args): msg(sender, "Player " + args[0] + " has following aliases (" + str(len(data[uid(target)])) + " in total):") if args[1].lower() == "false": plugin_header(target, "Alias") - msg(target, "&cPlayer " + sender_name + " &cis listing your aliases (" + str(len(data[uid(target)])) + " in total):") + msg(target, "&cPlayer " + sender_name + " &cis listing your aliases") for word, alias in data[str(uid(target))].items(): msg(sender, colorify("&7") + word + colorify("&7 -> ") + alias, usecolor=target.hasPermission("essentials.chat.color")) - if args[1].lower() == "false": - msg(target, colorify("&7") + word + colorify("&7 -> ") + alias, usecolor=target.hasPermission("essentials.chat.color")) return True @@ -341,15 +341,21 @@ def save_data_thread(uuid): # Subcommands: subcommands = { "help": help, + "?": help, "add": add, "remove": remove, + "del": remove, + "delete": remove, "player": remote, + "remote": remote, "list": list_alias } remotes = { "add": radd, "remove": rremove, + "del": rremove, + "delete": rremove, "list": rlist_alias, } @@ -360,9 +366,9 @@ if not enabled: error = colorify("&6Incompatible versions detected (&chelpers.py&6)") for player in server.getOnlinePlayers(): if enabled: - t = threading.Thread(target=load_data, args=(uid(event.getPlayer()), )) + t = threading.Thread(target=load_data, args=(uid(player), )) t.daemon = True t.start() else: - if event.getPlayer().hasPermission(permission_FINFO): - disabled_fallback(event.getPlayer()) + if player.hasPermission(permission_FINFO): + disabled_fallback(player) -- 2.45.2