From 826f9600b52f0dad123bf48241470f2eca96ec49 Mon Sep 17 00:00:00 2001 From: Luke Miller Date: Thu, 16 Dec 2021 13:32:30 -0500 Subject: [PATCH] cleaned up module template! --- modpol/modules/join_org_class.lua | 22 +++++----------------- modpol/orgs/process.lua | 14 +++++++++++++- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modpol/modules/join_org_class.lua b/modpol/modules/join_org_class.lua index 0533e8a..9160425 100644 --- a/modpol/modules/join_org_class.lua +++ b/modpol/modules/join_org_class.lua @@ -2,22 +2,12 @@ -- Module that enables a user to join an org JoinOrg = {} -JoinOrg_mt = { __index = JoinOrg } - -function JoinOrg.create(initiator, org, id) - local inst = { - name = "Join an org", - desc = "Initiator chooses an org to become a member of. Nothing happens if they are already in an org.", - initiator = initiator, - org = org, - id = id, - votes_yes = 0 - } - setmetatable(inst, JoinOrg_mt) - return inst - -end +JoinOrg.setup = { + name = "Join an org", + desc = "Initiator chooses an org to become a member of. Nothing happens if they are already in an org.", + votes_yes = 0 +} function JoinOrg:initiate(result) modpol.interactions.binary_poll_user( @@ -33,8 +23,6 @@ function JoinOrg:initiate(result) end ) - - if result then result() end end diff --git a/modpol/orgs/process.lua b/modpol/orgs/process.lua index d514f5b..5ede0ed 100644 --- a/modpol/orgs/process.lua +++ b/modpol/orgs/process.lua @@ -22,7 +22,19 @@ function modpol.orgs:call_module(module_name, initiator) end local module = modpol.modules[module_name] - local new_process = module.create(initiator, self, index) + + local new_process = { + metatable = {__index = module}, + initiator = initiator, + org = self, + id = index + } + + for k, v in pairs(module.setup) do + new_process[k] = v + end + + setmetatable(new_process, new_process.metatable) self.processes[index] = new_process