Modpol/modpol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Luke Miller
2021-07-19 11:06:00 -04:00
parent 87f4b6a2fe 223fde221a
commit 3dd5ff615d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modpol/orgs/base.lua
View File

@@ -11,7 +11,12 @@ function temp_org()
return { return {
id = nil, id = nil,
name = nil, name = nil,
policies = {}, policies = {
add_org={process_type='consent', must_be_member=false},
delete={process_type='consent', must_be_member=false},
add_member={process_type='consent', must_be_member=false},
remove_member={process_type='consent', must_be_member=false}
},
processes = {}, processes = {},
requests = {}, requests = {},
pending = {}, pending = {},

7
modpol/orgs/requests.lua
View File

@@ -13,10 +13,11 @@ function modpol.orgs:create_process(process_type, request_id)
return return
end end
local empty_index = nil
-- linear search for empty process slots (lazy deletion) -- linear search for empty process slots (lazy deletion)
for k, v in ipairs(self.processes) do for k, v in ipairs(self.processes) do
if v == 'deleted' then if v == 'deleted' then
local empty_index = k empty_index = k
break break
end end
end end
@@ -214,10 +215,11 @@ function modpol.orgs:make_request(request)
return false return false
end end
local empty_index = nil
-- linear search for empty process slots (lazy deletion) -- linear search for empty process slots (lazy deletion)
for k, v in ipairs(self.requests) do for k, v in ipairs(self.requests) do
if v == 'deleted' then if v == 'deleted' then
local empty_index = k empty_index = k
break break
end end
end end
@@ -231,6 +233,7 @@ function modpol.orgs:make_request(request)
table.insert(self.requests, request) table.insert(self.requests, request)
request_id = #self.requests request_id = #self.requests
end end
modpol.ocutil.log("Request made by " .. request.user .. " to " .. request.type .. " in " .. self.name) modpol.ocutil.log("Request made by " .. request.user .. " to " .. request.type .. " in " .. self.name)
self:record("Request made by " .. request.user .. " to " .. request.type, "make_request") self:record("Request made by " .. request.user .. " to " .. request.type, "make_request")

6
modpol_minetest/overrides/interactions/interactions.lua
View File

@@ -177,9 +177,9 @@ minetest.register_on_player_receive_fields(function (player, formname, fields)
if nil then if nil then
elseif fields.join then elseif fields.join then
local new_request = { local new_request = {
user = player, user = pname,
type = "add_member", type = "add_member",
params = {player} params = {pname}
} }
org:make_request(new_request) org:make_request(new_request)
--org:add_member(pname) --org:add_member(pname)
@@ -195,7 +195,7 @@ minetest.register_on_player_receive_fields(function (player, formname, fields)
modpol.interactions.text_query(pname, "Org name:") modpol.interactions.text_query(pname, "Org name:")
local new_org_name = _contexts[pname] local new_org_name = _contexts[pname]
local new_request = { local new_request = {
user = player, user = pname,
type = "add_org", type = "add_org",
params = {new_org_name} params = {new_org_name}
} }