Software `/` code `/` prosody

Annotate

plugins/mod_pubsub/pubsub.lib.lua @ 9967:dc9bb31cbffe

util.hashes: Rename PBKDF2 function It's not SCRAM-specific

author	Kim Alvefur <zash@zash.se>
date	Sun, 13 Jan 2019 13:57:18 +0100
parent	9817:7aad9eb7f050
child	10062:6ffed67356e9

rev	line source
8210 352d605b1178 mod_pubsub: Fix a few warnings [luacheck] Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7358 diff changeset	1 local t_unpack = table.unpack or unpack; -- luacheck: ignore 113
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	2 local time_now = os.time;
8210 352d605b1178 mod_pubsub: Fix a few warnings [luacheck] Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7358 diff changeset	3
8940 365b16109d95 mod_pubsub: Apply normalization to JIDs retrieved from attributes Kim Alvefur <zash@zash.se> parents: 8939 diff changeset	4 local jid_prep = require "util.jid".prep;
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	5 local set = require "util.set";
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	6 local st = require "util.stanza";
8325 9a845e9e9cbf mod_pubsub: Fix typo in import Kim Alvefur <zash@zash.se> parents: 8324 diff changeset	7 local it = require "util.iterators";
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	8 local uuid_generate = require "util.uuid".generate;
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	9 local dataform = require"util.dataforms".new;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	10
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	11 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	12 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	13 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	14
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	15 local _M = {};
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	16
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	17 local handlers = {};
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	18 _M.handlers = handlers;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	19
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	20 local pubsub_errors = {
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	21 ["conflict"] = { "cancel", "conflict" };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	22 ["invalid-jid"] = { "modify", "bad-request", nil, "invalid-jid" };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	23 ["jid-required"] = { "modify", "bad-request", nil, "jid-required" };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	24 ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	25 ["item-not-found"] = { "cancel", "item-not-found" };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	26 ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
9041 b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	27 ["invalid-options"] = { "modify", "bad-request", nil, "invalid-options" };
6473 7c8f58d2b331 Merge 0.9->0.10 Matthew Wild <mwild1@gmail.com> parents: 6448 diff changeset	28 ["forbidden"] = { "auth", "forbidden" };
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	29 ["not-allowed"] = { "cancel", "not-allowed" };
9076 00d89430d77e pubsub.lib: Support for not-acceptable error Matthew Wild <mwild1@gmail.com> parents: 9072 diff changeset	30 ["not-acceptable"] = { "modify", "not-acceptable" };
8953 19cbe80df9c8 mod_pubsub: Make pubsub.lib aware of internal-server-error condition Kim Alvefur <zash@zash.se> parents: 8940 diff changeset	31 ["internal-server-error"] = { "wait", "internal-server-error" };
9110 3dbecb399dfb pubsub.lib: Add support for precondition-not-met error Matthew Wild <mwild1@gmail.com> parents: 9109 diff changeset	32 ["precondition-not-met"] = { "cancel", "conflict", nil, "precondition-not-met" };
9207 76d593b35958 util.pubsub, pubsub.lib: Improve error on attempt to publish invalid item Matthew Wild <mwild1@gmail.com> parents: 9206 diff changeset	33 ["invalid-item"] = { "modify", "bad-request", "invalid item" };
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	34 };
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	35 local function pubsub_error_reply(stanza, error)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	36 local e = pubsub_errors[error];
8210 352d605b1178 mod_pubsub: Fix a few warnings [luacheck] Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7358 diff changeset	37 local reply = st.error_reply(stanza, t_unpack(e, 1, 3));
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	38 if e[4] then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	39 reply:tag(e[4], { xmlns = xmlns_pubsub_errors }):up();
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	40 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	41 return reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	42 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	43 _M.pubsub_error_reply = pubsub_error_reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	44
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	45 local function dataform_error_message(err) -- ({ string : string }) -> string?
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	46 local out = {};
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	47 for field, errmsg in pairs(err) do
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	48 table.insert(out, ("%s: %s"):format(field, errmsg))
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	49 end
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	50 return table.concat(out, "; ");
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	51 end
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	52
9115 fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	53 -- Note: If any config options are added that are of complex types,
fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	54 -- (not simply strings/numbers) then the publish-options code will
fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	55 -- need to be revisited
7358 d0390bc9c5d1 mod_pubsub: Don’t require util.dataforms twice Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 6841 diff changeset	56 local node_config_form = dataform {
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	57 {
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	58 type = "hidden";
9274 1712e366b081 mod_pubsub: Exclude value of FORM_TYPE from stored data Kim Alvefur <zash@zash.se> parents: 9247 diff changeset	59 var = "FORM_TYPE";
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	60 value = "http://jabber.org/protocol/pubsub#node_config";
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	61 };
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	62 {
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	63 type = "text-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	64 name = "title";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	65 var = "pubsub#title";
8979 6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	66 label = "Title";
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	67 };
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	68 {
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	69 type = "text-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	70 name = "description";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	71 var = "pubsub#description";
8979 6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	72 label = "Description";
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	73 };
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	74 {
6897b2e18bdf mod_pubsub: Support configurable title and description fields Kim Alvefur <zash@zash.se> parents: 8978 diff changeset	75 type = "text-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	76 name = "payload_type";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	77 var = "pubsub#type";
9180 cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	78 label = "The type of node data, usually specified by the namespace of the payload (if any)";
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	79 };
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	80 {
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	81 type = "text-single";
9245 cc32aae5c7da mod_pubsub: Use dataforms validation to specify that max_items is an integer Kim Alvefur <zash@zash.se> parents: 9244 diff changeset	82 datatype = "xs:integer";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	83 name = "max_items";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	84 var = "pubsub#max_items";
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	85 label = "Max # of items to persist";
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	86 };
8320 fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	87 {
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	88 type = "boolean";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	89 name = "persist_items";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	90 var = "pubsub#persist_items";
8320 fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	91 label = "Persist items to storage";
fe5eaf4ed631 mod_pep_plus: Make node persistence configurable via pubsub#persist_items Kim Alvefur <zash@zash.se> parents: 8318 diff changeset	92 };
8814 07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	93 {
07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	94 type = "list-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	95 name = "access_model";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	96 var = "pubsub#access_model";
9096 7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	97 label = "Specify the subscriber model";
7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	98 options = {
9135 c68d62ae9cb7 pubsub.lib: correctly emit data form fields Jonas Wielicki <jonas@wielicki.name> parents: 9124 diff changeset	99 "authorize",
c68d62ae9cb7 pubsub.lib: correctly emit data form fields Jonas Wielicki <jonas@wielicki.name> parents: 9124 diff changeset	100 "open",
c68d62ae9cb7 pubsub.lib: correctly emit data form fields Jonas Wielicki <jonas@wielicki.name> parents: 9124 diff changeset	101 "presence",
c68d62ae9cb7 pubsub.lib: correctly emit data form fields Jonas Wielicki <jonas@wielicki.name> parents: 9124 diff changeset	102 "roster",
c68d62ae9cb7 pubsub.lib: correctly emit data form fields Jonas Wielicki <jonas@wielicki.name> parents: 9124 diff changeset	103 "whitelist",
9096 7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	104 };
7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	105 };
7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	106 {
7de4eec02ece mod_pubsub: Add access model to configuration form Kim Alvefur <zash@zash.se> parents: 9076 diff changeset	107 type = "list-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	108 name = "publish_model";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	109 var = "pubsub#publish_model";
9130 74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	110 label = "Specify the publisher model";
74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	111 options = {
9137 4803d2feeecb pubsub.lib: fix more form fields Jonas Wielicki <jonas@wielicki.name> parents: 9136 diff changeset	112 "publishers";
4803d2feeecb pubsub.lib: fix more form fields Jonas Wielicki <jonas@wielicki.name> parents: 9136 diff changeset	113 "subscribers";
4803d2feeecb pubsub.lib: fix more form fields Jonas Wielicki <jonas@wielicki.name> parents: 9136 diff changeset	114 "open";
9130 74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	115 };
74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	116 };
74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	117 {
9182 ec48c02ded0c mod_pubsub: Add support for "quiet nodes" (disabling notifications) Kim Alvefur <zash@zash.se> parents: 9180 diff changeset	118 type = "boolean";
9211 a476d80761cd mod_pubsub: Fix boolean value in form Kim Alvefur <zash@zash.se> parents: 9210 diff changeset	119 value = true;
9186 9f33a13eb011 mod_pubsub: Use the correct form field Kim Alvefur <zash@zash.se> parents: 9185 diff changeset	120 label = "Whether to deliver event notifications";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	121 name = "notify_items";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	122 var = "pubsub#deliver_notifications";
9182 ec48c02ded0c mod_pubsub: Add support for "quiet nodes" (disabling notifications) Kim Alvefur <zash@zash.se> parents: 9180 diff changeset	123 };
ec48c02ded0c mod_pubsub: Add support for "quiet nodes" (disabling notifications) Kim Alvefur <zash@zash.se> parents: 9180 diff changeset	124 {
9188 ef2616ade453 mod_pubsub: Add support for thin notifications (without the full payload) Kim Alvefur <zash@zash.se> parents: 9186 diff changeset	125 type = "boolean";
9212 127af0795e93 mod_pubsub: Add missing default value for deliver_payloads Kim Alvefur <zash@zash.se> parents: 9211 diff changeset	126 value = true;
9188 ef2616ade453 mod_pubsub: Add support for thin notifications (without the full payload) Kim Alvefur <zash@zash.se> parents: 9186 diff changeset	127 label = "Whether to deliver payloads with event notifications";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	128 name = "include_payload";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	129 var = "pubsub#deliver_payloads";
9188 ef2616ade453 mod_pubsub: Add support for thin notifications (without the full payload) Kim Alvefur <zash@zash.se> parents: 9186 diff changeset	130 };
ef2616ade453 mod_pubsub: Add support for thin notifications (without the full payload) Kim Alvefur <zash@zash.se> parents: 9186 diff changeset	131 {
9130 74525b8104d5 pubsub.lib: Add support for pubsub#publish_model Matthew Wild <mwild1@gmail.com> parents: 9128 diff changeset	132 type = "list-single";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	133 name = "notification_type";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	134 var = "pubsub#notification_type";
8814 07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	135 label = "Specify the delivery style for notifications";
07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	136 options = {
07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	137 { label = "Messages of type normal", value = "normal" },
07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	138 { label = "Messages of type headline", value = "headline", default = true },
07197f29e2b8 mod_pubsub: Make the 'type' attribute on broadcast messages configurable Kim Alvefur <zash@zash.se> parents: 8400 diff changeset	139 };
8822 4afa77e0d2b0 mod_pubsub: Fix syntax error Kim Alvefur <zash@zash.se> parents: 8815 diff changeset	140 };
9183 8239f24e38df mod_pubsub: Make notification of node deletion configurable Kim Alvefur <zash@zash.se> parents: 9182 diff changeset	141 {
8239f24e38df mod_pubsub: Make notification of node deletion configurable Kim Alvefur <zash@zash.se> parents: 9182 diff changeset	142 type = "boolean";
8239f24e38df mod_pubsub: Make notification of node deletion configurable Kim Alvefur <zash@zash.se> parents: 9182 diff changeset	143 label = "Whether to notify subscribers when the node is deleted";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	144 name = "notify_delete";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	145 var = "pubsub#notify_delete";
9185 60f163e7a7a7 mod_pubsub: Specify defaults for notification settings Kim Alvefur <zash@zash.se> parents: 9184 diff changeset	146 value = true;
9183 8239f24e38df mod_pubsub: Make notification of node deletion configurable Kim Alvefur <zash@zash.se> parents: 9182 diff changeset	147 };
9184 9fbddb80803b mod_pubsub: Make notification of item retraction configurable Kim Alvefur <zash@zash.se> parents: 9183 diff changeset	148 {
9fbddb80803b mod_pubsub: Make notification of item retraction configurable Kim Alvefur <zash@zash.se> parents: 9183 diff changeset	149 type = "boolean";
9fbddb80803b mod_pubsub: Make notification of item retraction configurable Kim Alvefur <zash@zash.se> parents: 9183 diff changeset	150 label = "Whether to notify subscribers when items are removed from the node";
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	151 name = "notify_retract";
b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	152 var = "pubsub#notify_retract";
9185 60f163e7a7a7 mod_pubsub: Specify defaults for notification settings Kim Alvefur <zash@zash.se> parents: 9184 diff changeset	153 value = true;
9184 9fbddb80803b mod_pubsub: Make notification of item retraction configurable Kim Alvefur <zash@zash.se> parents: 9183 diff changeset	154 };
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	155 };
011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	156
9116 9f36f5c14545 mod_pubsub: Rename variable subscription options form to improve readability Kim Alvefur <zash@zash.se> parents: 9115 diff changeset	157 local subscribe_options_form = dataform {
8826 d614003a82c1 mod_pubsub: Add support for parsing subscription options form (no options supported yet) Kim Alvefur <zash@zash.se> parents: 8825 diff changeset	158 {
d614003a82c1 mod_pubsub: Add support for parsing subscription options form (no options supported yet) Kim Alvefur <zash@zash.se> parents: 8825 diff changeset	159 type = "hidden";
9274 1712e366b081 mod_pubsub: Exclude value of FORM_TYPE from stored data Kim Alvefur <zash@zash.se> parents: 9247 diff changeset	160 var = "FORM_TYPE";
8826 d614003a82c1 mod_pubsub: Add support for parsing subscription options form (no options supported yet) Kim Alvefur <zash@zash.se> parents: 8825 diff changeset	161 value = "http://jabber.org/protocol/pubsub#subscribe_options";
9039 0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	162 };
0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	163 {
0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	164 type = "boolean";
0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	165 name = "pubsub#include_body";
0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	166 label = "Receive message body in addition to payload?";
0124e5ec1556 mod_pubsub: Move include_body option into subscription options Kim Alvefur <zash@zash.se> parents: 9038 diff changeset	167 };
8826 d614003a82c1 mod_pubsub: Add support for parsing subscription options form (no options supported yet) Kim Alvefur <zash@zash.se> parents: 8825 diff changeset	168 };
d614003a82c1 mod_pubsub: Add support for parsing subscription options form (no options supported yet) Kim Alvefur <zash@zash.se> parents: 8825 diff changeset	169
8981 b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	170 local node_metadata_form = dataform {
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	171 {
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	172 type = "hidden";
9274 1712e366b081 mod_pubsub: Exclude value of FORM_TYPE from stored data Kim Alvefur <zash@zash.se> parents: 9247 diff changeset	173 var = "FORM_TYPE";
8981 b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	174 value = "http://jabber.org/protocol/pubsub#meta-data";
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	175 };
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	176 {
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	177 type = "text-single";
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	178 name = "pubsub#title";
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	179 };
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	180 {
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	181 type = "text-single";
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	182 name = "pubsub#description";
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	183 };
9180 cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	184 {
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	185 type = "text-single";
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	186 name = "pubsub#type";
cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	187 };
8981 b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	188 };
b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	189
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	190 local service_method_feature_map = {
9199 596d0d82a113 mod_pubsub: Advertise support for subscription-options Kim Alvefur <zash@zash.se> parents: 9198 diff changeset	191 add_subscription = { "subscribe", "subscription-options" };
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	192 create = { "create-nodes", "instant-nodes", "item-ids", "create-and-configure" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	193 delete = { "delete-nodes" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	194 get_items = { "retrieve-items" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	195 get_subscriptions = { "retrieve-subscriptions" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	196 node_defaults = { "retrieve-default" };
9131 d0d676b86013 pubsub.lib: Enable publish-options unconditionally Matthew Wild <mwild1@gmail.com> parents: 9130 diff changeset	197 publish = { "publish", "multi-items", "publish-options" };
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	198 purge = { "purge-nodes" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	199 retract = { "delete-items", "retract-items" };
9198 2ce27be5fdd1 mod_pubsub: Advertise support for node meta-data Kim Alvefur <zash@zash.se> parents: 9188 diff changeset	200 set_node_config = { "config-node", "meta-data" };
8938 384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	201 set_affiliation = { "modify-affiliations" };
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	202 };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	203 local service_config_feature_map = {
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	204 autocreate_on_publish = { "auto-create" };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	205 };
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	206
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	207 function _M.get_feature_set(service)
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	208 local supported_features = set.new();
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	209
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	210 for method, features in pairs(service_method_feature_map) do
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	211 if service[method] then
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	212 for _, feature in ipairs(features) do
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	213 if feature then
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	214 supported_features:add(feature);
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	215 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	216 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	217 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	218 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	219
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	220 for option, features in pairs(service_config_feature_map) do
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	221 if service.config[option] then
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	222 for _, feature in ipairs(features) do
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	223 if feature then
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	224 supported_features:add(feature);
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	225 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	226 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	227 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	228 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	229
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	230 for affiliation in pairs(service.config.capabilities) do
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	231 if affiliation ~= "none" and affiliation ~= "owner" then
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	232 supported_features:add(affiliation.."-affiliation");
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	233 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	234 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	235
9102 f3a1ecc46f20 mod_pubsub: Advertise default access model in disco Kim Alvefur <zash@zash.se> parents: 9096 diff changeset	236 if service.node_defaults.access_model then
f3a1ecc46f20 mod_pubsub: Advertise default access model in disco Kim Alvefur <zash@zash.se> parents: 9096 diff changeset	237 supported_features:add("access-"..service.node_defaults.access_model);
f3a1ecc46f20 mod_pubsub: Advertise default access model in disco Kim Alvefur <zash@zash.se> parents: 9096 diff changeset	238 end
f3a1ecc46f20 mod_pubsub: Advertise default access model in disco Kim Alvefur <zash@zash.se> parents: 9096 diff changeset	239
9109 31bf4b3abc7f pubsub.lib: Advertise peristent-items feature when nodes and items are persisted Matthew Wild <mwild1@gmail.com> parents: 9102 diff changeset	240 if rawget(service.config, "itemstore") and rawget(service.config, "nodestore") then
31bf4b3abc7f pubsub.lib: Advertise peristent-items feature when nodes and items are persisted Matthew Wild <mwild1@gmail.com> parents: 9102 diff changeset	241 supported_features:add("persistent-items");
31bf4b3abc7f pubsub.lib: Advertise peristent-items feature when nodes and items are persisted Matthew Wild <mwild1@gmail.com> parents: 9102 diff changeset	242 end
31bf4b3abc7f pubsub.lib: Advertise peristent-items feature when nodes and items are persisted Matthew Wild <mwild1@gmail.com> parents: 9102 diff changeset	243
8340 7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	244 return supported_features;
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	245 end
7c1fb8c042dc mod_pubsub: Move service feature dection to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8338 diff changeset	246
8980 4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	247 function _M.handle_disco_info_node(event, service)
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	248 local stanza, reply, node = event.stanza, event.reply, event.node;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	249 local ok, ret = service:get_nodes(stanza.attr.from);
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	250 local node_obj = ret[node];
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	251 if not ok or not node_obj then
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	252 return;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	253 end
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	254 event.exists = true;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	255 reply:tag("identity", { category = "pubsub", type = "leaf" }):up();
8981 b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	256 if node_obj.config then
9038 fd053fcaf9bc mod_pubsub: Revert disco#info part from previous commit Kim Alvefur <zash@zash.se> parents: 9037 diff changeset	257 reply:add_child(node_metadata_form:form({
fd053fcaf9bc mod_pubsub: Revert disco#info part from previous commit Kim Alvefur <zash@zash.se> parents: 9037 diff changeset	258 ["pubsub#title"] = node_obj.config.title;
fd053fcaf9bc mod_pubsub: Revert disco#info part from previous commit Kim Alvefur <zash@zash.se> parents: 9037 diff changeset	259 ["pubsub#description"] = node_obj.config.description;
9180 cc68cb03f85e mod_pubsub: Add payload type metadata field Kim Alvefur <zash@zash.se> parents: 9137 diff changeset	260 ["pubsub#type"] = node_obj.config.payload_type;
9038 fd053fcaf9bc mod_pubsub: Revert disco#info part from previous commit Kim Alvefur <zash@zash.se> parents: 9037 diff changeset	261 }, "result"));
8981 b6cb0a8f75b1 mod_pubsub: Advertise title and description in disco#info Kim Alvefur <zash@zash.se> parents: 8980 diff changeset	262 end
8980 4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	263 end
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	264
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	265 function _M.handle_disco_items_node(event, service)
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	266 local stanza, reply, node = event.stanza, event.reply, event.node;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	267 local ok, ret = service:get_items(node, stanza.attr.from);
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	268 if not ok then
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	269 return;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	270 end
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	271
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	272 for _, id in ipairs(ret) do
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	273 reply:tag("item", { jid = module.host, name = id }):up();
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	274 end
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	275 event.exists = true;
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	276 end
4d2738b99b07 mod_pubsub: Move service discovery to pubsub.lib to allow reuse Kim Alvefur <zash@zash.se> parents: 8979 diff changeset	277
8334 036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	278 function _M.handle_pubsub_iq(event, service)
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	279 local origin, stanza = event.origin, event.stanza;
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	280 local pubsub_tag = stanza.tags[1];
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	281 local action = pubsub_tag.tags[1];
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	282 if not action then
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	283 return origin.send(st.error_reply(stanza, "cancel", "bad-request"));
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	284 end
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	285 local prefix = "";
587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	286 if pubsub_tag.attr.xmlns == xmlns_pubsub_owner then
587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	287 prefix = "owner_";
587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	288 end
587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	289 local handler = handlers[prefix..stanza.attr.type.."_"..action.name];
8334 036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	290 if handler then
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	291 handler(origin, stanza, action, service);
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	292 return true;
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	293 end
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	294 end
036e46d12b78 mod_pubsub: Move dispatch function into pubsub.lib Kim Alvefur <zash@zash.se> parents: 8333 diff changeset	295
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	296 function handlers.get_items(origin, stanza, items, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	297 local node = items.attr.node;
9817 7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	298
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	299 local requested_items = {};
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	300 for item in items:childtags("item") do
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	301 table.insert(requested_items, item.attr.id);
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	302 end
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	303 if requested_items[1] == nil then
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	304 requested_items = nil;
7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	305 end
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	306
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	307 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	308 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	309 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	310 end
9817 7aad9eb7f050 mod_pubsub: Support requests for multiple items (fixes #1305) Kim Alvefur <zash@zash.se> parents: 9274 diff changeset	311 local ok, results = service:get_items(node, stanza.attr.from, requested_items);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	312 if not ok then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	313 origin.send(pubsub_error_reply(stanza, results));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	314 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	315 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	316
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	317 local data = st.stanza("items", { node = node });
5851 cdcfd93e2f43 mod_pubsub, util.pubsub: Keep track of the order of items Kim Alvefur <zash@zash.se> parents: 5626 diff changeset	318 for _, id in ipairs(results) do
cdcfd93e2f43 mod_pubsub, util.pubsub: Keep track of the order of items Kim Alvefur <zash@zash.se> parents: 5626 diff changeset	319 data:add_child(results[id]);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	320 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	321 local reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	322 if data then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	323 reply = st.reply(stanza)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	324 :tag("pubsub", { xmlns = xmlns_pubsub })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	325 :add_child(data);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	326 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	327 reply = pubsub_error_reply(stanza, "item-not-found");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	328 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	329 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	330 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	331 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	332
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	333 function handlers.get_subscriptions(origin, stanza, subscriptions, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	334 local node = subscriptions.attr.node;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	335 local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	336 if not ok then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	337 origin.send(pubsub_error_reply(stanza, ret));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	338 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	339 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	340 local reply = st.reply(stanza)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	341 :tag("pubsub", { xmlns = xmlns_pubsub })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	342 :tag("subscriptions");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	343 for _, sub in ipairs(ret) do
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	344 reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	345 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	346 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	347 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	348 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	349
9032 029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	350 function handlers.owner_get_subscriptions(origin, stanza, subscriptions, service)
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	351 local node = subscriptions.attr.node;
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	352 local ok, ret = service:get_subscriptions(node, stanza.attr.from);
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	353 if not ok then
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	354 origin.send(pubsub_error_reply(stanza, ret));
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	355 return true;
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	356 end
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	357 local reply = st.reply(stanza)
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	358 :tag("pubsub", { xmlns = xmlns_pubsub_owner })
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	359 :tag("subscriptions");
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	360 for _, sub in ipairs(ret) do
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	361 reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	362 end
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	363 origin.send(reply);
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	364 return true;
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	365 end
029e1e18d65c mod_pubsub: Add support for owner subscription retrieval Kim Alvefur <zash@zash.se> parents: 9006 diff changeset	366
9033 f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	367 function handlers.owner_set_subscriptions(origin, stanza, subscriptions, service)
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	368 local node = subscriptions.attr.node;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	369 if not node then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	370 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	371 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	372 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	373 if not service:may(node, stanza.attr.from, "subscribe_other") then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	374 origin.send(pubsub_error_reply(stanza, "forbidden"));
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	375 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	376 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	377
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	378 local node_obj = service.nodes[node];
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	379 if not node_obj then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	380 origin.send(pubsub_error_reply(stanza, "item-not-found"));
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	381 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	382 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	383
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	384 for subscription_tag in subscriptions:childtags("subscription") do
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	385 if subscription_tag.attr.subscription == 'subscribed' then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	386 local ok, err = service:add_subscription(node, stanza.attr.from, subscription_tag.attr.jid);
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	387 if not ok then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	388 origin.send(pubsub_error_reply(stanza, err));
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	389 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	390 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	391 elseif subscription_tag.attr.subscription == 'none' then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	392 local ok, err = service:remove_subscription(node, stanza.attr.from, subscription_tag.attr.jid);
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	393 if not ok then
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	394 origin.send(pubsub_error_reply(stanza, err));
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	395 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	396 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	397 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	398 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	399
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	400 local reply = st.reply(stanza);
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	401 origin.send(reply);
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	402 return true;
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	403 end
f1b6efd5b379 mod_pubsub: Add support for modifying subscriptions Kim Alvefur <zash@zash.se> parents: 9032 diff changeset	404
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	405 function handlers.set_create(origin, stanza, create, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	406 local node = create.attr.node;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	407 local ok, ret, reply;
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	408 local config;
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	409 local configure = stanza.tags[1]:get_child("configure");
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	410 if configure then
8338 30d8157391e9 mod_pubsub: Use correct variable name [luacheck] Kim Alvefur <zash@zash.se> parents: 8337 diff changeset	411 local config_form = configure:get_child("x", "jabber:x:data");
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	412 if not config_form then
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	413 origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing dataform"));
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	414 return true;
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	415 end
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	416 local form_data, err = node_config_form:data(config_form);
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	417 if err then
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	418 origin.send(st.error_reply(stanza, "modify", "bad-request", dataform_error_message(err)));
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	419 return true;
dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	420 end
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	421 config = form_data;
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	422 end
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	423 if node then
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	424 ok, ret = service:create(node, stanza.attr.from, config);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	425 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	426 reply = st.reply(stanza);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	427 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	428 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	429 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	430 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	431 repeat
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	432 node = uuid_generate();
8337 dc4ea43ac463 mod_pubsub: Add support for Create and Configure Kim Alvefur <zash@zash.se> parents: 8336 diff changeset	433 ok, ret = service:create(node, stanza.attr.from, config);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	434 until ok or ret ~= "conflict";
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	435 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	436 reply = st.reply(stanza)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	437 :tag("pubsub", { xmlns = xmlns_pubsub })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	438 :tag("create", { node = node });
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	439 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	440 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	441 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	442 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	443 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	444 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	445 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	446
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	447 function handlers.owner_set_delete(origin, stanza, delete, service)
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	448 local node = delete.attr.node;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	449
8210 352d605b1178 mod_pubsub: Fix a few warnings [luacheck] Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 7358 diff changeset	450 local reply;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	451 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	452 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	453 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	454 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	455 local ok, ret = service:delete(node, stanza.attr.from);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	456 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	457 reply = st.reply(stanza);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	458 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	459 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	460 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	461 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	462 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	463 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	464
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	465 function handlers.set_subscribe(origin, stanza, subscribe, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	466 local node, jid = subscribe.attr.node, subscribe.attr.jid;
8940 365b16109d95 mod_pubsub: Apply normalization to JIDs retrieved from attributes Kim Alvefur <zash@zash.se> parents: 8939 diff changeset	467 jid = jid_prep(jid);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	468 if not (node and jid) then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	469 origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	470 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	471 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	472 local options_tag, options = stanza.tags[1]:get_child("options"), nil;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	473 if options_tag then
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	474 -- FIXME form parsing errors ignored here, why?
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	475 local err
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	476 options, err = subscribe_options_form:data(options_tag.tags[1]);
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	477 if err then
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	478 origin.send(st.error_reply(stanza, "modify", "bad-request", dataform_error_message(err)));
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	479 return true
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	480 end
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	481 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	482 local ok, ret = service:add_subscription(node, stanza.attr.from, jid, options);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	483 local reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	484 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	485 reply = st.reply(stanza)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	486 :tag("pubsub", { xmlns = xmlns_pubsub })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	487 :tag("subscription", {
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	488 node = node,
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	489 jid = jid,
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	490 subscription = "subscribed"
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	491 }):up();
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	492 if options_tag then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	493 reply:add_child(options_tag);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	494 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	495 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	496 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	497 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	498 origin.send(reply);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	499 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	500
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	501 function handlers.set_unsubscribe(origin, stanza, unsubscribe, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	502 local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid;
8940 365b16109d95 mod_pubsub: Apply normalization to JIDs retrieved from attributes Kim Alvefur <zash@zash.se> parents: 8939 diff changeset	503 jid = jid_prep(jid);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	504 if not (node and jid) then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	505 origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	506 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	507 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	508 local ok, ret = service:remove_subscription(node, stanza.attr.from, jid);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	509 local reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	510 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	511 reply = st.reply(stanza);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	512 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	513 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	514 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	515 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	516 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	517 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	518
9040 e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	519 function handlers.get_options(origin, stanza, options, service)
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	520 local node, jid = options.attr.node, options.attr.jid;
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	521 jid = jid_prep(jid);
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	522 if not (node and jid) then
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	523 origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	524 return true;
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	525 end
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	526 local ok, ret = service:get_subscription(node, stanza.attr.from, jid);
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	527 if not ok then
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	528 origin.send(pubsub_error_reply(stanza, "not-subscribed"));
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	529 return true;
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	530 end
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	531 if ret == true then ret = {} end
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	532 origin.send(st.reply(stanza)
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	533 :tag("pubsub", { xmlns = xmlns_pubsub })
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	534 :tag("options", { node = node, jid = jid })
9116 9f36f5c14545 mod_pubsub: Rename variable subscription options form to improve readability Kim Alvefur <zash@zash.se> parents: 9115 diff changeset	535 :add_child(subscribe_options_form:form(ret)));
9040 e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	536 return true;
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	537 end
e993fad0cc62 mod_pubsub: Add support for retrieving subscription options Kim Alvefur <zash@zash.se> parents: 9039 diff changeset	538
9041 b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	539 function handlers.set_options(origin, stanza, options, service)
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	540 local node, jid = options.attr.node, options.attr.jid;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	541 jid = jid_prep(jid);
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	542 if not (node and jid) then
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	543 origin.send(pubsub_error_reply(stanza, jid and "nodeid-required" or "invalid-jid"));
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	544 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	545 end
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	546 local ok, ret = service:get_subscription(node, stanza.attr.from, jid);
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	547 if not ok then
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	548 origin.send(pubsub_error_reply(stanza, ret));
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	549 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	550 elseif not ret then
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	551 origin.send(pubsub_error_reply(stanza, "not-subscribed"));
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	552 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	553 end
9235 7fbcabee6df1 mod_pubsub: Preserve current subscription options if given a partial form Kim Alvefur <zash@zash.se> parents: 9212 diff changeset	554 local old_subopts = ret;
7fbcabee6df1 mod_pubsub: Preserve current subscription options if given a partial form Kim Alvefur <zash@zash.se> parents: 9212 diff changeset	555 local new_subopts, err = subscribe_options_form:data(options.tags[1], old_subopts);
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	556 if err then
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	557 origin.send(st.error_reply(stanza, "modify", "bad-request", dataform_error_message(err)));
9041 b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	558 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	559 end
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	560 local ok, err = service:add_subscription(node, stanza.attr.from, jid, new_subopts);
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	561 if not ok then
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	562 origin.send(pubsub_error_reply(stanza, err));
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	563 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	564 end
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	565 origin.send(st.reply(stanza));
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	566 return true;
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	567 end
b3bc742ee188 mod_pubsub: Add support for changing subscription options Kim Alvefur <zash@zash.se> parents: 9040 diff changeset	568
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	569 function handlers.set_publish(origin, stanza, publish, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	570 local node = publish.attr.node;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	571 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	572 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	573 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	574 end
9200 249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9199 diff changeset	575 local required_config = nil;
9115 fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	576 local publish_options = stanza.tags[1]:get_child("publish-options");
9131 d0d676b86013 pubsub.lib: Enable publish-options unconditionally Matthew Wild <mwild1@gmail.com> parents: 9130 diff changeset	577 if publish_options then
9115 fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	578 -- Ensure that the node configuration matches the values in publish-options
fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	579 local publish_options_form = publish_options:get_child("x", "jabber:x:data");
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	580 local err;
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	581 required_config, err = node_config_form:data(publish_options_form);
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	582 if err then
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	583 origin.send(st.error_reply(stanza, "modify", "bad-request", dataform_error_message(err)));
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	584 return true
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	585 end
9115 fddebfaae7d9 pubsub.lib: Support for publish-options behind a feature flag, 'enable_publish_options' Matthew Wild <mwild1@gmail.com> parents: 9110 diff changeset	586 end
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	587 local item = publish:get_child("item");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	588 local id = (item and item.attr.id);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	589 if not id then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	590 id = uuid_generate();
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	591 if item then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	592 item.attr.id = id;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	593 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	594 end
9200 249d90ff992e pubsub.lib, util.pubsub: Move precondition checks to util.pubsub Matthew Wild <mwild1@gmail.com> parents: 9199 diff changeset	595 local ok, ret = service:publish(node, stanza.attr.from, id, item, required_config);
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	596 local reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	597 if ok then
8400 518b56d806bd mod_pubsub: Allow itemstore to override item ids Kim Alvefur <zash@zash.se> parents: 8399 diff changeset	598 if type(ok) == "string" then
518b56d806bd mod_pubsub: Allow itemstore to override item ids Kim Alvefur <zash@zash.se> parents: 8399 diff changeset	599 id = ok;
518b56d806bd mod_pubsub: Allow itemstore to override item ids Kim Alvefur <zash@zash.se> parents: 8399 diff changeset	600 end
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	601 reply = st.reply(stanza)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	602 :tag("pubsub", { xmlns = xmlns_pubsub })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	603 :tag("publish", { node = node })
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	604 :tag("item", { id = id });
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	605 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	606 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	607 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	608 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	609 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	610 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	611
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	612 function handlers.set_retract(origin, stanza, retract, service)
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	613 local node, notify = retract.attr.node, retract.attr.notify;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	614 notify = (notify == "1") or (notify == "true");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	615 local item = retract:get_child("item");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	616 local id = item and item.attr.id
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	617 if not (node and id) then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	618 origin.send(pubsub_error_reply(stanza, node and "item-not-found" or "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	619 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	620 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	621 local reply, notifier;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	622 if notify then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	623 notifier = st.stanza("retract", { id = id });
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	624 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	625 local ok, ret = service:retract(node, stanza.attr.from, id, notifier);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	626 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	627 reply = st.reply(stanza);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	628 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	629 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	630 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	631 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	632 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	633 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	634
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	635 function handlers.owner_set_purge(origin, stanza, purge, service)
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	636 local node, notify = purge.attr.node, purge.attr.notify;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	637 notify = (notify == "1") or (notify == "true");
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	638 local reply;
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	639 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	640 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	641 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	642 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	643 local ok, ret = service:purge(node, stanza.attr.from, notify);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	644 if ok then
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	645 reply = st.reply(stanza);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	646 else
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	647 reply = pubsub_error_reply(stanza, ret);
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	648 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	649 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	650 return true;
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	651 end
8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	652
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	653 function handlers.owner_get_configure(origin, stanza, config, service)
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	654 local node = config.attr.node;
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	655 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	656 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	657 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	658 end
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	659
9120 01fc8ba0a7fa mod_pubsub: Use util.pubsub API for retrieving node config instead Kim Alvefur <zash@zash.se> parents: 9116 diff changeset	660 local ok, node_config = service:get_node_config(node, stanza.attr.from);
01fc8ba0a7fa mod_pubsub: Use util.pubsub API for retrieving node config instead Kim Alvefur <zash@zash.se> parents: 9116 diff changeset	661 if not ok then
01fc8ba0a7fa mod_pubsub: Use util.pubsub API for retrieving node config instead Kim Alvefur <zash@zash.se> parents: 9116 diff changeset	662 origin.send(pubsub_error_reply(stanza, node_config));
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	663 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	664 end
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	665
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	666 local reply = st.reply(stanza)
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	667 :tag("pubsub", { xmlns = xmlns_pubsub_owner })
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	668 :tag("configure", { node = node })
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	669 :add_child(node_config_form:form(node_config));
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	670 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	671 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	672 end
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	673
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	674 function handlers.owner_set_configure(origin, stanza, config, service)
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	675 local node = config.attr.node;
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	676 if not node then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	677 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	678 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	679 end
6446 011ca9b88179 mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) Kim Alvefur <zash@zash.se> parents: 6445 diff changeset	680 if not service:may(node, stanza.attr.from, "configure") then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	681 origin.send(pubsub_error_reply(stanza, "forbidden"));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	682 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	683 end
8317 ff57b3cc5a8e mod_pubsub: Make sure that a dataform is given to configure Kim Alvefur <zash@zash.se> parents: 8308 diff changeset	684 local config_form = config:get_child("x", "jabber:x:data");
ff57b3cc5a8e mod_pubsub: Make sure that a dataform is given to configure Kim Alvefur <zash@zash.se> parents: 8308 diff changeset	685 if not config_form then
ff57b3cc5a8e mod_pubsub: Make sure that a dataform is given to configure Kim Alvefur <zash@zash.se> parents: 8308 diff changeset	686 origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing dataform"));
ff57b3cc5a8e mod_pubsub: Make sure that a dataform is given to configure Kim Alvefur <zash@zash.se> parents: 8308 diff changeset	687 return true;
ff57b3cc5a8e mod_pubsub: Make sure that a dataform is given to configure Kim Alvefur <zash@zash.se> parents: 8308 diff changeset	688 end
9122 a69dc9c729ec mod_pubsub: Pass the current values to dataforms Kim Alvefur <zash@zash.se> parents: 9120 diff changeset	689 local ok, old_config = service:get_node_config(node, stanza.attr.from);
a69dc9c729ec mod_pubsub: Pass the current values to dataforms Kim Alvefur <zash@zash.se> parents: 9120 diff changeset	690 if not ok then
a69dc9c729ec mod_pubsub: Pass the current values to dataforms Kim Alvefur <zash@zash.se> parents: 9120 diff changeset	691 origin.send(pubsub_error_reply(stanza, old_config));
a69dc9c729ec mod_pubsub: Pass the current values to dataforms Kim Alvefur <zash@zash.se> parents: 9120 diff changeset	692 return true;
a69dc9c729ec mod_pubsub: Pass the current values to dataforms Kim Alvefur <zash@zash.se> parents: 9120 diff changeset	693 end
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	694 local new_config, err = node_config_form:data(config_form, old_config);
9247 26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	695 if err then
26854d7a4947 mod_pubsub: Fix dataforms error handling Kim Alvefur <zash@zash.se> parents: 9245 diff changeset	696 origin.send(st.error_reply(stanza, "modify", "bad-request", dataform_error_message(err)));
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	697 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	698 end
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	699 local ok, err = service:set_node_config(node, stanza.attr.from, new_config);
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	700 if not ok then
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	701 origin.send(pubsub_error_reply(stanza, err));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	702 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	703 end
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	704 origin.send(st.reply(stanza));
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	705 return true;
6438 b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	706 end
b1c40054b59d mod_pubsub: Add support for node configuration Kim Alvefur <zash@zash.se> parents: 5851 diff changeset	707
8336 587305c0ff85 mod_pubsub: Fix namespace conflict with the pubsub#owner namespace Kim Alvefur <zash@zash.se> parents: 8334 diff changeset	708 function handlers.owner_get_default(origin, stanza, default, service) -- luacheck: ignore 212/default
6441 bcb1ea9047d3 mod_pubsub: Add support for requesting default node configuration Kim Alvefur <zash@zash.se> parents: 6438 diff changeset	709 local reply = st.reply(stanza)
bcb1ea9047d3 mod_pubsub: Add support for requesting default node configuration Kim Alvefur <zash@zash.se> parents: 6438 diff changeset	710 :tag("pubsub", { xmlns = xmlns_pubsub_owner })
6447 8c2dc2ac5a40 mod_pubsub: Fix retreival of node config defaults Kim Alvefur <zash@zash.se> parents: 6446 diff changeset	711 :tag("default")
9244 b3b156bd9914 mod_pubsub: Use field mapping in util.dataforms Kim Alvefur <zash@zash.se> parents: 9235 diff changeset	712 :add_child(node_config_form:form(service.node_defaults));
6841 be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	713 origin.send(reply);
be87ab2d611c plugins: Explicitly return to halt event propagation (session.send sometimes does not return true) Kim Alvefur <zash@zash.se> parents: 6473 diff changeset	714 return true;
6441 bcb1ea9047d3 mod_pubsub: Add support for requesting default node configuration Kim Alvefur <zash@zash.se> parents: 6438 diff changeset	715 end
bcb1ea9047d3 mod_pubsub: Add support for requesting default node configuration Kim Alvefur <zash@zash.se> parents: 6438 diff changeset	716
8932 12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	717 function handlers.owner_get_affiliations(origin, stanza, affiliations, service)
8933 6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	718 local node = affiliations.attr.node;
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	719 if not node then
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	720 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	721 return true;
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	722 end
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	723 if not service:may(node, stanza.attr.from, "set_affiliation") then
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	724 origin.send(pubsub_error_reply(stanza, "forbidden"));
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	725 return true;
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	726 end
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	727
8934 365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	728 local node_obj = service.nodes[node];
365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	729 if not node_obj then
365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	730 origin.send(pubsub_error_reply(stanza, "item-not-found"));
365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	731 return true;
365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	732 end
365bcf899093 mod_pubsub: Retrieve the node object Kim Alvefur <zash@zash.se> parents: 8933 diff changeset	733
8933 6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	734 local reply = st.reply(stanza)
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	735 :tag("pubsub", { xmlns = xmlns_pubsub_owner })
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	736 :tag("affiliations", { node = node });
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	737
8935 a825ef6de45a mod_pubsub: Add the list of affiliations to reply Kim Alvefur <zash@zash.se> parents: 8934 diff changeset	738 for jid, affiliation in pairs(node_obj.affiliations) do
a825ef6de45a mod_pubsub: Add the list of affiliations to reply Kim Alvefur <zash@zash.se> parents: 8934 diff changeset	739 reply:tag("affiliation", { jid = jid, affiliation = affiliation }):up();
a825ef6de45a mod_pubsub: Add the list of affiliations to reply Kim Alvefur <zash@zash.se> parents: 8934 diff changeset	740 end
a825ef6de45a mod_pubsub: Add the list of affiliations to reply Kim Alvefur <zash@zash.se> parents: 8934 diff changeset	741
8933 6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	742 origin.send(reply);
6d3ecf9e8277 mod_pubsub: Boilerplate checks for affiliation retrieval Kim Alvefur <zash@zash.se> parents: 8932 diff changeset	743 return true;
8932 12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	744 end
12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	745
12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	746 function handlers.owner_set_affiliations(origin, stanza, affiliations, service)
8937 0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	747 local node = affiliations.attr.node;
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	748 if not node then
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	749 origin.send(pubsub_error_reply(stanza, "nodeid-required"));
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	750 return true;
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	751 end
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	752 if not service:may(node, stanza.attr.from, "set_affiliation") then
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	753 origin.send(pubsub_error_reply(stanza, "forbidden"));
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	754 return true;
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	755 end
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	756
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	757 local node_obj = service.nodes[node];
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	758 if not node_obj then
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	759 origin.send(pubsub_error_reply(stanza, "item-not-found"));
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	760 return true;
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	761 end
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	762
8938 384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	763 for affiliation_tag in affiliations:childtags("affiliation") do
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	764 local jid = affiliation_tag.attr.jid;
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	765 local affiliation = affiliation_tag.attr.affiliation;
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	766
8940 365b16109d95 mod_pubsub: Apply normalization to JIDs retrieved from attributes Kim Alvefur <zash@zash.se> parents: 8939 diff changeset	767 jid = jid_prep(jid);
8938 384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	768 if affiliation == "none" then affiliation = nil; end
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	769
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	770 local ok, err = service:set_affiliation(node, stanza.attr.from, jid, affiliation);
8939 849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	771 if not ok then
849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	772 -- FIXME Incomplete error handling,
849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	773 -- see XEP 60 8.9.2.4 Multiple Simultaneous Modifications
849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	774 origin.send(pubsub_error_reply(stanza, err));
849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	775 return true;
849c4683eaa0 mod_pubsub: Handle :set_affiliation errors (not completely in line with the XEP) Kim Alvefur <zash@zash.se> parents: 8938 diff changeset	776 end
8938 384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	777 end
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	778
384ef9732b81 mod_pubsub: Support for setting affiliations (#622) Kim Alvefur <zash@zash.se> parents: 8937 diff changeset	779 local reply = st.reply(stanza);
8937 0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	780 origin.send(reply);
0ae46e6ea647 mod_pubsub: Add boilerplate for changing affiliations Kim Alvefur <zash@zash.se> parents: 8935 diff changeset	781 return true;
8932 12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	782 end
12a9731aef0b mod_pubsub: Add stubs for affiliation handling Kim Alvefur <zash@zash.se> parents: 8826 diff changeset	783
8327 0b561f8bc790 mod_pubsub: Remove expose_publisher argument since it is handled in broadcaster Kim Alvefur <zash@zash.se> parents: 8325 diff changeset	784 local function create_encapsulating_item(id, payload)
8216 d80233ca006d mod_pubsub: Pass xmlns correctly Kim Alvefur <zash@zash.se> parents: 8213 diff changeset	785 local item = st.stanza("item", { id = id, xmlns = xmlns_pubsub });
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	786 item:add_child(payload);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	787 return item;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	788 end
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	789
8327 0b561f8bc790 mod_pubsub: Remove expose_publisher argument since it is handled in broadcaster Kim Alvefur <zash@zash.se> parents: 8325 diff changeset	790 local function archive_itemstore(archive, config, user, node)
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	791 module:log("debug", "Creation of itemstore for node %s with config %s", node, config);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	792 local get_set = {};
9005 7203a1b65d1b mod_pubsub: Cache only max_items to avoid holding reference to possibly outdated config Kim Alvefur <zash@zash.se> parents: 8981 diff changeset	793 local max_items = config["max_items"];
8308 ab189d3f55d1 mod_pubsub: Remove use of non-existent fields Kim Alvefur <zash@zash.se> parents: 8302 diff changeset	794 function get_set:items() -- luacheck: ignore 212/self
8324 58d228da618f mod_pubsub: Limit number of items to fetch from archive storage to pubsub#max_items to prevent unbounded query (thanks Martin and lovetox) Kim Alvefur <zash@zash.se> parents: 8323 diff changeset	795 local data, err = archive:find(user, {
9005 7203a1b65d1b mod_pubsub: Cache only max_items to avoid holding reference to possibly outdated config Kim Alvefur <zash@zash.se> parents: 8981 diff changeset	796 limit = tonumber(max_items);
8324 58d228da618f mod_pubsub: Limit number of items to fetch from archive storage to pubsub#max_items to prevent unbounded query (thanks Martin and lovetox) Kim Alvefur <zash@zash.se> parents: 8323 diff changeset	797 reverse = true;
58d228da618f mod_pubsub: Limit number of items to fetch from archive storage to pubsub#max_items to prevent unbounded query (thanks Martin and lovetox) Kim Alvefur <zash@zash.se> parents: 8323 diff changeset	798 });
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	799 if not data then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	800 module:log("error", "Unable to get items: %s", err);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	801 return true;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	802 end
8308 ab189d3f55d1 mod_pubsub: Remove use of non-existent fields Kim Alvefur <zash@zash.se> parents: 8302 diff changeset	803 module:log("debug", "Listed items %s", data);
8324 58d228da618f mod_pubsub: Limit number of items to fetch from archive storage to pubsub#max_items to prevent unbounded query (thanks Martin and lovetox) Kim Alvefur <zash@zash.se> parents: 8323 diff changeset	804 return it.reverse(function()
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	805 local id, payload, when, publisher = data();
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	806 if id == nil then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	807 return;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	808 end
8327 0b561f8bc790 mod_pubsub: Remove expose_publisher argument since it is handled in broadcaster Kim Alvefur <zash@zash.se> parents: 8325 diff changeset	809 local item = create_encapsulating_item(id, payload, publisher);
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	810 return id, item;
8324 58d228da618f mod_pubsub: Limit number of items to fetch from archive storage to pubsub#max_items to prevent unbounded query (thanks Martin and lovetox) Kim Alvefur <zash@zash.se> parents: 8323 diff changeset	811 end);
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	812 end
8308 ab189d3f55d1 mod_pubsub: Remove use of non-existent fields Kim Alvefur <zash@zash.se> parents: 8302 diff changeset	813 function get_set:get(key) -- luacheck: ignore 212/self
8219 2e68ae095645 mod_pubsub: Store data in users store, node in 'with' metadata field Kim Alvefur <zash@zash.se> parents: 8218 diff changeset	814 local data, err = archive:find(user, {
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	815 key = key;
8302 4852def7dc49 mod_pubsub: Workaround some storage modules without archive key deduplication Kim Alvefur <zash@zash.se> parents: 8301 diff changeset	816 -- Get the last item with that key, if the archive doesn't deduplicate
4852def7dc49 mod_pubsub: Workaround some storage modules without archive key deduplication Kim Alvefur <zash@zash.se> parents: 8301 diff changeset	817 reverse = true,
4852def7dc49 mod_pubsub: Workaround some storage modules without archive key deduplication Kim Alvefur <zash@zash.se> parents: 8301 diff changeset	818 limit = 1;
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	819 });
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	820 if not data then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	821 module:log("error", "Unable to get item: %s", err);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	822 return nil, err;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	823 end
8296 e23328adca25 mod_pubsub: Remove workaround for SQL issue (fixed in becb593ed86d) Kim Alvefur <zash@zash.se> parents: 8295 diff changeset	824 local id, payload, when, publisher = data();
8308 ab189d3f55d1 mod_pubsub: Remove use of non-existent fields Kim Alvefur <zash@zash.se> parents: 8302 diff changeset	825 module:log("debug", "Get item %s (published at %s by %s)", id, when, publisher);
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	826 if id == nil then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	827 return nil;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	828 end
8327 0b561f8bc790 mod_pubsub: Remove expose_publisher argument since it is handled in broadcaster Kim Alvefur <zash@zash.se> parents: 8325 diff changeset	829 return create_encapsulating_item(id, payload, publisher);
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	830 end
8308 ab189d3f55d1 mod_pubsub: Remove use of non-existent fields Kim Alvefur <zash@zash.se> parents: 8302 diff changeset	831 function get_set:set(key, value) -- luacheck: ignore 212/self
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	832 local data, err;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	833 if value ~= nil then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	834 local publisher = value.attr.publisher;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	835 local payload = value.tags[1];
8300 7759eb130938 mod_pep_plus, mod_pubsub: Store node content in separate archive stores Kim Alvefur <zash@zash.se> parents: 8298 diff changeset	836 data, err = archive:append(user, key, payload, time_now(), publisher);
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	837 else
8300 7759eb130938 mod_pep_plus, mod_pubsub: Store node content in separate archive stores Kim Alvefur <zash@zash.se> parents: 8298 diff changeset	838 data, err = archive:delete(user, { key = key; });
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	839 end
9072 9603a6a1ec85 mod_pubsub: Enforce max_items on insertion Kim Alvefur <zash@zash.se> parents: 9041 diff changeset	840 -- TODO archive support for maintaining maximum items
9603a6a1ec85 mod_pubsub: Enforce max_items on insertion Kim Alvefur <zash@zash.se> parents: 9041 diff changeset	841 archive:delete(user, {
9603a6a1ec85 mod_pubsub: Enforce max_items on insertion Kim Alvefur <zash@zash.se> parents: 9041 diff changeset	842 truncate = max_items;
9603a6a1ec85 mod_pubsub: Enforce max_items on insertion Kim Alvefur <zash@zash.se> parents: 9041 diff changeset	843 });
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	844 if not data then
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	845 module:log("error", "Unable to set item: %s", err);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	846 return nil, err;
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	847 end
8217 5f4e0d67b82a util.pubsub: Catch overriden id from storage Kim Alvefur <zash@zash.se> parents: 8216 diff changeset	848 return data;
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	849 end
8301 e2ab440a3437 mod_pubsub: Ignore unused 'self' since the data used is an upvalue [luacheck] Kim Alvefur <zash@zash.se> parents: 8300 diff changeset	850 function get_set:clear() -- luacheck: ignore 212/self
8300 7759eb130938 mod_pep_plus, mod_pubsub: Store node content in separate archive stores Kim Alvefur <zash@zash.se> parents: 8298 diff changeset	851 return archive:delete(user);
8298 dd9fa511494a mod_pubsub: Add method to clear data from a simple_itemstore Kim Alvefur <zash@zash.se> parents: 8296 diff changeset	852 end
8825 7270258fec77 mod_pubsup: Ignore unused 'self' argument [luacheck] Kim Alvefur <zash@zash.se> parents: 8822 diff changeset	853 function get_set:resize(size) -- luacheck: ignore 212/self
9006 935e5ca43792 mod_pubsub: Update max_items on resize (fixes #1082) Kim Alvefur <zash@zash.se> parents: 9005 diff changeset	854 max_items = size;
8399 07443fe9df5b mod_pubsub/archive_itemstore: Support resize operation Kim Alvefur <zash@zash.se> parents: 8375 diff changeset	855 return archive:delete(user, {
07443fe9df5b mod_pubsub/archive_itemstore: Support resize operation Kim Alvefur <zash@zash.se> parents: 8375 diff changeset	856 truncate = size;
07443fe9df5b mod_pubsub/archive_itemstore: Support resize operation Kim Alvefur <zash@zash.se> parents: 8375 diff changeset	857 });
07443fe9df5b mod_pubsub/archive_itemstore: Support resize operation Kim Alvefur <zash@zash.se> parents: 8375 diff changeset	858 end
9206 33ee40dc3e25 Pubsub: Add tests for :get_last_item() and fix for non-persistent nodes Matthew Wild <mwild1@gmail.com> parents: 9200 diff changeset	859 function get_set:head()
33ee40dc3e25 Pubsub: Add tests for :get_last_item() and fix for non-persistent nodes Matthew Wild <mwild1@gmail.com> parents: 9200 diff changeset	860 -- This should conveniently return the most recent item
8375 e2037634cdd9 mod_pubsub: Add a tail method (like util.cache) to archive_itemstore Kim Alvefur <zash@zash.se> parents: 8374 diff changeset	861 local item = self:get(nil);
e2037634cdd9 mod_pubsub: Add a tail method (like util.cache) to archive_itemstore Kim Alvefur <zash@zash.se> parents: 8374 diff changeset	862 if item then
e2037634cdd9 mod_pubsub: Add a tail method (like util.cache) to archive_itemstore Kim Alvefur <zash@zash.se> parents: 8374 diff changeset	863 return item.attr.id, item;
e2037634cdd9 mod_pubsub: Add a tail method (like util.cache) to archive_itemstore Kim Alvefur <zash@zash.se> parents: 8374 diff changeset	864 end
e2037634cdd9 mod_pubsub: Add a tail method (like util.cache) to archive_itemstore Kim Alvefur <zash@zash.se> parents: 8374 diff changeset	865 end
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	866 return setmetatable(get_set, archive);
e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	867 end
8318 d0a7fc7614de mod_pubsub, mod_pep_plus: Rename simple_itemstore to reflect that it's based on archive storage Kim Alvefur <zash@zash.se> parents: 8317 diff changeset	868 _M.archive_itemstore = archive_itemstore;
8213 e1272aeef31c mod_pubsub: Add item persistence using mod_storage_’s archive store. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>* parents: 8210 diff changeset	869
5626 8416d4619d80 mod_pubsub: Split out handlers into a module library Florian Zeitz <florob@babelmonkeys.de> parents: diff changeset	870 return _M;

prosody

dc9bb31cbffe

plugins/mod_pubsub/pubsub.lib.lua

Software / code / prosody

Annotate

plugins/mod_pubsub/pubsub.lib.lua @ 9967:dc9bb31cbffe

Software `/` code `/` prosody