Software `/` code `/` prosody

Annotate

util/pubsub.lua @ 6648:999434eb1bbf

util.events: Add local reference to table.remove (fixes traceback)

author	Kim Alvefur <zash@zash.se>
date	Tue, 05 May 2015 00:41:39 +0200
parent	6515:c9a72c64c3e2
child	6516:ecd8d6437053
child	6777:5de6b93d0190

rev	line source
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	1 local events = require "util.events";
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	2 local t_remove = table.remove;
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	3
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	4 module("pubsub", package.seeall);
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	5
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	6 local service = {};
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	7 local service_mt = { __index = service };
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	8
6436 31ca87ea8d46 util.pubsub: One less table allocated per pubsub object created Kim Alvefur <zash@zash.se> parents: 6435 diff changeset	9 local default_config = { __index = {
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	10 broadcaster = function () end;
c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	11 get_affiliation = function () end;
c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	12 capabilities = {};
6436 31ca87ea8d46 util.pubsub: One less table allocated per pubsub object created Kim Alvefur <zash@zash.se> parents: 6435 diff changeset	13 } };
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	14 local default_node_config = { __index = {
6439 d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	15 ["pubsub#max_items"] = "20";
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	16 } };
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	17
c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	18 function new(config)
c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	19 config = config or {};
c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	20 return setmetatable({
6436 31ca87ea8d46 util.pubsub: One less table allocated per pubsub object created Kim Alvefur <zash@zash.se> parents: 6435 diff changeset	21 config = setmetatable(config, default_config);
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	22 node_defaults = setmetatable(config.node_defaults or {}, default_node_config);
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	23 affiliations = {};
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	24 subscriptions = {};
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	25 nodes = {};
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	26 data = {};
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	27 events = events.new();
3909 c2dc7f7eed94 util.pubsub: Modify new() to take a config, and add a default config via a metatable Matthew Wild <mwild1@gmail.com> parents: 3759 diff changeset	28 }, service_mt);
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	29 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	30
3934 4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	31 function service:jids_equal(jid1, jid2)
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	32 local normalize = self.config.normalize_jid;
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	33 return normalize(jid1) == normalize(jid2);
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	34 end
4bd994df7296 util.pubsub: Add service:jids_equal() and new config option normalize_jid Matthew Wild <mwild1@gmail.com> parents: 3931 diff changeset	35
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	36 function service:may(node, actor, action)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	37 if actor == true then return true; end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	38
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	39 local node_obj = self.nodes[node];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	40 local node_aff = node_obj and node_obj.affiliations[actor];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	41 local service_aff = self.affiliations[actor]
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	42 or self.config.get_affiliation(actor, node, action)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	43 or "none";
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	44
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	45 -- Check if node allows/forbids it
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	46 local node_capabilities = node_obj and node_obj.capabilities;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	47 if node_capabilities then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	48 local caps = node_capabilities[node_aff or service_aff];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	49 if caps then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	50 local can = caps[action];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	51 if can ~= nil then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	52 return can;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	53 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	54 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	55 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	56
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	57 -- Check service-wide capabilities instead
4099 5c0b7947f0ef util.pubsub: Some tidying/optimisation to service:may() Matthew Wild <mwild1@gmail.com> parents: 3945 diff changeset	58 local service_capabilities = self.config.capabilities;
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	59 local caps = service_capabilities[node_aff or service_aff];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	60 if caps then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	61 local can = caps[action];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	62 if can ~= nil then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	63 return can;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	64 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	65 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	66
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	67 return false;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	68 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	69
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	70 function service:set_affiliation(node, actor, jid, affiliation)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	71 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	72 if not self:may(node, actor, "set_affiliation") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	73 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	74 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	75 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	76 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	77 if not node_obj then
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	78 return false, "item-not-found";
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	79 end
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	80 node_obj.affiliations[jid] = affiliation;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	81 local _, jid_sub = self:get_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	82 if not jid_sub and not self:may(node, jid, "be_unsubscribed") then
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	83 local ok, err = self:add_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	84 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	85 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	86 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	87 elseif jid_sub and not self:may(node, jid, "be_subscribed") then
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	88 local ok, err = self:add_subscription(node, true, jid);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	89 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	90 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	91 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	92 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	93 return true;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	94 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	95
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	96 function service:add_subscription(node, actor, jid, options)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	97 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	98 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	99 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	100 cap = "subscribe";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	101 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	102 cap = "subscribe_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	103 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	104 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	105 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	106 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	107 if not self:may(node, jid, "be_subscribed") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	108 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	109 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	110 --
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	111 local node_obj = self.nodes[node];
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	112 if not node_obj then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	113 if not self.config.autocreate_on_subscribe then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	114 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	115 else
4364 af40cf682eba util.pubsub: Use built-in actor for auto-creating nodes on publish and subscribe (so they never fail due to permissions) Matthew Wild <mwild1@gmail.com> parents: 4100 diff changeset	116 local ok, err = self:create(node, true);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	117 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	118 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	119 end
3936 61f12f8a8539 util.pubsub: Fix traceback when using autocreate-on-subscribe Matthew Wild <mwild1@gmail.com> parents: 3934 diff changeset	120 node_obj = self.nodes[node];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	121 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	122 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	123 node_obj.subscribers[jid] = options or true;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	124 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	125 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	126 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	127 if not subs[jid] then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	128 subs[jid] = { [node] = true };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	129 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	130 subs[jid][node] = true;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	131 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	132 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	133 self.subscriptions[normal_jid] = { [jid] = { [node] = true } };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	134 end
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	135 self.events.fire_event("subscription-added", { node = node, jid = jid, normalized_jid = normal_jid, options = options });
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	136 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	137 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	138
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	139 function service:remove_subscription(node, actor, jid)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	140 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	141 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	142 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	143 cap = "unsubscribe";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	144 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	145 cap = "unsubscribe_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	146 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	147 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	148 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	149 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	150 if not self:may(node, jid, "be_unsubscribed") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	151 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	152 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	153 --
3698 77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	154 local node_obj = self.nodes[node];
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	155 if not node_obj then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	156 return false, "item-not-found";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	157 end
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	158 if not node_obj.subscribers[jid] then
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	159 return false, "not-subscribed";
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	160 end
77171fd1dc3c mod_pubsub, util.pubsub: Support for unsubscribing Florian Zeitz <florob@babelmonkeys.de> parents: 3672 diff changeset	161 node_obj.subscribers[jid] = nil;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	162 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	163 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	164 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	165 local jid_subs = subs[jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	166 if jid_subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	167 jid_subs[node] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	168 if next(jid_subs) == nil then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	169 subs[jid] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	170 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	171 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	172 if next(subs) == nil then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	173 self.subscriptions[normal_jid] = nil;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	174 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	175 end
4365 6704b3cd032e util.pubsub: Support for events (currently subscription-added and subscription-removed) Matthew Wild <mwild1@gmail.com> parents: 4364 diff changeset	176 self.events.fire_event("subscription-removed", { node = node, jid = jid, normalized_jid = normal_jid });
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	177 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	178 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	179
4366 b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	180 function service:remove_all_subscriptions(actor, jid)
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	181 local normal_jid = self.config.normalize_jid(jid);
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	182 local subs = self.subscriptions[normal_jid]
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	183 subs = subs and subs[jid];
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	184 if subs then
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	185 for node in pairs(subs) do
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	186 self:remove_subscription(node, true, jid);
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	187 end
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	188 end
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	189 return true;
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	190 end
b6c18cadd3ec util.pubsub: Add service:remove_all_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 4365 diff changeset	191
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	192 function service:get_subscription(node, actor, jid)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	193 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	194 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	195 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	196 cap = "get_subscription";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	197 else
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	198 cap = "get_subscription_other";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	199 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	200 if not self:may(node, actor, cap) then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	201 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	202 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	203 --
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	204 local node_obj = self.nodes[node];
3937 843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	205 if not node_obj then
843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	206 return false, "item-not-found";
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	207 end
3937 843ee23cc91a util.pubsub: Small code tidying for :get_subscription() Matthew Wild <mwild1@gmail.com> parents: 3936 diff changeset	208 return true, node_obj.subscribers[jid];
3626 444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	209 end
444f965baed8 util.pubsub: Add :get_subscription() to return the current subscription for a JID, if any Matthew Wild <mwild1@gmail.com> parents: 3619 diff changeset	210
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	211 function service:create(node, actor, options)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	212 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	213 if not self:may(node, actor, "create") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	214 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	215 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	216 --
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	217 if self.nodes[node] then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	218 return false, "conflict";
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	219 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5675 diff changeset	220
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	221 self.data[node] = {};
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	222 self.nodes[node] = {
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	223 name = node;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	224 subscribers = {};
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	225 config = setmetatable(options or {}, {__index=self.node_defaults});
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	226 affiliations = {};
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	227 };
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	228 setmetatable(self.nodes[node], { __index = { data = self.data[node] } }); -- COMPAT
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	229 self.events.fire_event("node-created", { node = node, actor = actor });
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	230 local ok, err = self:set_affiliation(node, true, actor, "owner");
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	231 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	232 self.nodes[node] = nil;
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	233 self.data[node] = nil;
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	234 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	235 return ok, err;
3672 b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	236 end
b24db47995ac mod_pubsub, util.pubsub: Support node creation Florian Zeitz <florob@babelmonkeys.de> parents: 3641 diff changeset	237
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	238 function service:delete(node, actor)
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	239 -- Access checking
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	240 if not self:may(node, actor, "delete") then
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	241 return false, "forbidden";
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	242 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	243 --
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	244 local node_obj = self.nodes[node];
5675 e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	245 if not node_obj then
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	246 return false, "item-not-found";
e29ece65e3b0 util.pubsub: Check whether node exists, when deleting Florian Zeitz <florob@babelmonkeys.de> parents: 5628 diff changeset	247 end
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	248 self.nodes[node] = nil;
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	249 self.data[node] = nil;
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	250 self.events.fire_event("node-deleted", { node = node, actor = actor });
5320 518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	251 self.config.broadcaster("delete", node, node_obj.subscribers);
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	252 return true;
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	253 end
518d864b2ab8 mod_pubsub, util.pubsub: Add delete action Kim Alvefur <zash@zash.se> parents: 5315 diff changeset	254
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	255 local function remove_item_by_id(data, id)
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	256 if not data[id] then return end
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	257 data[id] = nil;
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	258 for i, _id in ipairs(data) do
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	259 if id == _id then
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	260 t_remove(data, i);
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	261 return i;
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	262 end
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	263 end
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	264 end
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	265
6439 d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	266 local function trim_items(data, max)
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	267 max = tonumber(max);
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	268 if not max or #data <= max then return end
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	269 repeat
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	270 data[t_remove(data, 1)] = nil;
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	271 until #data <= max
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	272 end
d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	273
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	274 function service:publish(node, actor, id, item)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	275 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	276 if not self:may(node, actor, "publish") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	277 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	278 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	279 --
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	280 local node_obj = self.nodes[node];
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	281 if not node_obj then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	282 if not self.config.autocreate_on_publish then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	283 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	284 end
4364 af40cf682eba util.pubsub: Use built-in actor for auto-creating nodes on publish and subscribe (so they never fail due to permissions) Matthew Wild <mwild1@gmail.com> parents: 4100 diff changeset	285 local ok, err = self:create(node, true);
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	286 if not ok then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	287 return ok, err;
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	288 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	289 node_obj = self.nodes[node];
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	290 end
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	291 local node_data = self.data[node];
f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	292 remove_item_by_id(node_data, id);
6435 689cb04ff9fd util.pubsub: Use local Kim Alvefur <zash@zash.se> parents: 5972 diff changeset	293 node_data[#node_data + 1] = id;
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	294 node_data[id] = item;
6439 d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	295 trim_items(node_data, node_obj.config["pubsub#max_items"]);
5181 1e9508ae44cc util.pubsub: Add item-published event Matthew Wild <mwild1@gmail.com> parents: 4367 diff changeset	296 self.events.fire_event("item-published", { node = node, actor = actor, id = id, item = item });
6515 c9a72c64c3e2 mod_pubsub: Add support for including the publisher in item broadcasts Philipp Hancke <fippo@goodadvice.pages.de> parents: 6439 diff changeset	297 self.config.broadcaster("items", node, node_obj.subscribers, item, actor);
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	298 return true;
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	299 end
291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	300
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	301 function service:retract(node, actor, id, retract)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	302 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	303 if not self:may(node, actor, "retract") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	304 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	305 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	306 --
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	307 local node_obj = self.nodes[node];
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	308 if (not node_obj) or (not self.data[node][id]) then
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	309 return false, "item-not-found";
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	310 end
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	311 self.events.fire_event("item-retracted", { node = node, actor = actor, id = id });
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	312 remove_item_by_id(self.data[node], id);
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	313 if retract then
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	314 self.config.broadcaster("items", node, node_obj.subscribers, retract);
3699 150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	315 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	316 return true
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	317 end
150e58d69e60 mod_pubsub: Support item retraction Florian Zeitz <florob@babelmonkeys.de> parents: 3698 diff changeset	318
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	319 function service:purge(node, actor, notify)
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	320 -- Access checking
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	321 if not self:may(node, actor, "retract") then
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	322 return false, "forbidden";
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	323 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	324 --
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	325 local node_obj = self.nodes[node];
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	326 if not node_obj then
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	327 return false, "item-not-found";
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	328 end
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	329 self.data[node] = {}; -- Purge
5971 637731f0b9a3 util.pubsub: Fire events on more actions Kim Alvefur <zash@zash.se> parents: 5776 diff changeset	330 self.events.fire_event("node-purged", { node = node, actor = actor });
5312 fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	331 if notify then
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	332 self.config.broadcaster("purge", node, node_obj.subscribers);
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	333 end
fdcd2ac7c22d mod_pubsub, util.pubsub: Don't send purge notifications in an <items/> element Florian Zeitz <florob@babelmonkeys.de> parents: 5305 diff changeset	334 return true
5305 391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	335 end
391b72fede9f mod_pubsub, util.pubsub: Implement the purge action Kim Alvefur <zash@zash.se> parents: 5181 diff changeset	336
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	337 function service:get_items(node, actor, id)
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	338 -- Access checking
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	339 if not self:may(node, actor, "get_items") then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	340 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	341 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	342 --
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	343 local node_obj = self.nodes[node];
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	344 if not node_obj then
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	345 return false, "item-not-found";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	346 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	347 if id then -- Restrict results to a single specific item
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	348 return true, { id, [id] = self.data[node][id] };
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	349 else
5972 f365d3c8fd2c util.pubsub: Separate data from node configuration Kim Alvefur <zash@zash.se> parents: 5971 diff changeset	350 return true, self.data[node];
3641 3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	351 end
3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	352 end
3603aeb325de mod_pubsub, util.pubsub: Support for fetching items Florian Zeitz <florob@babelmonkeys.de> parents: 3626 diff changeset	353
3759 1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	354 function service:get_nodes(actor)
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	355 -- Access checking
3917 263a133bdf5a util.pubsub: Fix nil global access in get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3910 diff changeset	356 if not self:may(nil, actor, "get_nodes") then
3910 80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	357 return false, "forbidden";
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	358 end
80fe910f912a util.pubsub: Too many changes to list or split sensibly. Added access control to all methods, with capabilities support. Renamed get() -> get_items() and changed it to return true, result on success. Support for autocreate_on_subscribe and autocreate_on_publish config options. Matthew Wild <mwild1@gmail.com> parents: 3909 diff changeset	359 --
3759 1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	360 return true, self.nodes;
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	361 end
1f7305784e12 util.pubsub: Add service:get_nodes() Matthew Wild <mwild1@gmail.com> parents: 3699 diff changeset	362
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	363 function service:get_subscriptions(node, actor, jid)
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	364 -- Access checking
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	365 local cap;
4100 69e3f1e7111e util.pubsub: Pass true instead of nil as the actor in a bunch of places, and fix a bunch of methods to not traceback on this (those with _other capability checking). Matthew Wild <mwild1@gmail.com>* parents: 4099 diff changeset	366 if actor == true or jid == actor or self:jids_equal(actor, jid) then
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	367 cap = "get_subscriptions";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	368 else
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	369 cap = "get_subscriptions_other";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	370 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	371 if not self:may(node, actor, cap) then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	372 return false, "forbidden";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	373 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	374 --
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	375 local node_obj;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	376 if node then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	377 node_obj = self.nodes[node];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	378 if not node_obj then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	379 return false, "item-not-found";
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	380 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	381 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	382 local normal_jid = self.config.normalize_jid(jid);
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	383 local subs = self.subscriptions[normal_jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	384 -- We return the subscription object from the node to save
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	385 -- a get_subscription() call for each node.
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	386 local ret = {};
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	387 if subs then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	388 for jid, subscribed_nodes in pairs(subs) do
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	389 if node then -- Return only subscriptions to this node
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	390 if subscribed_nodes[node] then
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	391 ret[#ret+1] = {
5628 ba5c2f6b799e util.pubsub: Fix get_subscriptions to not pass a boolean as node name (thanks jonas) Kim Alvefur <zash@zash.se> parents: 5320 diff changeset	392 node = node;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	393 jid = jid;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	394 subscription = node_obj.subscribers[jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	395 };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	396 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	397 else -- Return subscriptions to all nodes
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	398 local nodes = self.nodes;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	399 for subscribed_node in pairs(subscribed_nodes) do
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	400 ret[#ret+1] = {
3942 0323beb7183c util.pubsub: Use correct node name when returning a list of multiple nodes in a subscriptions response Matthew Wild <mwild1@gmail.com> parents: 3938 diff changeset	401 node = subscribed_node;
3938 a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	402 jid = jid;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	403 subscription = nodes[subscribed_node].subscribers[jid];
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	404 };
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	405 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	406 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	407 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	408 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	409 return true, ret;
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	410 end
a3ecaf46bd82 util.pubsub: Add service-wide subscription tracking, and add :get_subscriptions() Matthew Wild <mwild1@gmail.com> parents: 3937 diff changeset	411
3928 4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	412 -- Access models only affect 'none' affiliation caps, service/default access level...
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	413 function service:set_node_capabilities(node, actor, capabilities)
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	414 -- Access checking
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	415 if not self:may(node, actor, "configure") then
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	416 return false, "forbidden";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	417 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	418 --
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	419 local node_obj = self.nodes[node];
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	420 if not node_obj then
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	421 return false, "item-not-found";
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	422 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	423 node_obj.capabilities = capabilities;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	424 return true;
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	425 end
4dfb345e33ec util.pubsub: Add service:set_node_capabilities() Matthew Wild <mwild1@gmail.com> parents: 3917 diff changeset	426
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	427 function service:set_node_config(node, actor, new_config)
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	428 if not self:may(node, actor, "configure") then
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	429 return false, "forbidden";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	430 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	431
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	432 local node_obj = self.nodes[node];
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	433 if not node_obj then
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	434 return false, "item-not-found";
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	435 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	436
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	437 for k,v in pairs(new_config) do
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	438 node_obj.config[k] = v;
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	439 end
6439 d58ad8bd244b util.pubsub: Add support for limiting the number of item in a node (default to 20) Kim Alvefur <zash@zash.se> parents: 6437 diff changeset	440 trim_items(self.data[node], node_obj.config["pubsub#max_items"]);
6437 3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	441
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	442 return true;
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	443 end
3f1f11dfdf10 util.pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 6436 diff changeset	444
3619 291ae816d800 mod_pubsub: It's aliiiive! Matthew Wild <mwild1@gmail.com> parents: diff changeset	445 return _M;

prosody

999434eb1bbf

util/pubsub.lua

Software / code / prosody

Annotate

util/pubsub.lua @ 6648:999434eb1bbf

Software `/` code `/` prosody