Annotate prosody: plugins/mod

author	Kim Alvefur <zash@zash.se>
date	Sun, 05 Aug 2018 15:17:00 +0200 (2018-08-05)
parent	9114:ca5228a7d907
child	9132:2aaa192e3da5

rev	line source
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	1 local pubsub = require "util.pubsub";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	2 local jid_bare = require "util.jid".bare;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	3 local jid_split = require "util.jid".split;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	4 local jid_join = require "util.jid".join;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	5 local set_new = require "util.set".new;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	6 local st = require "util.stanza";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	7 local calculate_hash = require "util.caps".calculate_hash;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	8 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;
8320 fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	9 local cache = require "util.cache";
8341 910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8339 diff changeset	10 local set = require "util.set";
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	11
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	12 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	13 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	14 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	15
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	16 local lib_pubsub = module:require "pubsub";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	17
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	18 local empty_set = set_new();
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	19
9113 74639d606a15 mod_pep: Add comments describing root tables used for data Kim Alvefur <zash@zash.se> parents: 9103 diff changeset	20 -- username -> util.pubsub service object
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	21 local services = {};
9113 74639d606a15 mod_pep: Add comments describing root tables used for data Kim Alvefur <zash@zash.se> parents: 9103 diff changeset	22
74639d606a15 mod_pep: Add comments describing root tables used for data Kim Alvefur <zash@zash.se> parents: 9103 diff changeset	23 -- username -> recipient -> set of full JID
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	24 local recipients = {};
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	25 local hash_map = {};
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	26
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	27 local host = module.host;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	28
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	29 local node_config = module:open_store("pep", "map");
8306 202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	30 local known_nodes = module:open_store("pep");
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	31
9077 aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	32 local max_max_items = module:get_option_number("pep_max_items", 256);
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	33
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	34 function module.save()
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	35 return { services = services };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	36 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	37
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	38 function module.restore(data)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	39 services = data.services;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	40 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	41
8696 164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 8377 diff changeset	42 function is_item_stanza(item)
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 8377 diff changeset	43 return st.is_stanza(item) and item.attr.xmlns == xmlns_pubsub and item.name == "item";
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 8377 diff changeset	44 end
164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 8377 diff changeset	45
9080 1b21f8ffaec8 mod_pep: Silence warnings about unused arguments [luacheck] Kim Alvefur <zash@zash.se> parents: 9077 diff changeset	46 function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor
9077 aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	47 if (new_config["max_items"] or 1) > max_max_items then
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	48 return false;
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	49 end
9103 d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open' Kim Alvefur <zash@zash.se> parents: 9099 diff changeset	50 if new_config["access_model"] ~= "presence"
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open' Kim Alvefur <zash@zash.se> parents: 9099 diff changeset	51 and new_config["access_model"] ~= "whitelist"
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open' Kim Alvefur <zash@zash.se> parents: 9099 diff changeset	52 and new_config["access_model"] ~= "open" then
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open' Kim Alvefur <zash@zash.se> parents: 9099 diff changeset	53 return false;
d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open' Kim Alvefur <zash@zash.se> parents: 9099 diff changeset	54 end
9082 297a06074175 mod_pep: Return true if all node config checks passes (fixes configuration) Kim Alvefur <zash@zash.se> parents: 9080 diff changeset	55 return true;
9077 aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	56 end
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	57
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	58 local function subscription_presence(username, recipient)
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	59 local user_bare = jid_join(username, host);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	60 local recipient_bare = jid_bare(recipient);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	61 if (recipient_bare == user_bare) then return true; end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	62 return is_contact_subscribed(username, host, recipient_bare);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	63 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	64
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	65 local function nodestore(username)
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	66 -- luacheck: ignore 212/self
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	67 local store = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	68 function store:get(node)
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	69 local data, err = node_config:get(username, node)
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	70 if data == true then
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	71 -- COMPAT Previously stored only a boolean representing 'persist_items'
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	72 data = {
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	73 name = node;
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	74 config = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	75 subscribers = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	76 affiliations = {};
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	77 };
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	78 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	79 return data, err;
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	80 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	81 function store:set(node, data)
9029 c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	82 if data then
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	83 -- Save the data without subscriptions
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	84 -- TODO Save explicit subscriptions maybe?
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	85 data = {
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	86 name = data.name;
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	87 config = data.config;
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	88 affiliations = data.affiliations;
9030 7d0b7e086c6a mod_pep_plus: Include an empty set of subscribers (fixes traceback) Kim Alvefur <zash@zash.se> parents: 9029 diff changeset	89 subscribers = {};
9029 c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	90 };
c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient Kim Alvefur <zash@zash.se> parents: 8982 diff changeset	91 end
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	92 return node_config:set(username, node, data);
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	93 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	94 function store:users()
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	95 return pairs(known_nodes:get(username) or {});
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	96 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	97 return store;
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	98 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	99
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	100 local function simple_itemstore(username)
8218 2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore Kim Alvefur <zash@zash.se> parents: 8215 diff changeset	101 return function (config, node)
8333 2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8332 diff changeset	102 if config["persist_items"] then
8320 fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	103 module:log("debug", "Creating new persistent item store for user %s, node %q", username, node);
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	104 local archive = module:open_store("pep_"..node, "archive");
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	105 return lib_pubsub.archive_itemstore(archive, config, username, node, false);
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	106 else
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	107 module:log("debug", "Creating new ephemeral item store for user %s, node %q", username, node);
8333 2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8332 diff changeset	108 return cache.new(tonumber(config["max_items"]));
8320 fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	109 end
8218 2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore Kim Alvefur <zash@zash.se> parents: 8215 diff changeset	110 end
8215 835bb32c36b4 mod_pep_plus: Add item persistency. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8214 diff changeset	111 end
835bb32c36b4 mod_pep_plus: Add item persistency. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8214 diff changeset	112
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	113 local function get_broadcaster(username)
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	114 local user_bare = jid_join(username, host);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	115 local function simple_broadcast(kind, node, jids, item)
8895 d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8753 diff changeset	116 local message = st.message({ from = user_bare, type = "headline" })
d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8753 diff changeset	117 :tag("event", { xmlns = xmlns_pubsub_event })
d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8753 diff changeset	118 :tag(kind, { node = node });
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	119 if item then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	120 item = st.clone(item);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	121 item.attr.xmlns = nil; -- Clear the pubsub namespace
8895 d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8753 diff changeset	122 message:add_child(item);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	123 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	124 for jid in pairs(jids) do
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	125 module:log("debug", "Sending notification to %s from %s: %s", jid, user_bare, tostring(item));
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	126 message.attr.to = jid;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	127 module:send(message);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	128 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	129 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	130 return simple_broadcast;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	131 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	132
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	133 function get_pep_service(username)
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	134 module:log("debug", "get_pep_service(%q)", username);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	135 local user_bare = jid_join(username, host);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	136 local service = services[username];
6432 388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	137 if service then
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	138 return service;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	139 end
6432 388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	140 service = pubsub.new({
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	141 capabilities = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	142 none = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	143 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	144 publish = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	145 retract = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	146 get_nodes = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	147
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	148 subscribe = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	149 unsubscribe = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	150 get_subscription = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	151 get_subscriptions = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	152 get_items = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	153
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	154 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	155 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	156 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	157 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	158
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	159 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	160 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	161
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	162 set_affiliation = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	163 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	164 subscriber = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	165 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	166 publish = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	167 retract = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	168 get_nodes = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	169
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	170 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	171 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	172 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	173 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	174 get_items = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	175
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	176 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	177 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	178 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	179 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	180
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	181 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	182 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	183
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	184 set_affiliation = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	185 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	186 publisher = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	187 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	188 publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	189 retract = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	190 get_nodes = true;
9114 ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations Matthew Wild <mwild1@gmail.com> parents: 9113 diff changeset	191 get_configuration = true;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	192
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	193 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	194 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	195 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	196 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	197 get_items = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	198
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	199 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	200 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	201 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	202 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	203
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	204 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	205 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	206
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	207 set_affiliation = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	208 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	209 owner = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	210 create = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	211 publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	212 retract = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	213 delete = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	214 get_nodes = true;
6443 f4403c270ea2 mod_pep_plus: Add node config form Kim Alvefur <zash@zash.se> parents: 6432 diff changeset	215 configure = true;
9114 ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations Matthew Wild <mwild1@gmail.com> parents: 9113 diff changeset	216 get_configuration = true;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	217
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	218 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	219 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	220 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	221 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	222 get_items = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	223
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	224
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	225 subscribe_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	226 unsubscribe_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	227 get_subscription_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	228 get_subscriptions_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	229
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	230 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	231 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	232
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	233 set_affiliation = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	234 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	235 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	236
6444 aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP) Kim Alvefur <zash@zash.se> parents: 6443 diff changeset	237 node_defaults = {
8333 2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8332 diff changeset	238 ["max_items"] = 1;
2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic) Kim Alvefur <zash@zash.se> parents: 8332 diff changeset	239 ["persist_items"] = true;
9097 ce2ba9f91c84 mod_pep: Set default access model to 'presence' Kim Alvefur <zash@zash.se> parents: 9082 diff changeset	240 ["access_model"] = "presence";
6444 aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP) Kim Alvefur <zash@zash.se> parents: 6443 diff changeset	241 };
aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP) Kim Alvefur <zash@zash.se> parents: 6443 diff changeset	242
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	243 autocreate_on_publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	244 autocreate_on_subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	245
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	246 nodestore = nodestore(username);
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	247 itemstore = simple_itemstore(username);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	248 broadcaster = get_broadcaster(username);
8696 164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 8377 diff changeset	249 itemcheck = is_item_stanza;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	250 get_affiliation = function (jid)
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	251 if jid_bare(jid) == user_bare then
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	252 return "owner";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	253 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	254 end;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	255
9099 974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	256 access_models = {
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	257 presence = function (jid)
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	258 if subscription_presence(username, jid) then
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	259 return "subscriber";
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	260 end
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	261 end;
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	262 };
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	263
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	264 normalize_jid = jid_bare;
9077 aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	265
aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen) Matthew Wild <mwild1@gmail.com> parents: 9074 diff changeset	266 check_node_config = check_node_config;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	267 });
8306 202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	268 local nodes, err = known_nodes:get(username);
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	269 if nodes then
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	270 module:log("debug", "Restoring nodes for user %s", username);
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	271 for node in pairs(nodes) do
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	272 module:log("debug", "Restoring node %q", node);
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	273 service:create(node, true);
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	274 end
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	275 elseif err then
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	276 module:log("error", "Could not restore nodes for %s: %s", username, err);
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	277 else
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	278 module:log("debug", "No known nodes");
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	279 end
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	280 services[username] = service;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	281 module:add_item("pep-service", { service = service, jid = user_bare });
6432 388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	282 return service;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	283 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	284
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	285 function handle_pubsub_iq(event)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	286 local origin, stanza = event.origin, event.stanza;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	287 local service_name = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	288 if stanza.attr.to ~= nil then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	289 service_name = jid_split(stanza.attr.to);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	290 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	291 local service = get_pep_service(service_name);
8335 9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	292
9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	293 return lib_pubsub.handle_pubsub_iq(event, service)
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	294 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	295
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	296 module:hook("iq/bare/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	297 module:hook("iq/bare/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	298
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	299 module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	300 module:add_feature("http://jabber.org/protocol/pubsub#publish");
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	301
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	302 local function get_caps_hash_from_presence(stanza, current)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	303 local t = stanza.attr.type;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	304 if not t then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	305 local child = stanza:get_child("c", "http://jabber.org/protocol/caps");
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	306 if child then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	307 local attr = child.attr;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	308 if attr.hash then -- new caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	309 if attr.hash == 'sha-1' and attr.node and attr.ver then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	310 return attr.ver, attr.node.."#"..attr.ver;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	311 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	312 else -- legacy caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	313 if attr.node and attr.ver then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	314 return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	315 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	316 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	317 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	318 return; -- no or bad caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	319 elseif t == "unavailable" or t == "error" then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	320 return;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	321 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	322 return current; -- no caps, could mean caps optimization, so return current
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	323 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	324
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	325 local function resend_last_item(jid, node, service)
8377 58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox) Kim Alvefur <zash@zash.se> parents: 8342 diff changeset	326 local ok, id, item = service:get_last_item(node, jid);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	327 if not ok then return; end
8377 58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox) Kim Alvefur <zash@zash.se> parents: 8342 diff changeset	328 if not id then return; end
58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox) Kim Alvefur <zash@zash.se> parents: 8342 diff changeset	329 service.config.broadcaster("items", node, { [jid] = true }, item);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	330 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	331
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	332 local function update_subscriptions(recipient, service_name, nodes)
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	333 nodes = nodes or empty_set;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	334
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	335 local service_recipients = recipients[service_name];
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	336 if not service_recipients then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	337 service_recipients = {};
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	338 recipients[service_name] = service_recipients;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	339 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	340
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	341 local current = service_recipients[recipient];
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	342 if not current or type(current) ~= "table" then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	343 current = empty_set;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	344 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	345
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	346 if (current == empty_set or current:empty()) and (nodes == empty_set or nodes:empty()) then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	347 return;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	348 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	349
8753 d6373a378b73 mod_pep_plus: Skip getting PEP service instance for sessions that have not touched PEP Kim Alvefur <zash@zash.se> parents: 8728 diff changeset	350 local service = get_pep_service(service_name);
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	351 for node in current - nodes do
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	352 service:remove_subscription(node, recipient, recipient);
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	353 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	354
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	355 for node in nodes - current do
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	356 service:add_subscription(node, recipient, recipient);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	357 resend_last_item(recipient, node, service);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	358 end
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	359
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	360 if nodes == empty_set or nodes:empty() then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	361 nodes = nil;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	362 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	363
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	364 service_recipients[recipient] = nodes;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	365 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	366
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	367 module:hook("presence/bare", function(event)
8728 41c959c5c84b Fix spelling throughout the codebase [codespell] Kim Alvefur <zash@zash.se> parents: 8696 diff changeset	368 -- inbound presence to bare JID received
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	369 local origin, stanza = event.origin, event.stanza;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	370 local t = stanza.attr.type;
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	371 local is_self = not stanza.attr.to;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	372 local username = jid_split(stanza.attr.to);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	373 local user_bare = jid_bare(stanza.attr.to);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	374 if is_self then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	375 username = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	376 user_bare = jid_join(username, host);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	377 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	378
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	379 if not t then -- available presence
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	380 if is_self or subscription_presence(username, stanza.attr.from) then
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	381 local recipient = stanza.attr.from;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	382 local current = recipients[username] and recipients[username][recipient];
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	383 local hash, query_node = get_caps_hash_from_presence(stanza, current);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	384 if current == hash or (current and current == hash_map[hash]) then return; end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	385 if not hash then
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	386 update_subscriptions(recipient, username);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	387 else
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	388 recipients[username] = recipients[username] or {};
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	389 if hash_map[hash] then
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	390 update_subscriptions(recipient, username, hash_map[hash]);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	391 else
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	392 recipients[username][recipient] = hash;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	393 local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	394 if is_self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	395 -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	396 origin.send(
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	397 st.stanza("iq", {from=user_bare, to=stanza.attr.from, id="disco", type="get"})
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	398 :tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node})
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	399 );
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	400 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	401 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	402 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	403 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	404 elseif t == "unavailable" then
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	405 update_subscriptions(stanza.attr.from, username);
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	406 elseif not is_self and t == "unsubscribe" then
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	407 local from = jid_bare(stanza.attr.from);
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	408 local subscriptions = recipients[username];
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	409 if subscriptions then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	410 for subscriber in pairs(subscriptions) do
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	411 if jid_bare(subscriber) == from then
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	412 update_subscriptions(subscriber, username);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	413 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	414 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	415 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	416 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	417 end, 10);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	418
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	419 module:hook("iq-result/bare/disco", function(event)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	420 local origin, stanza = event.origin, event.stanza;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	421 local disco = stanza:get_child("query", "http://jabber.org/protocol/disco#info");
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	422 if not disco then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	423 return;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	424 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	425
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	426 -- Process disco response
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	427 local is_self = stanza.attr.to == nil;
8315 967f04fe7fd4 mod_pep_plus: Add missing variable Kim Alvefur <zash@zash.se> parents: 8307 diff changeset	428 local user_bare = jid_bare(stanza.attr.to);
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	429 local username = jid_split(stanza.attr.to);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	430 if is_self then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	431 username = origin.username;
8315 967f04fe7fd4 mod_pep_plus: Add missing variable Kim Alvefur <zash@zash.se> parents: 8307 diff changeset	432 user_bare = jid_join(username, host);
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	433 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	434 local contact = stanza.attr.from;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	435 local current = recipients[username] and recipients[username][contact];
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	436 if type(current) ~= "string" then return; end -- check if waiting for recipient's response
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	437 local ver = current;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	438 if not string.find(current, "#") then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	439 ver = calculate_hash(disco.tags); -- calculate hash
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	440 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	441 local notify = set_new();
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	442 for _, feature in pairs(disco.tags) do
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	443 if feature.name == "feature" and feature.attr.var then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	444 local nfeature = feature.attr.var:match("^(.*)%+notify$");
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	445 if nfeature then notify:add(nfeature); end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	446 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	447 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	448 hash_map[ver] = notify; -- update hash map
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	449 if is_self then
8307 94860b5733d3 mod_pep_plus: Update subscriptions for other local users only Kim Alvefur <zash@zash.se> parents: 8306 diff changeset	450 -- Optimization: Fiddle with other local users
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	451 for jid, item in pairs(origin.roster) do -- for all interested contacts
8304 9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry Kim Alvefur <zash@zash.se> parents: 8303 diff changeset	452 if jid then
8307 94860b5733d3 mod_pep_plus: Update subscriptions for other local users only Kim Alvefur <zash@zash.se> parents: 8306 diff changeset	453 local contact_node, contact_host = jid_split(jid);
9061 82dd435c942c mod_pep_plus: Fix boolean logic precedence (thanks Link Mauve) Kim Alvefur <zash@zash.se> parents: 9030 diff changeset	454 if contact_host == host and (item.subscription == "both" or item.subscription == "from") then
8307 94860b5733d3 mod_pep_plus: Update subscriptions for other local users only Kim Alvefur <zash@zash.se> parents: 8306 diff changeset	455 update_subscriptions(user_bare, contact_node, notify);
8304 9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry Kim Alvefur <zash@zash.se> parents: 8303 diff changeset	456 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	457 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	458 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	459 end
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	460 update_subscriptions(contact, username, notify);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	461 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	462
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	463 module:hook("account-disco-info-node", function(event)
8982 4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8949 diff changeset	464 local stanza, origin = event.stanza, event.origin;
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	465 local service_name = origin.username;
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	466 if stanza.attr.to ~= nil then
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	467 service_name = jid_split(stanza.attr.to);
ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	468 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	469 local service = get_pep_service(service_name);
8982 4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8949 diff changeset	470 return lib_pubsub.handle_disco_info_node(event, service);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	471 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	472
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	473 module:hook("account-disco-info", function(event)
8319 57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	474 local origin, reply = event.origin, event.reply;
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	475
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	476 reply:tag('identity', {category='pubsub', type='pep'}):up();
8319 57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	477
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	478 local username = jid_split(reply.attr.from) or origin.username;
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	479 local service = get_pep_service(username);
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	480
8342 0c0990a575de mod_pep_plus: Fix a typo. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8341 diff changeset	481 local supported_features = lib_pubsub.get_feature_set(service) + set.new{
8341 910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8339 diff changeset	482 -- Features not covered by the above
8332 e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	483 "access-presence",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	484 "auto-subscribe",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	485 "filtered-notifications",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	486 "last-published",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	487 "persistent-items",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	488 "presence-notifications",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	489 "presence-subscribe",
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	490 };
8341 910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8339 diff changeset	491
8342 0c0990a575de mod_pep_plus: Fix a typo. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8341 diff changeset	492 for feature in supported_features do
8332 e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	493 reply:tag('feature', {var=xmlns_pubsub.."#"..feature}):up();
e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods Kim Alvefur <zash@zash.se> parents: 8331 diff changeset	494 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	495 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	496
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	497 module:hook("account-disco-items-node", function(event)
8982 4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8949 diff changeset	498 local stanza, origin = event.stanza, event.origin;
8321 73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox) Kim Alvefur <zash@zash.se> parents: 8320 diff changeset	499 local is_self = stanza.attr.to == nil;
73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox) Kim Alvefur <zash@zash.se> parents: 8320 diff changeset	500 local username = jid_split(stanza.attr.to);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

1 local pubsub = require "util.pubsub";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

2 local jid_bare = require "util.jid".bare;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

3 local jid_split = require "util.jid".split;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

4 local jid_join = require "util.jid".join;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

5 local set_new = require "util.set".new;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

6 local st = require "util.stanza";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

7 local calculate_hash = require "util.caps".calculate_hash;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

8 local is_contact_subscribed = require "core.rostermanager".is_contact_subscribed;

8320

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

9 local cache = require "util.cache";

8341

910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8339

diff changeset

10 local set = require "util.set";

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

11

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

12 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

13 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

14 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

15

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

16 local lib_pubsub = module:require "pubsub";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

17

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

18 local empty_set = set_new();

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

19

9113

74639d606a15 mod_pep: Add comments describing root tables used for data

Kim Alvefur <zash@zash.se>

parents: 9103

diff changeset

20 -- username -> util.pubsub service object

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

21 local services = {};

9113

74639d606a15 mod_pep: Add comments describing root tables used for data

Kim Alvefur <zash@zash.se>

parents: 9103

diff changeset

22

74639d606a15 mod_pep: Add comments describing root tables used for data

Kim Alvefur <zash@zash.se>

parents: 9103

diff changeset

23 -- username -> recipient -> set of full JID

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

24 local recipients = {};

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

25 local hash_map = {};

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

26

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

27 local host = module.host;

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

28

8949

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

29 local node_config = module:open_store("pep", "map");

8306

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

30 local known_nodes = module:open_store("pep");

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

31

9077

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

32 local max_max_items = module:get_option_number("pep_max_items", 256);

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

33

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

34 function module.save()

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

35 return { services = services };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

36 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

37

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

38 function module.restore(data)

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

39 services = data.services;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

40 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

41

8696

164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 8377

diff changeset

42 function is_item_stanza(item)

164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 8377

diff changeset

43 return st.is_stanza(item) and item.attr.xmlns == xmlns_pubsub and item.name == "item";

164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 8377

diff changeset

44 end

164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 8377

diff changeset

45

9080

1b21f8ffaec8 mod_pep: Silence warnings about unused arguments [luacheck]

Kim Alvefur <zash@zash.se>

parents: 9077

diff changeset

46 function check_node_config(node, actor, new_config) -- luacheck: ignore 212/node 212/actor

9077

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

47 if (new_config["max_items"] or 1) > max_max_items then

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

48 return false;

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

49 end

9103

d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'

Kim Alvefur <zash@zash.se>

parents: 9099

diff changeset

50 if new_config["access_model"] ~= "presence"

d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'

Kim Alvefur <zash@zash.se>

parents: 9099

diff changeset

51 and new_config["access_model"] ~= "whitelist"

d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'

Kim Alvefur <zash@zash.se>

parents: 9099

diff changeset

52 and new_config["access_model"] ~= "open" then

d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'

Kim Alvefur <zash@zash.se>

parents: 9099

diff changeset

53 return false;

d5a7d2697b19 mod_pep: Restrict access models to 'presence', 'whitelist' and 'open'

Kim Alvefur <zash@zash.se>

parents: 9099

diff changeset

54 end

9082

297a06074175 mod_pep: Return true if all node config checks passes (fixes configuration)

Kim Alvefur <zash@zash.se>

parents: 9080

diff changeset

55 return true;

9077

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

56 end

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

57

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

58 local function subscription_presence(username, recipient)

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

59 local user_bare = jid_join(username, host);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

60 local recipient_bare = jid_bare(recipient);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

61 if (recipient_bare == user_bare) then return true; end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

62 return is_contact_subscribed(username, host, recipient_bare);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

63 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

64

8949

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

65 local function nodestore(username)

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

66 -- luacheck: ignore 212/self

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

67 local store = {};

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

68 function store:get(node)

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

69 local data, err = node_config:get(username, node)

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

70 if data == true then

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

71 -- COMPAT Previously stored only a boolean representing 'persist_items'

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

72 data = {

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

73 name = node;

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

74 config = {};

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

75 subscribers = {};

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

76 affiliations = {};

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

77 };

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

78 end

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

79 return data, err;

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

80 end

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

81 function store:set(node, data)

9029

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

82 if data then

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

83 -- Save the data without subscriptions

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

84 -- TODO Save explicit subscriptions maybe?

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

85 data = {

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

86 name = data.name;

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

87 config = data.config;

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

88 affiliations = data.affiliations;

9030

7d0b7e086c6a mod_pep_plus: Include an empty set of subscribers (fixes traceback)

Kim Alvefur <zash@zash.se>

parents: 9029

diff changeset

89 subscribers = {};

9029

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

90 };

c5e738b54d77 mod_pep_plus: Don't save subscriptions since they are normally session based and transient

Kim Alvefur <zash@zash.se>

parents: 8982

diff changeset

91 end

8949

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

92 return node_config:set(username, node, data);

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

93 end

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

94 function store:users()

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

95 return pairs(known_nodes:get(username) or {});

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

96 end

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

97 return store;

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

98 end

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

99

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

100 local function simple_itemstore(username)

8218

2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore

Kim Alvefur <zash@zash.se>

parents: 8215

diff changeset

101 return function (config, node)

8333

2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)

Kim Alvefur <zash@zash.se>

parents: 8332

diff changeset

102 if config["persist_items"] then

8320

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

103 module:log("debug", "Creating new persistent item store for user %s, node %q", username, node);

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

104 local archive = module:open_store("pep_"..node, "archive");

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

105 return lib_pubsub.archive_itemstore(archive, config, username, node, false);

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

106 else

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

107 module:log("debug", "Creating new ephemeral item store for user %s, node %q", username, node);

8333

2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)

Kim Alvefur <zash@zash.se>

parents: 8332

diff changeset

108 return cache.new(tonumber(config["max_items"]));

8320

fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items

Kim Alvefur <zash@zash.se>

parents: 8319

diff changeset

109 end

8218

2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore

Kim Alvefur <zash@zash.se>

parents: 8215

diff changeset

110 end

8215

835bb32c36b4 mod_pep_plus: Add item persistency.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8214

diff changeset

111 end

835bb32c36b4 mod_pep_plus: Add item persistency.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8214

diff changeset

112

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

113 local function get_broadcaster(username)

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

114 local user_bare = jid_join(username, host);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

115 local function simple_broadcast(kind, node, jids, item)

8895

d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8753

diff changeset

116 local message = st.message({ from = user_bare, type = "headline" })

d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8753

diff changeset

117 :tag("event", { xmlns = xmlns_pubsub_event })

d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8753

diff changeset

118 :tag(kind, { node = node });

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

119 if item then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

120 item = st.clone(item);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

121 item.attr.xmlns = nil; -- Clear the pubsub namespace

8895

d00ea07de9a0 mod_pep_plus: Prevent nil from being added as a child on item deletion.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8753

diff changeset

122 message:add_child(item);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

123 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

124 for jid in pairs(jids) do

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

125 module:log("debug", "Sending notification to %s from %s: %s", jid, user_bare, tostring(item));

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

126 message.attr.to = jid;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

127 module:send(message);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

128 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

129 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

130 return simple_broadcast;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

131 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

132

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

133 function get_pep_service(username)

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

134 module:log("debug", "get_pep_service(%q)", username);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

135 local user_bare = jid_join(username, host);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

136 local service = services[username];

6432

388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list

Kim Alvefur <zash@zash.se>

parents: 6305

diff changeset

137 if service then

388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list

Kim Alvefur <zash@zash.se>

parents: 6305

diff changeset

138 return service;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

139 end

6432

388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list

Kim Alvefur <zash@zash.se>

parents: 6305

diff changeset

140 service = pubsub.new({

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

141 capabilities = {

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

142 none = {

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

143 create = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

144 publish = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

145 retract = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

146 get_nodes = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

147

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

148 subscribe = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

149 unsubscribe = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

150 get_subscription = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

151 get_subscriptions = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

152 get_items = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

153

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

154 subscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

155 unsubscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

156 get_subscription_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

157 get_subscriptions_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

158

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

159 be_subscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

160 be_unsubscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

161

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

162 set_affiliation = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

163 };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

164 subscriber = {

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

165 create = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

166 publish = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

167 retract = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

168 get_nodes = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

169

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

170 subscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

171 unsubscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

172 get_subscription = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

173 get_subscriptions = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

174 get_items = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

175

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

176 subscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

177 unsubscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

178 get_subscription_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

179 get_subscriptions_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

180

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

181 be_subscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

182 be_unsubscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

183

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

184 set_affiliation = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

185 };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

186 publisher = {

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

187 create = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

188 publish = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

189 retract = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

190 get_nodes = true;

9114

ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations

Matthew Wild <mwild1@gmail.com>

parents: 9113

diff changeset

191 get_configuration = true;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

192

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

193 subscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

194 unsubscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

195 get_subscription = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

196 get_subscriptions = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

197 get_items = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

198

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

199 subscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

200 unsubscribe_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

201 get_subscription_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

202 get_subscriptions_other = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

203

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

204 be_subscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

205 be_unsubscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

206

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

207 set_affiliation = false;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

208 };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

209 owner = {

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

210 create = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

211 publish = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

212 retract = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

213 delete = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

214 get_nodes = true;

6443

f4403c270ea2 mod_pep_plus: Add node config form

Kim Alvefur <zash@zash.se>

parents: 6432

diff changeset

215 configure = true;

9114

ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations

Matthew Wild <mwild1@gmail.com>

parents: 9113

diff changeset

216 get_configuration = true;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

217

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

218 subscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

219 unsubscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

220 get_subscription = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

221 get_subscriptions = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

222 get_items = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

223

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

224

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

225 subscribe_other = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

226 unsubscribe_other = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

227 get_subscription_other = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

228 get_subscriptions_other = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

229

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

230 be_subscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

231 be_unsubscribed = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

232

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

233 set_affiliation = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

234 };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

235 };

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

236

6444

aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)

Kim Alvefur <zash@zash.se>

parents: 6443

diff changeset

237 node_defaults = {

8333

2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)

Kim Alvefur <zash@zash.se>

parents: 8332

diff changeset

238 ["max_items"] = 1;

2abbb01cd756 pubsub: Distinguish internal representation of node config from XEP-0060 form (util.pubsub should be protocol-agnostic)

Kim Alvefur <zash@zash.se>

parents: 8332

diff changeset

239 ["persist_items"] = true;

9097

ce2ba9f91c84 mod_pep: Set default access model to 'presence'

Kim Alvefur <zash@zash.se>

parents: 9082

diff changeset

240 ["access_model"] = "presence";

6444

aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)

Kim Alvefur <zash@zash.se>

parents: 6443

diff changeset

241 };

aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP)

Kim Alvefur <zash@zash.se>

parents: 6443

diff changeset

242

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

243 autocreate_on_publish = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

244 autocreate_on_subscribe = true;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

245

8949

9194431b6447 mod_pep_plus: Support persistence of node configuration

Kim Alvefur <zash@zash.se>

parents: 8895

diff changeset

246 nodestore = nodestore(username);

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

247 itemstore = simple_itemstore(username);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

248 broadcaster = get_broadcaster(username);

8696

164da3186511 mod_pep_plus: Validate items here too (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 8377

diff changeset

249 itemcheck = is_item_stanza;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

250 get_affiliation = function (jid)

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

251 if jid_bare(jid) == user_bare then

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

252 return "owner";

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

253 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

254 end;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

255

9099

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

256 access_models = {

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

257 presence = function (jid)

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

258 if subscription_presence(username, jid) then

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

259 return "subscriber";

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

260 end

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

261 end;

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

262 };

974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback

Kim Alvefur <zash@zash.se>

parents: 9097

diff changeset

263

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

264 normalize_jid = jid_bare;

9077

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

265

aefb96a52f5f mod_pep: Add 'pep_max_items' option to set an upper limit, defaults to 256 (scientifically chosen)

Matthew Wild <mwild1@gmail.com>

parents: 9074

diff changeset

266 check_node_config = check_node_config;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

267 });

8306

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

268 local nodes, err = known_nodes:get(username);

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

269 if nodes then

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

270 module:log("debug", "Restoring nodes for user %s", username);

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

271 for node in pairs(nodes) do

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

272 module:log("debug", "Restoring node %q", node);

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

273 service:create(node, true);

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

274 end

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

275 elseif err then

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

276 module:log("error", "Could not restore nodes for %s: %s", username, err);

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

277 else

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

278 module:log("debug", "No known nodes");

202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later

Kim Alvefur <zash@zash.se>

parents: 8305

diff changeset

279 end

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

280 services[username] = service;

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

281 module:add_item("pep-service", { service = service, jid = user_bare });

6432

388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list

Kim Alvefur <zash@zash.se>

parents: 6305

diff changeset

282 return service;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

283 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

284

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

285 function handle_pubsub_iq(event)

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

286 local origin, stanza = event.origin, event.stanza;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

287 local service_name = origin.username;

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

288 if stanza.attr.to ~= nil then

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

289 service_name = jid_split(stanza.attr.to);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

290 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

291 local service = get_pep_service(service_name);

8335

9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8333

diff changeset

292

9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8333

diff changeset

293 return lib_pubsub.handle_pubsub_iq(event, service)

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

294 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

295

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

296 module:hook("iq/bare/"..xmlns_pubsub..":pubsub", handle_pubsub_iq);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

297 module:hook("iq/bare/"..xmlns_pubsub_owner..":pubsub", handle_pubsub_iq);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

298

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

299 module:add_identity("pubsub", "pep", module:get_option_string("name", "Prosody"));

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

300 module:add_feature("http://jabber.org/protocol/pubsub#publish");

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

301

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

302 local function get_caps_hash_from_presence(stanza, current)

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

303 local t = stanza.attr.type;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

304 if not t then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

305 local child = stanza:get_child("c", "http://jabber.org/protocol/caps");

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

306 if child then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

307 local attr = child.attr;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

308 if attr.hash then -- new caps

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

309 if attr.hash == 'sha-1' and attr.node and attr.ver then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

310 return attr.ver, attr.node.."#"..attr.ver;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

311 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

312 else -- legacy caps

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

313 if attr.node and attr.ver then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

314 return attr.node.."#"..attr.ver.."#"..(attr.ext or ""), attr.node.."#"..attr.ver;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

315 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

316 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

317 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

318 return; -- no or bad caps

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

319 elseif t == "unavailable" or t == "error" then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

320 return;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

321 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

322 return current; -- no caps, could mean caps optimization, so return current

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

323 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

324

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

325 local function resend_last_item(jid, node, service)

8377

58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8342

diff changeset

326 local ok, id, item = service:get_last_item(node, jid);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

327 if not ok then return; end

8377

58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8342

diff changeset

328 if not id then return; end

58cdbbe3b86a mod_pep_plus: Broadcast only the last item (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8342

diff changeset

329 service.config.broadcaster("items", node, { [jid] = true }, item);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

330 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

331

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

332 local function update_subscriptions(recipient, service_name, nodes)

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

333 nodes = nodes or empty_set;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

334

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

335 local service_recipients = recipients[service_name];

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

336 if not service_recipients then

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

337 service_recipients = {};

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

338 recipients[service_name] = service_recipients;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

339 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

340

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

341 local current = service_recipients[recipient];

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

342 if not current or type(current) ~= "table" then

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

343 current = empty_set;

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

344 end

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

345

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

346 if (current == empty_set or current:empty()) and (nodes == empty_set or nodes:empty()) then

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

347 return;

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

348 end

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

349

8753

d6373a378b73 mod_pep_plus: Skip getting PEP service instance for sessions that have not touched PEP

Kim Alvefur <zash@zash.se>

parents: 8728

diff changeset

350 local service = get_pep_service(service_name);

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

351 for node in current - nodes do

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

352 service:remove_subscription(node, recipient, recipient);

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

353 end

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

354

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

355 for node in nodes - current do

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

356 service:add_subscription(node, recipient, recipient);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

357 resend_last_item(recipient, node, service);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

358 end

6305

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

359

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

360 if nodes == empty_set or nodes:empty() then

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

361 nodes = nil;

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

362 end

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

363

38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions

Kim Alvefur <zash@zash.se>

parents: 6264

diff changeset

364 service_recipients[recipient] = nodes;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

365 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

366

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

367 module:hook("presence/bare", function(event)

8728

41c959c5c84b Fix spelling throughout the codebase [codespell]

Kim Alvefur <zash@zash.se>

parents: 8696

diff changeset

368 -- inbound presence to bare JID received

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

369 local origin, stanza = event.origin, event.stanza;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

370 local t = stanza.attr.type;

8303

053cf683c2c7 mod_pep_plus: Rename variable for clarity

Kim Alvefur <zash@zash.se>

parents: 8300

diff changeset

371 local is_self = not stanza.attr.to;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

372 local username = jid_split(stanza.attr.to);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

373 local user_bare = jid_bare(stanza.attr.to);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

374 if is_self then

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

375 username = origin.username;

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

376 user_bare = jid_join(username, host);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

377 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

378

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

379 if not t then -- available presence

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

380 if is_self or subscription_presence(username, stanza.attr.from) then

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

381 local recipient = stanza.attr.from;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

382 local current = recipients[username] and recipients[username][recipient];

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

383 local hash, query_node = get_caps_hash_from_presence(stanza, current);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

384 if current == hash or (current and current == hash_map[hash]) then return; end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

385 if not hash then

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

386 update_subscriptions(recipient, username);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

387 else

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

388 recipients[username] = recipients[username] or {};

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

389 if hash_map[hash] then

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

390 update_subscriptions(recipient, username, hash_map[hash]);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

391 else

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

392 recipients[username][recipient] = hash;

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

393 local from_bare = origin.type == "c2s" and origin.username.."@"..origin.host;

8303

053cf683c2c7 mod_pep_plus: Rename variable for clarity

Kim Alvefur <zash@zash.se>

parents: 8300

diff changeset

394 if is_self or origin.type ~= "c2s" or (recipients[from_bare] and recipients[from_bare][origin.full_jid]) ~= hash then

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

395 -- COMPAT from ~= stanza.attr.to because OneTeam can't deal with missing from attribute

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

396 origin.send(

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

397 st.stanza("iq", {from=user_bare, to=stanza.attr.from, id="disco", type="get"})

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

398 :tag("query", {xmlns = "http://jabber.org/protocol/disco#info", node = query_node})

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

399 );

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

400 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

401 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

402 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

403 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

404 elseif t == "unavailable" then

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

405 update_subscriptions(stanza.attr.from, username);

8303

053cf683c2c7 mod_pep_plus: Rename variable for clarity

Kim Alvefur <zash@zash.se>

parents: 8300

diff changeset

406 elseif not is_self and t == "unsubscribe" then

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

407 local from = jid_bare(stanza.attr.from);

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

408 local subscriptions = recipients[username];

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

409 if subscriptions then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

410 for subscriber in pairs(subscriptions) do

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

411 if jid_bare(subscriber) == from then

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

412 update_subscriptions(subscriber, username);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

413 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

414 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

415 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

416 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

417 end, 10);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

418

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

419 module:hook("iq-result/bare/disco", function(event)

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

420 local origin, stanza = event.origin, event.stanza;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

421 local disco = stanza:get_child("query", "http://jabber.org/protocol/disco#info");

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

422 if not disco then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

423 return;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

424 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

425

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

426 -- Process disco response

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

427 local is_self = stanza.attr.to == nil;

8315

967f04fe7fd4 mod_pep_plus: Add missing variable

Kim Alvefur <zash@zash.se>

parents: 8307

diff changeset

428 local user_bare = jid_bare(stanza.attr.to);

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

429 local username = jid_split(stanza.attr.to);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

430 if is_self then

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

431 username = origin.username;

8315

967f04fe7fd4 mod_pep_plus: Add missing variable

Kim Alvefur <zash@zash.se>

parents: 8307

diff changeset

432 user_bare = jid_join(username, host);

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

433 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

434 local contact = stanza.attr.from;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

435 local current = recipients[username] and recipients[username][contact];

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

436 if type(current) ~= "string" then return; end -- check if waiting for recipient's response

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

437 local ver = current;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

438 if not string.find(current, "#") then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

439 ver = calculate_hash(disco.tags); -- calculate hash

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

440 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

441 local notify = set_new();

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

442 for _, feature in pairs(disco.tags) do

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

443 if feature.name == "feature" and feature.attr.var then

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

444 local nfeature = feature.attr.var:match("^(.*)%+notify$");

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

445 if nfeature then notify:add(nfeature); end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

446 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

447 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

448 hash_map[ver] = notify; -- update hash map

8303

053cf683c2c7 mod_pep_plus: Rename variable for clarity

Kim Alvefur <zash@zash.se>

parents: 8300

diff changeset

449 if is_self then

8307

94860b5733d3 mod_pep_plus: Update subscriptions for other local users only

Kim Alvefur <zash@zash.se>

parents: 8306

diff changeset

450 -- Optimization: Fiddle with other local users

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

451 for jid, item in pairs(origin.roster) do -- for all interested contacts

8304

9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry

Kim Alvefur <zash@zash.se>

parents: 8303

diff changeset

452 if jid then

8307

94860b5733d3 mod_pep_plus: Update subscriptions for other local users only

Kim Alvefur <zash@zash.se>

parents: 8306

diff changeset

453 local contact_node, contact_host = jid_split(jid);

9061

82dd435c942c mod_pep_plus: Fix boolean logic precedence (thanks Link Mauve)

Kim Alvefur <zash@zash.se>

parents: 9030

diff changeset

454 if contact_host == host and (item.subscription == "both" or item.subscription == "from") then

8307

94860b5733d3 mod_pep_plus: Update subscriptions for other local users only

Kim Alvefur <zash@zash.se>

parents: 8306

diff changeset

455 update_subscriptions(user_bare, contact_node, notify);

8304

9f8476c77fa8 mod_pep_plus: Skip over roster metadata (version, pending) entry

Kim Alvefur <zash@zash.se>

parents: 8303

diff changeset

456 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

457 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

458 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

459 end

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

460 update_subscriptions(contact, username, notify);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

461 end);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

462

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

463 module:hook("account-disco-info-node", function(event)

8982

4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8949

diff changeset

464 local stanza, origin = event.stanza, event.origin;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

465 local service_name = origin.username;

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

466 if stanza.attr.to ~= nil then

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

467 service_name = jid_split(stanza.attr.to);

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

468 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

469 local service = get_pep_service(service_name);

8982

4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8949

diff changeset

470 return lib_pubsub.handle_disco_info_node(event, service);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

471 end);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

472

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

473 module:hook("account-disco-info", function(event)

8319

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

474 local origin, reply = event.origin, event.reply;

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

475

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

476 reply:tag('identity', {category='pubsub', type='pep'}):up();

8319

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

477

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

478 local username = jid_split(reply.attr.from) or origin.username;

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

479 local service = get_pep_service(username);

57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub)

Kim Alvefur <zash@zash.se>

parents: 8318

diff changeset

480

8342

0c0990a575de mod_pep_plus: Fix a typo.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8341

diff changeset

481 local supported_features = lib_pubsub.get_feature_set(service) + set.new{

8341

910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8339

diff changeset

482 -- Features not covered by the above

8332

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

483 "access-presence",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

484 "auto-subscribe",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

485 "filtered-notifications",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

486 "last-published",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

487 "persistent-items",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

488 "presence-notifications",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

489 "presence-subscribe",

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

490 };

8341

910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8339

diff changeset

491

8342

0c0990a575de mod_pep_plus: Fix a typo.

Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>

parents: 8341

diff changeset

492 for feature in supported_features do

8332

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

493 reply:tag('feature', {var=xmlns_pubsub.."#"..feature}):up();

e89b57d0d80a mod_pep_plus: Advertise additional features not covered by inspection of pubsub service methods

Kim Alvefur <zash@zash.se>

parents: 8331

diff changeset

494 end

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

495 end);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

496

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

497 module:hook("account-disco-items-node", function(event)

8982

4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8949

diff changeset

498 local stanza, origin = event.stanza, event.origin;

8321

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

499 local is_self = stanza.attr.to == nil;

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

500 local username = jid_split(stanza.attr.to);

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

501 if is_self then

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

502 username = origin.username;

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

503 end

8321

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

504 local service = get_pep_service(username);

8982

4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib

Kim Alvefur <zash@zash.se>

parents: 8949

diff changeset

505 return lib_pubsub.handle_disco_items_node(event, service);

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

506 end);

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

507

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

508 module:hook("account-disco-items", function(event)

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

509 local reply, stanza, origin = event.reply, event.stanza, event.origin;

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

510

8321

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

511 local is_self = stanza.attr.to == nil;

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

512 local user_bare = jid_bare(stanza.attr.to);

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

513 local username = jid_split(stanza.attr.to);

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

514 if is_self then

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

515 username = origin.username;

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

516 user_bare = jid_join(username, host);

8305

ec605946e597 mod_pep_plus: Use local username instead of bare JID for references

Kim Alvefur <zash@zash.se>

parents: 8304

diff changeset

517 end

8321

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

518 local service = get_pep_service(username);

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

519

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

520 local ok, ret = service:get_nodes(jid_bare(stanza.attr.from));

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

521 if not ok then return; end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

522

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

523 for node, node_obj in pairs(ret) do

8321

73ff49a42ea8 mod_pep_plus: Advertise nodes with the correct JID (missed in ec605946e597) (thanks lovetox)

Kim Alvefur <zash@zash.se>

parents: 8320

diff changeset

524 reply:tag("item", { jid = user_bare, node = node, name = node_obj.config.name }):up();

5852

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

525 end

84bdac93910f mod_pep_plus: An util.pubsub based PEP module

Florian Zeitz <florob@babelmonkeys.de>

parents:

diff changeset

526 end);

prosody

a19fdc6e4f09

plugins/mod_pep.lua

Annotate

plugins/mod_pep.lua @ 9117:a19fdc6e4f09

prosody

a19fdc6e4f09

plugins/mod_pep.lua

Software / code / prosody

Annotate

plugins/mod_pep.lua @ 9117:a19fdc6e4f09

Software `/` code `/` prosody