From 223fde221a982fac13bfea3e1f8512299d1fa4ee Mon Sep 17 00:00:00 2001
From: Luke Miller <millerluke1364@gmail.com>
Date: Mon, 12 Jul 2021 18:11:36 -0400
Subject: [PATCH] added open default policies for orgs, and fixed error with
 passing raw player data into request

---
 modpol/orgs/base.lua                                    | 7 ++++++-
 modpol/orgs/requests.lua                                | 7 +++++--
 modpol_minetest/overrides/interactions/interactions.lua | 6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modpol/orgs/base.lua b/modpol/orgs/base.lua
index 2b8fbf5..92a5b65 100644
--- a/modpol/orgs/base.lua
+++ b/modpol/orgs/base.lua
@@ -11,7 +11,12 @@ function temp_org()
     return {
         id = 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 = {},
         requests = {},
         pending = {},
diff --git a/modpol/orgs/requests.lua b/modpol/orgs/requests.lua
index 1b4b155..379b340 100644
--- a/modpol/orgs/requests.lua
+++ b/modpol/orgs/requests.lua
@@ -13,10 +13,11 @@ function modpol.orgs:create_process(process_type, request_id)
         return
     end
 
+    local empty_index = nil
     -- linear search for empty process slots (lazy deletion)
     for k, v in ipairs(self.processes) do
         if v == 'deleted' then
-            local empty_index = k
+            empty_index = k
             break
         end
     end
@@ -205,10 +206,11 @@ function modpol.orgs:make_request(request)
         return false
     end
 
+    local empty_index = nil
     -- linear search for empty process slots (lazy deletion)
     for k, v in ipairs(self.requests) do
         if v == 'deleted' then
-            local empty_index = k
+            empty_index = k
             break
         end
     end
@@ -222,6 +224,7 @@ function modpol.orgs:make_request(request)
         table.insert(self.requests, request)
         request_id = #self.requests
     end
+    print(request.user)
     modpol.ocutil.log("Request made by " .. request.user .. " to " .. request.type)
 
     -- launching process tied to this request
diff --git a/modpol_minetest/overrides/interactions/interactions.lua b/modpol_minetest/overrides/interactions/interactions.lua
index f6a453d..b48ac86 100644
--- a/modpol_minetest/overrides/interactions/interactions.lua
+++ b/modpol_minetest/overrides/interactions/interactions.lua
@@ -177,9 +177,9 @@ minetest.register_on_player_receive_fields(function (player, formname, fields)
          if nil then
          elseif fields.join then
             local new_request = {
-               user = player,
+               user = pname,
                type = "add_member",
-               params = {player}
+               params = {pname}
             }
             org:make_request(new_request)
             --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:")
             local new_org_name = _contexts[pname]
             local new_request = {
-               user = player,
+               user = pname,
                type = "add_org",
                params = {new_org_name}
             }