Changed modpol.orgs.list_all to return table not string

This commit is contained in:
Nathan Schneider 2021-04-17 09:50:18 -06:00
parent a6cd6ebcfe
commit 9f65e2bdd3
4 changed files with 21 additions and 18 deletions

View File

@ -12,7 +12,8 @@
modpol.dashboard = function(user)
local output = ""
-- Org status
output = output .. "Orgs:\n" .. modpol.orgs.list_all()
output = output .. "Orgs:\n" ..
table.concat(modpol.orgs.list_all(),"\n")
-- Process status (ongoing processes)
output = output .. "\nProcesses:\n" .. table.concat(modpol.processes)
-- Command list (should be redone to be org-specific)

View File

@ -23,19 +23,19 @@ function modpol.orgs.get_org(arg)
end
-- ===============================================
-- returns a string list of all orgs
-- returns a table list of all org names
function modpol.orgs.list_all()
local str
for k, v in ipairs(modpol.orgs.array) do
if type(v) == 'table' then
if str then
str = str .. '\n' .. v.name
else
str = v.name
end
end
end
return str
local org_table
for k, v in ipairs(modpol.orgs.array) do
if type(v) == 'table' then
if org_table then
table.insert(org_table, v.name)
else
org_table = {v.name}
end
end
end
return org_table
end
-- ===========================================

View File

@ -56,17 +56,18 @@ regchat(
})
-- ===================================================================
-- /listorg
-- In Minetest mode, this code defines a chat command which lists the
-- /listorgs
-- In Minetest mode, this code defines a chat command which lists
-- existing "orgs".
-- The list shows one "org" per line in the following format:
-- org_name (member, member, ...)
regchat(
"listorg", {
"listorgs", {
privs = {} ,
func = function (user, param)
return true, "Orgs:\n" .. modpol.orgs.list_all()
return true, "Orgs: " ..
table.concat(modpol.orgs.list_all(), ", ")
end
})

View File

@ -12,7 +12,8 @@ modpol.dashboard = function(user)
for key,value in pairs(command_list) do
commands = commands .. "/" .. value .. " "
end
local orgs = "Orgs: " .. modpol.orgs.list_all()
local orgs = "Orgs: " ..
table.concat(modpol.orgs.list_all(), ", ")
local users = "Players: "
.. table.concat(modpol.list_users(), ", ")
-- set up formspec