Software `/` code `/` prosody

Annotate

plugins/mod_pep.lua @ 9140:415a6d26709e

mod_pep: Only resend last item on successful subscription

author	Kim Alvefur <zash@zash.se>
date	Sun, 05 Aug 2018 01:53:48 +0200
parent	9139:24a1e7a9d463
child	9141:c1368fb756bf

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
9133 2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	84 local subscribers = {};
2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	85 for jid, sub in pairs(data.subscribers) do
2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	86 if type(sub) ~= "table" or not sub.presence then
2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	87 subscribers[jid] = sub;
2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	88 end
2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	89 end
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 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	91 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	92 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	93 affiliations = data.affiliations;
9133 2c1d68b54c91 mod_pep: Save non-presence based subscriptions to storage Kim Alvefur <zash@zash.se> parents: 9132 diff changeset	94 subscribers = 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	95 };
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	96 end
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	97 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	98 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	99 function store:users()
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	100 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	101 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	102 return store;
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	103 end
9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	104
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	105 local function simple_itemstore(username)
8218 2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore Kim Alvefur <zash@zash.se> parents: 8215 diff changeset	106 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	107 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	108 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	109 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	110 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	111 else
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8319 diff changeset	112 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	113 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	114 end
8218 2c75a5ba58fc mod_pubsub: Pass 'user' to simple_itemstore Kim Alvefur <zash@zash.se> parents: 8215 diff changeset	115 end
8215 835bb32c36b4 mod_pep_plus: Add item persistency. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8214 diff changeset	116 end
835bb32c36b4 mod_pep_plus: Add item persistency. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8214 diff changeset	117
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	118 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	119 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	120 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	121 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	122 :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	123 :tag(kind, { node = node });
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	124 if item then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	125 item = st.clone(item);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	126 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	127 message:add_child(item);
5852 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 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	130 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	131 message.attr.to = jid;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	132 module:send(message);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	133 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	134 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	135 return simple_broadcast;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	136 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	137
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	138 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	139 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	140 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	141 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	142 if service then
388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	143 return service;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	144 end
6432 388786af0dd2 mod_pep_plus: Add pubsub service objects to an item list Kim Alvefur <zash@zash.se> parents: 6305 diff changeset	145 service = pubsub.new({
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	146 capabilities = {
9139 24a1e7a9d463 mod_pubsub, mod_pep: The "restricted" affiliation should be allowed to be unsubscribed but nothing else Kim Alvefur <zash@zash.se> parents: 9133 diff changeset	147 restricted = {
24a1e7a9d463 mod_pubsub, mod_pep: The "restricted" affiliation should be allowed to be unsubscribed but nothing else Kim Alvefur <zash@zash.se> parents: 9133 diff changeset	148 be_subscribed = false;
24a1e7a9d463 mod_pubsub, mod_pep: The "restricted" affiliation should be allowed to be unsubscribed but nothing else Kim Alvefur <zash@zash.se> parents: 9133 diff changeset	149 be_unsubscribed = true;
24a1e7a9d463 mod_pubsub, mod_pep: The "restricted" affiliation should be allowed to be unsubscribed but nothing else Kim Alvefur <zash@zash.se> parents: 9133 diff changeset	150 };
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	151 none = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	152 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	153 publish = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	154 retract = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	155 get_nodes = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	156
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	157 subscribe = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	158 unsubscribe = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	159 get_subscription = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	160 get_subscriptions = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	161 get_items = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	162
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	163 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	164 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	165 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	166 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	167
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	168 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	169 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	170
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	171 set_affiliation = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	172 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	173 subscriber = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	174 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	175 publish = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	176 retract = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	177 get_nodes = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	178
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	179 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	180 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	181 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	182 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	183 get_items = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	184
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	185 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	186 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	187 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	188 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	189
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	190 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	191 be_unsubscribed = true;
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 set_affiliation = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	194 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	195 publisher = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	196 create = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	197 publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	198 retract = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	199 get_nodes = true;
9114 ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations Matthew Wild <mwild1@gmail.com> parents: 9113 diff changeset	200 get_configuration = true;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	201
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	202 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	203 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	204 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	205 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	206 get_items = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	207
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	208 subscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	209 unsubscribe_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	210 get_subscription_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	211 get_subscriptions_other = false;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	212
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	213 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	214 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	215
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	216 set_affiliation = false;
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 owner = {
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	219 create = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	220 publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	221 retract = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	222 delete = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	223 get_nodes = true;
6443 f4403c270ea2 mod_pep_plus: Add node config form Kim Alvefur <zash@zash.se> parents: 6432 diff changeset	224 configure = true;
9114 ca5228a7d907 mod_pep: Add 'get_configuration' capability to relevant affiliations Matthew Wild <mwild1@gmail.com> parents: 9113 diff changeset	225 get_configuration = true;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	226
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	227 subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	228 unsubscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	229 get_subscription = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	230 get_subscriptions = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	231 get_items = 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
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	234 subscribe_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	235 unsubscribe_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	236 get_subscription_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	237 get_subscriptions_other = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	238
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	239 be_subscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	240 be_unsubscribed = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	241
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	242 set_affiliation = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	243 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	244 };
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	245
6444 aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP) Kim Alvefur <zash@zash.se> parents: 6443 diff changeset	246 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	247 ["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	248 ["persist_items"] = true;
9097 ce2ba9f91c84 mod_pep: Set default access model to 'presence' Kim Alvefur <zash@zash.se> parents: 9082 diff changeset	249 ["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	250 };
aab509a9d0ba mod_pep_plus: Default to max one item per node (Recomended for PEP) Kim Alvefur <zash@zash.se> parents: 6443 diff changeset	251
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	252 autocreate_on_publish = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	253 autocreate_on_subscribe = true;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	254
8949 9194431b6447 mod_pep_plus: Support persistence of node configuration Kim Alvefur <zash@zash.se> parents: 8895 diff changeset	255 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	256 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	257 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	258 itemcheck = is_item_stanza;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	259 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	260 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	261 return "owner";
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	262 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	263 end;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	264
9099 974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	265 access_models = {
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	266 presence = function (jid)
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	267 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	268 return "subscriber";
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	269 end
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	270 end;
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	271 };
974b25c27f24 mod_pep: Move subscriber check into 'presence' access model callback Kim Alvefur <zash@zash.se> parents: 9097 diff changeset	272
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	273 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	274
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	275 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	276 });
8306 202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	277 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	278 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	279 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	280 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	281 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	282 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	283 end
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	284 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	285 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	286 else
202b9951b037 mod_pep_plus: Keep track of nodes, and restore them when later Kim Alvefur <zash@zash.se> parents: 8305 diff changeset	287 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	288 end
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	289 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	290 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	291 return service;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	292 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	293
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	294 function handle_pubsub_iq(event)
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	295 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	296 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	297 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	298 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	299 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	300 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	301
9db72349095f mod_pep_plus: Use dispatch function from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	302 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	303 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	304
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	305 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	306 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	307
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	308 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	309 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	310
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	311 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	312 local t = stanza.attr.type;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	313 if not t then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	314 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	315 if child then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	316 local attr = child.attr;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	317 if attr.hash then -- new caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	318 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	319 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	320 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	321 else -- legacy caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	322 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	323 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	324 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	325 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	326 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	327 return; -- no or bad caps
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	328 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	329 return;
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 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	332 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	333
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	334 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	335 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	336 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	337 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	338 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	339 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	340
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	341 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	342 nodes = nodes or empty_set;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	343
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	344 local service_recipients = recipients[service_name];
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	345 if not service_recipients then
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	346 service_recipients = {};
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	347 recipients[service_name] = service_recipients;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	348 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	349
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	350 local current = service_recipients[recipient];
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	351 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	352 current = empty_set;
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 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	356 return;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	357 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	358
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	359 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	360 for node in current - nodes do
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	361 service:remove_subscription(node, recipient, recipient);
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 for node in nodes - current do
9140 415a6d26709e mod_pep: Only resend last item on successful subscription Kim Alvefur <zash@zash.se> parents: 9139 diff changeset	365 if service:add_subscription(node, recipient, recipient, { presence = true }) then
415a6d26709e mod_pep: Only resend last item on successful subscription Kim Alvefur <zash@zash.se> parents: 9139 diff changeset	366 resend_last_item(recipient, node, service);
415a6d26709e mod_pep: Only resend last item on successful subscription Kim Alvefur <zash@zash.se> parents: 9139 diff changeset	367 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	368 end
6305 38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	369
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	370 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	371 nodes = nil;
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	372 end
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	373
38d82f8ead25 mod_pep_plus: Only broadcast newly added subscriptions Kim Alvefur <zash@zash.se> parents: 6264 diff changeset	374 service_recipients[recipient] = nodes;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	375 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	376
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	377 module:hook("presence/bare", function(event)
8728 41c959c5c84b Fix spelling throughout the codebase [codespell] Kim Alvefur <zash@zash.se> parents: 8696 diff changeset	378 -- 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	379 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	380 local t = stanza.attr.type;
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	381 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	382 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	383 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	384 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	385 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	386 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	387 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	388
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	389 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	390 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	391 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	392 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	393 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	394 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	395 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	396 update_subscriptions(recipient, username);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	397 else
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	398 recipients[username] = recipients[username] or {};
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	399 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	400 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	401 else
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	402 recipients[username][recipient] = hash;
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	403 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	404 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	405 -- 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	406 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	407 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	408 :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	409 );
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	410 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	411 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	412 end
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 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	415 update_subscriptions(stanza.attr.from, username);
8303 053cf683c2c7 mod_pep_plus: Rename variable for clarity Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	416 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	417 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	418 local subscriptions = recipients[username];
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	419 if subscriptions then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	420 for subscriber in pairs(subscriptions) do
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	421 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	422 update_subscriptions(subscriber, username);
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	423 end
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 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	426 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	427 end, 10);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	428
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	429 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	430 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	431 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	432 if not disco then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	433 return;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	434 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	435
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	436 -- 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	437 local is_self = stanza.attr.to == nil;
8315 967f04fe7fd4 mod_pep_plus: Add missing variable Kim Alvefur <zash@zash.se> parents: 8307 diff changeset	438 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	439 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	440 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	441 username = origin.username;
8315 967f04fe7fd4 mod_pep_plus: Add missing variable Kim Alvefur <zash@zash.se> parents: 8307 diff changeset	442 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	443 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	444 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	445 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	446 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	447 local ver = current;
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	448 if not string.find(current, "#") then
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	449 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	450 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	451 local notify = set_new();
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	452 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	453 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	454 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	455 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	456 end
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 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	459 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	460 -- 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	461 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	462 if jid then
8307 94860b5733d3 mod_pep_plus: Update subscriptions for other local users only Kim Alvefur <zash@zash.se> parents: 8306 diff changeset	463 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	464 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	465 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	466 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	467 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	468 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	469 end
8305 ec605946e597 mod_pep_plus: Use local username instead of bare JID for references Kim Alvefur <zash@zash.se> parents: 8304 diff changeset	470 update_subscriptions(contact, username, notify);
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-node", function(event)
8982 4a576c39bb2f mod_pep_plus: Use service discovery helpers from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8949 diff changeset	474 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	475 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	476 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	477 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	478 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	479 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	480 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	481 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	482
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	483 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	484 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	485
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	486 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	487
57e3ad11f3f6 mod_pep_plus: Advertise pubsub features in disco#info (code adapted from mod_pubsub) Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	488 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	489 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	490
8342 0c0990a575de mod_pep_plus: Fix a typo. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8341 diff changeset	491 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	492 -- 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	493 "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	494 "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	495 "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	496 "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	497 "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	498 "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	499 "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	500 };
8341 910d3c3f60a6 mod_pep_plus: Use feature detection from pubsub.lib Kim Alvefur <zash@zash.se> parents: 8339 diff changeset	501
8342 0c0990a575de mod_pep_plus: Fix a typo. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 8341 diff changeset	502 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	503 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	504 end
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	505 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	506
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	507 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	508 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	509 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	510 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	511 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	512 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	513 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	514 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	515 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	516 end);
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	517
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	518 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	519 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	520
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	521 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	522 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	523 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	524 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	525 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	526 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	527 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	528 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	529
5852 84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	530 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	531 if not ok then return; end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	532
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	533 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	534 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	535 end
84bdac93910f mod_pep_plus: An util.pubsub based PEP module Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	536 end);

prosody

415a6d26709e

plugins/mod_pep.lua

Software / code / prosody

Annotate

plugins/mod_pep.lua @ 9140:415a6d26709e

Software `/` code `/` prosody