Refactor priv determination in worldedit_gui

diff --git a/worldedit_gui/functionality.lua b/worldedit_gui/functionality.lua
index fa2559a884350055528c0fdd43a231f1ab62e877..7316eaebdd35d3636b49f292345534413c93e05d 100644 (file)
--- a/worldedit_gui/functionality.lua
+++ b/worldedit_gui/functionality.lua
@@ -46,7 +46,7 @@ local combine_privs = function(...)
        for i, privs in ipairs({...}) do\r
                for name, value in pairs(privs) do\r
                        if result[name] ~= nil and result[name] ~= value then --the priv must be both true and false, which can never happen\r
-                               return {__fake_priv_that_nobody_has__=true} --priviledge table that can never be satisfied\r
+                               return {__fake_priv_that_nobody_has__=true} --privilege table that can never be satisfied\r
                        end\r
                        result[name] = value\r
                end\r
@@ -60,22 +60,38 @@ local formspec_node = function(pos, nodename)
                or string.format("image[%s;1,1;worldedit_gui_unknown.png]", pos)\r
 end\r
 \r
+-- two further priv helpers\r
+local function we_privs(command)\r
+       return minetest.chatcommands["/" .. command].privs\r
+end\r
+\r
+local function combine_we_privs(list)\r
+       local args = {}\r
+       for _, t in ipairs(list) do\r
+               table.insert(args, we_privs(t))\r
+       end\r
+       return combine_privs(unpack(args))\r
+end\r
+\r
 worldedit.register_gui_function("worldedit_gui_about", {\r
-       name = "About", privs = minetest.chatcommands["/about"].privs,\r
+       name = "About",\r
+       privs = {interact=true},\r
        on_select = function(name)\r
                minetest.chatcommands["/about"].func(name, "")\r
        end,\r
 })\r
 \r
 worldedit.register_gui_function("worldedit_gui_inspect", {\r
-       name = "Toggle Inspect", privs = minetest.chatcommands["/inspect"].privs,\r
+       name = "Toggle Inspect",\r
+       privs = we_privs("inspect"),\r
        on_select = function(name)\r
                minetest.chatcommands["/inspect"].func(name, worldedit.inspect[name] and "disable" or "enable")\r
        end,\r
 })\r
 \r
 worldedit.register_gui_function("worldedit_gui_region", {\r
-       name = "Get/Set Region", privs = combine_privs(minetest.chatcommands["/p"].privs, minetest.chatcommands["/pos1"].privs, minetest.chatcommands["/pos2"].privs, minetest.chatcommands["/reset"].privs, minetest.chatcommands["/mark"].privs, minetest.chatcommands["/unmark"].privs, minetest.chatcommands["/volume"].privs, minetest.chatcommands["/fixedpos"].privs),\r
+       name = "Get/Set Region",\r
+       privs = combine_we_privs({"p", "pos1", "pos2", "reset", "mark", "unmark", "volume", "fixedpos"}),\r
        get_formspec = function(name)\r
                local pos1, pos2 = worldedit.pos1[name], worldedit.pos2[name]\r
                return "size[9,7]" .. worldedit.get_formspec_header("worldedit_gui_region") ..\r
@@ -154,7 +170,8 @@ worldedit.register_gui_handler("worldedit_gui_region", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_set", {\r
-       name = "Set Nodes", privs = minetest.chatcommands["/set"].privs,\r
+       name = "Set Nodes",\r
+       privs = we_privs("set"),\r
        get_formspec = function(name)\r
                local node = gui_nodename1[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -182,7 +199,8 @@ worldedit.register_gui_handler("worldedit_gui_set", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_replace", {\r
-       name = "Replace Nodes", privs = combine_privs(minetest.chatcommands["/replace"].privs, minetest.chatcommands["/replaceinverse"].privs),\r
+       name = "Replace Nodes",\r
+       privs = combine_we_privs({"replace", "replaceinverse"}),\r
        get_formspec = function(name)\r
                local search, replace = gui_nodename1[name], gui_nodename2[name]\r
                local search_nodename, replace_nodename = worldedit.normalize_nodename(search), worldedit.normalize_nodename(replace)\r
@@ -224,7 +242,8 @@ worldedit.register_gui_handler("worldedit_gui_replace", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_sphere_dome", {\r
-       name = "Sphere/Dome", privs = combine_privs(minetest.chatcommands["/hollowsphere"].privs, minetest.chatcommands["/sphere"].privs, minetest.chatcommands["/hollowdome"].privs, minetest.chatcommands["/dome"].privs),\r
+       name = "Sphere/Dome",\r
+       privs = combine_we_privs({"hollowsphere", "sphere", "hollowdome", "dome"}),\r
        get_formspec = function(name)\r
                local node, radius = gui_nodename1[name], gui_distance2[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -270,7 +289,8 @@ worldedit.register_gui_handler("worldedit_gui_sphere_dome", function(name, field
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_cylinder", {\r
-       name = "Cylinder", privs = combine_privs(minetest.chatcommands["/hollowcylinder"].privs, minetest.chatcommands["/cylinder"].privs),\r
+       name = "Cylinder",\r
+       privs = combine_we_privs({"hollowcylinder", "cylinder"}),\r
        get_formspec = function(name)\r
                local node, axis, length, radius = gui_nodename1[name], gui_axis1[name], gui_distance1[name], gui_distance2[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -318,7 +338,8 @@ worldedit.register_gui_handler("worldedit_gui_cylinder", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_pyramid", {\r
-       name = "Pyramid", privs = minetest.chatcommands["/pyramid"].privs,\r
+       name = "Pyramid",\r
+       privs = we_privs("pyramid"),\r
        get_formspec = function(name)\r
                local node, axis, length = gui_nodename1[name], gui_axis1[name], gui_distance1[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -363,7 +384,8 @@ worldedit.register_gui_handler("worldedit_gui_pyramid", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_spiral", {\r
-       name = "Spiral", privs = minetest.chatcommands["/spiral"].privs,\r
+       name = "Spiral",\r
+       privs = we_privs("spiral"),\r
        get_formspec = function(name)\r
                local node, length, height, space = gui_nodename1[name], gui_distance1[name], gui_distance2[name], gui_distance3[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -397,7 +419,8 @@ worldedit.register_gui_handler("worldedit_gui_spiral", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_copy_move", {\r
-       name = "Copy/Move", privs = combine_privs(minetest.chatcommands["/copy"].privs, minetest.chatcommands["/move"].privs),\r
+       name = "Copy/Move",\r
+       privs = combine_we_privs({"copy", "move"}),\r
        get_formspec = function(name)\r
                local axis = gui_axis1[name] or 4\r
                local amount = gui_distance1[name] or "10"\r
@@ -430,7 +453,8 @@ worldedit.register_gui_handler("worldedit_gui_copy_move", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_stack", {\r
-       name = "Stack", privs = minetest.chatcommands["/stack"].privs,\r
+       name = "Stack",\r
+       privs = we_privs("stack"),\r
        get_formspec = function(name)\r
                local axis, count = gui_axis1[name], gui_count1[name]\r
                return "size[6.5,3]" .. worldedit.get_formspec_header("worldedit_gui_stack") ..\r
@@ -457,7 +481,8 @@ worldedit.register_gui_handler("worldedit_gui_stack", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_stretch", {\r
-       name = "Stretch", privs = minetest.chatcommands["/stretch"].privs,\r
+       name = "Stretch",\r
+       privs = we_privs("stretch"),\r
        get_formspec = function(name)\r
                local stretchx, stretchy, stretchz = gui_count1[name], gui_count2[name], gui_count3[name]\r
                return "size[5,5]" .. worldedit.get_formspec_header("worldedit_gui_stretch") ..\r
@@ -481,7 +506,8 @@ worldedit.register_gui_handler("worldedit_gui_stretch", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_transpose", {\r
-       name = "Transpose", privs = minetest.chatcommands["/transpose"].privs,\r
+       name = "Transpose",\r
+       privs = we_privs("transpose"),\r
        get_formspec = function(name)\r
                local axis1, axis2 = gui_axis1[name], gui_axis2[name]\r
                return "size[5.5,3]" .. worldedit.get_formspec_header("worldedit_gui_transpose") ..\r
@@ -512,7 +538,8 @@ worldedit.register_gui_handler("worldedit_gui_transpose", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_flip", {\r
-       name = "Flip", privs = minetest.chatcommands["/flip"].privs,\r
+       name = "Flip",\r
+       privs = we_privs("flip"),\r
        get_formspec = function(name)\r
                local axis = gui_axis1[name]\r
                return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_flip") ..\r
@@ -537,7 +564,8 @@ worldedit.register_gui_handler("worldedit_gui_flip", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_rotate", {\r
-       name = "Rotate", privs = minetest.chatcommands["/rotate"].privs,\r
+       name = "Rotate",\r
+       privs = we_privs("rotate"),\r
        get_formspec = function(name)\r
                local axis, angle = gui_axis1[name], gui_angle[name]\r
                return "size[5.5,3]" .. worldedit.get_formspec_header("worldedit_gui_rotate") ..\r
@@ -569,7 +597,8 @@ worldedit.register_gui_handler("worldedit_gui_rotate", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_orient", {\r
-       name = "Orient", privs = minetest.chatcommands["/orient"].privs,\r
+       name = "Orient",\r
+       privs = we_privs("orient"),\r
        get_formspec = function(name)\r
                local angle = gui_angle[name]\r
                return "size[5,3]" .. worldedit.get_formspec_header("worldedit_gui_orient") ..\r
@@ -594,21 +623,24 @@ worldedit.register_gui_handler("worldedit_gui_orient", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_fixlight", {\r
-       name = "Fix Lighting", privs = minetest.chatcommands["/fixlight"].privs,\r
+       name = "Fix Lighting",\r
+       privs = we_privs("fixlight"),\r
        on_select = function(name)\r
                minetest.chatcommands["/fixlight"].func(name, "")\r
        end,\r
 })\r
 \r
 worldedit.register_gui_function("worldedit_gui_hide", {\r
-       name = "Hide Region", privs = minetest.chatcommands["/hide"].privs,\r
+       name = "Hide Region",\r
+       privs = we_privs("hide"),\r
        on_select = function(name)\r
                minetest.chatcommands["/hide"].func(name, "")\r
        end,\r
 })\r
 \r
 worldedit.register_gui_function("worldedit_gui_suppress", {\r
-       name = "Suppress Nodes", privs = minetest.chatcommands["/suppress"].privs,\r
+       name = "Suppress Nodes",\r
+       privs = we_privs("suppress"),\r
        get_formspec = function(name)\r
                local node = gui_nodename1[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -636,7 +668,8 @@ worldedit.register_gui_handler("worldedit_gui_suppress", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_highlight", {\r
-       name = "Highlight Nodes", privs = minetest.chatcommands["/highlight"].privs,\r
+       name = "Highlight Nodes",\r
+       privs = we_privs("highlight"),\r
        get_formspec = function(name)\r
                local node = gui_nodename1[name]\r
                local nodename = worldedit.normalize_nodename(node)\r
@@ -664,14 +697,16 @@ worldedit.register_gui_handler("worldedit_gui_highlight", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_restore", {\r
-       name = "Restore Region", privs = minetest.chatcommands["/restore"].privs,\r
+       name = "Restore Region",\r
+       privs = we_privs("restore"),\r
        on_select = function(name)\r
                minetest.chatcommands["/restore"].func(name, "")\r
        end,\r
 })\r
 \r
 worldedit.register_gui_function("worldedit_gui_save_load", {\r
-       name = "Save/Load", privs = combine_privs(minetest.chatcommands["/save"].privs, minetest.chatcommands["/allocate"].privs, minetest.chatcommands["/load"].privs),\r
+       name = "Save/Load",\r
+       privs = combine_we_privs({"save", "allocate", "load"}),\r
        get_formspec = function(name)\r
                local filename = gui_filename[name]\r
                return "size[6,4]" .. worldedit.get_formspec_header("worldedit_gui_save_load") ..\r
@@ -724,7 +759,8 @@ worldedit.register_gui_handler("worldedit_gui_lua", function(name, fields)
 end)\r
 \r
 worldedit.register_gui_function("worldedit_gui_clearobjects", {\r
-       name = "Clear Objects", privs = minetest.chatcommands["/clearobjects"].privs,\r
+       name = "Clear Objects",\r
+       privs = we_privs("clearobjects"),\r
        on_select = function(name)\r
                minetest.chatcommands["/clearobjects"].func(name, "")\r
        end,\r
@@ -732,6 +768,7 @@ worldedit.register_gui_function("worldedit_gui_clearobjects", {
 \r
 worldedit.register_gui_function("worldedit_gui_formspec_tester", {\r
        name = "Formspec Tester",\r
+       privs = {whatever=true},\r
        get_formspec = function(name)\r
                local value = gui_formspec[name]\r
                return "size[8,6.5]" .. worldedit.get_formspec_header("worldedit_gui_formspec_tester") ..\r

diff --git a/worldedit_gui/init.lua b/worldedit_gui/init.lua
index 12157b5024c036be427ef3f67c38101b21ff02ba..dafd7c263f2f1b3d206a009423adf5b2bf320080 100644 (file)
--- a/worldedit_gui/init.lua
+++ b/worldedit_gui/init.lua
@@ -243,6 +243,7 @@ end
 
 worldedit.register_gui_function("worldedit_gui", {
        name = "WorldEdit GUI",
+       privs = {interact=true},
        get_formspec = function(name)
                --create a form with all the buttons arranged in a grid
                local buttons, x, y, index = {}, 0, 1, 0