Software `/` code `/` prosody

Annotate

plugins/mod_bookmarks.lua @ 12172:2515033c2a74

mod_bookmarks: Skip migration of legacy data when empty Should save some cycles and not log the debug message on every login.

author	Kim Alvefur <zash@zash.se>
date	Mon, 10 Jan 2022 00:13:17 +0100
parent	12171:b2923a3b4e02
child	12177:024cc878f472

rev	line source
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	1 local mm = require "core.modulemanager";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	2 if mm.get_modules_for_host(module.host):contains("bookmarks2") then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	3 error("mod_bookmarks and mod_bookmarks2 are conflicting, please disable one of them.", 0);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	4 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	5
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	6 local st = require "util.stanza";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	7 local jid_split = require "util.jid".split;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	8
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	9 local mod_pep = module:depends "pep";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	10 local private_storage = module:open_store("private", "map");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	11
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	12 local namespace = "urn:xmpp:bookmarks:1";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	13 local namespace_private = "jabber:iq:private";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	14 local namespace_legacy = "storage:bookmarks";
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	15 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	16
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	17 local default_options = {
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	18 ["persist_items"] = true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	19 ["max_items"] = "max";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	20 ["send_last_published_item"] = "never";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	21 ["access_model"] = "whitelist";
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	22 };
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	23
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	24 module:hook("account-disco-info", function (event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	25 -- This Time it’s Serious!
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	26 event.reply:tag("feature", { var = namespace.."#compat" }):up();
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	27 event.reply:tag("feature", { var = namespace.."#compat-pep" }):up();
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	28
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	29 -- COMPAT XEP-0411
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	30 event.reply:tag("feature", { var = "urn:xmpp:bookmarks-conversion:0" }):up();
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	31 end);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	32
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	33 -- This must be declared on the domain JID, not the account JID. Note that
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	34 -- this isn’t defined in the XEP.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	35 module:add_feature(namespace_private);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	36
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	37
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	38 local function generate_legacy_storage(items)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	39 local storage = st.stanza("storage", { xmlns = namespace_legacy });
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	40 for _, item_id in ipairs(items) do
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	41 local item = items[item_id];
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	42 local bookmark = item:get_child("conference", namespace);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	43 local conference = st.stanza("conference", {
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	44 jid = item.attr.id,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	45 name = bookmark.attr.name,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	46 autojoin = bookmark.attr.autojoin,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	47 });
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	48 local nick = bookmark:get_child_text("nick");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	49 if nick ~= nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	50 conference:text_tag("nick", nick):up();
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	51 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	52 local password = bookmark:get_child_text("password");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	53 if password ~= nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	54 conference:text_tag("password", password):up();
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	55 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	56 storage:add_child(conference);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	57 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	58
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	59 return storage;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	60 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	61
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	62 local function on_retrieve_legacy_pep(event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	63 local stanza, session = event.stanza, event.origin;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	64 local pubsub = stanza:get_child("pubsub", "http://jabber.org/protocol/pubsub");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	65 if pubsub == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	66 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	67 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	68
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	69 local items = pubsub:get_child("items");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	70 if items == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	71 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	72 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	73
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	74 local node = items.attr.node;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	75 if node ~= namespace_legacy then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	76 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	77 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	78
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	79 local username = session.username;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	80 local jid = username.."@"..session.host;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	81 local service = mod_pep.get_pep_service(username);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	82 local ok, ret = service:get_items(namespace, session.full_jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	83 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	84 module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	85 session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrive bookmarks from PEP"));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	86 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	87 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	88
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	89 local storage = generate_legacy_storage(ret);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	90
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	91 module:log("debug", "Sending back legacy PEP for %s: %s", jid, storage);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	92 session.send(st.reply(stanza)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	93 :tag("pubsub", {xmlns = "http://jabber.org/protocol/pubsub"})
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	94 :tag("items", {node = namespace_legacy})
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	95 :tag("item", {id = "current"})
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	96 :add_child(storage));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	97 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	98 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	99
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	100 local function on_retrieve_private_xml(event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	101 local stanza, session = event.stanza, event.origin;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	102 local query = stanza:get_child("query", namespace_private);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	103 if query == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	104 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	105 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	106
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	107 local bookmarks = query:get_child("storage", namespace_legacy);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	108 if bookmarks == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	109 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	110 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	111
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	112 module:log("debug", "Getting private bookmarks: %s", bookmarks);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	113
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	114 local username = session.username;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	115 local jid = username.."@"..session.host;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	116 local service = mod_pep.get_pep_service(username);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	117 local ok, ret = service:get_items(namespace, session.full_jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	118 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	119 if ret == "item-not-found" then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	120 module:log("debug", "Got no PEP bookmarks item for %s, returning empty private bookmarks", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	121 session.send(st.reply(stanza):add_child(query));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	122 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	123 module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	124 session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrive bookmarks from PEP"));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	125 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	126 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	127 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	128
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	129 local storage = generate_legacy_storage(ret);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	130
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	131 module:log("debug", "Sending back private for %s: %s", jid, storage);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	132 session.send(st.reply(stanza):query(namespace_private):add_child(storage));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	133 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	134 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	135
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	136 local function compare_bookmark2(a, b)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	137 if a == nil or b == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	138 return false;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	139 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	140 local a_conference = a:get_child("conference", namespace);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	141 local b_conference = b:get_child("conference", namespace);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	142 local a_nick = a_conference:get_child_text("nick");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	143 local b_nick = b_conference:get_child_text("nick");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	144 local a_password = a_conference:get_child_text("password");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	145 local b_password = b_conference:get_child_text("password");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	146 return (a.attr.id == b.attr.id and
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	147 a_conference.attr.name == b_conference.attr.name and
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	148 a_conference.attr.autojoin == b_conference.attr.autojoin and
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	149 a_nick == b_nick and
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	150 a_password == b_password);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	151 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	152
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	153 local function publish_to_pep(jid, bookmarks, synchronise)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	154 local service = mod_pep.get_pep_service(jid_split(jid));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	155
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	156 if #bookmarks.tags == 0 then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	157 if synchronise then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	158 -- If we set zero legacy bookmarks, purge the bookmarks 2 node.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	159 module:log("debug", "No bookmark in the set, purging instead.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	160 return service:purge(namespace, jid, true);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	161 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	162 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	163 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	164 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	165
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	166 -- Retrieve the current bookmarks2.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	167 module:log("debug", "Retrieving the current bookmarks 2.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	168 local has_bookmarks2, ret = service:get_items(namespace, jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	169 local bookmarks2;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	170 if not has_bookmarks2 and ret == "item-not-found" then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	171 module:log("debug", "Got item-not-found, assuming it was empty until now, creating.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	172 local ok, err = service:create(namespace, jid, default_options);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	173 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	174 module:log("error", "Creating bookmarks 2 node failed: %s", err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	175 return ok, err;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	176 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	177 bookmarks2 = {};
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	178 elseif not has_bookmarks2 then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	179 module:log("debug", "Got %s error, aborting.", ret);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	180 return false, ret;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	181 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	182 module:log("debug", "Got existing bookmarks2.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	183 bookmarks2 = ret;
12152 0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	184
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	185 local ok, err = service:get_node_config(namespace, jid);
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	186 if not ok then
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	187 module:log("error", "Retrieving bookmarks 2 node config failed: %s", err);
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	188 return ok, err;
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	189 end
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	190
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	191 local options = err;
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	192 for key, value in pairs(default_options) do
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	193 if options[key] and options[key] ~= value then
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	194 module:log("warn", "Overriding bookmarks 2 configuration for %s, from %s to %s", jid, options[key], value);
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	195 options[key] = value;
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	196 end
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	197 end
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	198
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	199 local ok, err = service:set_node_config(namespace, jid, options);
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	200 if not ok then
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	201 module:log("error", "Setting bookmarks 2 node config failed: %s", err);
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	202 return ok, err;
0939675955f1 mod_bookmarks: Override the node configuration if it was wrong Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 12149 diff changeset	203 end
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	204 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	205
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	206 -- Get a list of all items we may want to remove.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	207 local to_remove = {};
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	208 for i in ipairs(bookmarks2) do
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	209 to_remove[bookmarks2[i]] = true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	210 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	211
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	212 for bookmark in bookmarks:childtags("conference", namespace_legacy) do
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	213 -- Create the new conference element by copying everything from the legacy one.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	214 local conference = st.stanza("conference", {
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	215 xmlns = namespace,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	216 name = bookmark.attr.name,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	217 autojoin = bookmark.attr.autojoin,
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	218 });
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	219 local nick = bookmark:get_child_text("nick");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	220 if nick ~= nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	221 conference:text_tag("nick", nick):up();
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	222 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	223 local password = bookmark:get_child_text("password");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	224 if password ~= nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	225 conference:text_tag("password", password):up();
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	226 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	227
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	228 -- Create its wrapper.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	229 local item = st.stanza("item", { xmlns = "http://jabber.org/protocol/pubsub", id = bookmark.attr.jid })
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	230 :add_child(conference);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	231
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	232 -- Then publish it only if it’s a new one or updating a previous one.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	233 if compare_bookmark2(item, bookmarks2[bookmark.attr.jid]) then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	234 module:log("debug", "Item %s identical to the previous one, skipping.", item.attr.id);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	235 to_remove[bookmark.attr.jid] = nil;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	236 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	237 if bookmarks2[bookmark.attr.jid] == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	238 module:log("debug", "Item %s not existing previously, publishing.", item.attr.id);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	239 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	240 module:log("debug", "Item %s different from the previous one, publishing.", item.attr.id);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	241 to_remove[bookmark.attr.jid] = nil;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	242 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	243 local ok, err = service:publish(namespace, jid, bookmark.attr.jid, item, default_options);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	244 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	245 module:log("error", "Publishing item %s failed: %s", item.attr.id, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	246 return ok, err;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	247 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	248 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	249 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	250
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	251 -- Now handle retracting items that have been removed.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	252 if synchronise then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	253 for id in pairs(to_remove) do
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	254 module:log("debug", "Item %s removed from bookmarks.", id);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	255 local ok, err = service:retract(namespace, jid, id, st.stanza("retract", { id = id }));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	256 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	257 module:log("error", "Retracting item %s failed: %s", id, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	258 return ok, err;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	259 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	260 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	261 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	262 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	263 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	264
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	265 -- Synchronise legacy PEP to PEP.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	266 local function on_publish_legacy_pep(event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	267 local stanza, session = event.stanza, event.origin;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	268 local pubsub = stanza:get_child("pubsub", "http://jabber.org/protocol/pubsub");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	269 if pubsub == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	270 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	271 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	272
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	273 local publish = pubsub:get_child("publish");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	274 if publish == nil or publish.attr.node ~= namespace_legacy then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	275 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	276 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	277
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	278 local item = publish:get_child("item");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	279 if item == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	280 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	281 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	282
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	283 -- Here we ignore the item id, it’ll be generated as 'current' anyway.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	284
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	285 local bookmarks = item:get_child("storage", namespace_legacy);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	286 if bookmarks == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	287 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	288 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	289
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	290 -- We also ignore the publish-options.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	291
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	292 module:log("debug", "Legacy PEP bookmarks set by client, publishing to PEP.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	293
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	294 local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	295 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	296 module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	297 session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	298 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	299 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	300
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	301 session.send(st.reply(stanza));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	302 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	303 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	304
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	305 -- Synchronise Private XML to PEP.
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	306 local function on_publish_private_xml(event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	307 local stanza, session = event.stanza, event.origin;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	308 local query = stanza:get_child("query", namespace_private);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	309 if query == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	310 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	311 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	312
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	313 local bookmarks = query:get_child("storage", namespace_legacy);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	314 if bookmarks == nil then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	315 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	316 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	317
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	318 module:log("debug", "Private bookmarks set by client, publishing to PEP.");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	319
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	320 local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	321 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	322 module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	323 session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	324 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	325 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	326
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	327 session.send(st.reply(stanza));
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	328 return true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	329 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	330
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	331 local function migrate_legacy_bookmarks(event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	332 local session = event.session;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	333 local username = session.username;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	334 local service = mod_pep.get_pep_service(username);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	335 local jid = username.."@"..session.host;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	336
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	337 local ok, ret = service:get_items(namespace_legacy, session.full_jid);
12172 2515033c2a74 mod_bookmarks: Skip migration of legacy data when empty Kim Alvefur <zash@zash.se> parents: 12171 diff changeset	338 if ok and ret[1] then
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	339 module:log("debug", "Legacy PEP bookmarks found for %s, migrating.", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	340 local failed = false;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	341 for _, item_id in ipairs(ret) do
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	342 local item = ret[item_id];
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	343 if item.attr.id ~= "current" then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	344 module:log("warn", "Legacy PEP bookmarks for %s isn’t using 'current' as its id: %s", jid, item.attr.id);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	345 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	346 local bookmarks = item:get_child("storage", namespace_legacy);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	347 module:log("debug", "Got legacy PEP bookmarks of %s: %s", jid, bookmarks);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	348
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	349 local ok, err = publish_to_pep(session.full_jid, bookmarks, false);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	350 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	351 module:log("error", "Failed to store legacy PEP bookmarks to bookmarks 2 for %s, aborting migration: %s", jid, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	352 failed = true;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	353 break;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	354 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	355 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	356 if not failed then
12171 b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	357 module:log("debug", "Successfully migrated legacy PEP bookmarks of %s to bookmarks 2, clearing items.", jid);
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	358 local ok, err = service:purge(namespace_legacy, jid, false);
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	359 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	360 module:log("error", "Failed to delete legacy PEP bookmarks for %s: %s", jid, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	361 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	362 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	363 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	364
12171 b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	365 local ok, current_legacy_config = service:get_node_config(namespace_legacy, jid);
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	366 if not ok or current_legacy_config["access_model"] ~= "whitelist" then
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	367 -- The legacy node must exist in order for the access model to apply to the
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	368 -- XEP-0411 COMPAT broadcasts (which bypass the pubsub service entirely),
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	369 -- so create or reconfigure it to be useless.
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	370 --
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	371 -- FIXME It would be handy to have a publish model that prevents the owner
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	372 -- from publishing, but the affiliation takes priority
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	373 local config = {
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	374 ["persist_items"] = false;
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	375 ["max_items"] = 1;
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	376 ["send_last_published_item"] = "never";
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	377 ["access_model"] = "whitelist";
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	378 };
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	379 local ok, err;
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	380 if ret == "item-not-found" then
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	381 ok, err = service:create(namespace_legacy, jid, config);
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	382 else
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	383 ok, err = service:set_node_config(namespace_legacy, jid, config);
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	384 end
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	385 if not ok then
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	386 module:log("error", "Setting legacy bookmarks node config failed: %s", err);
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	387 return ok, err;
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	388 end
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	389 end
b2923a3b4e02 mod_bookmarks: Make sure legacy bookmarks node exists to hold access model Kim Alvefur <zash@zash.se> parents: 12170 diff changeset	390
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	391 local data, err = private_storage:get(username, "storage:storage:bookmarks");
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	392 if not data then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	393 module:log("debug", "No existing legacy bookmarks for %s, migration already done: %s", jid, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	394 local ok, ret2 = service:get_items(namespace, session.full_jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	395 if not ok or not ret2 then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	396 module:log("debug", "Additionally, no bookmarks 2 were existing for %s, assuming empty.", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	397 module:fire_event("bookmarks/empty", { session = session });
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	398 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	399 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	400 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	401 local bookmarks = st.deserialize(data);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	402 module:log("debug", "Got legacy bookmarks of %s: %s", jid, bookmarks);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	403
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	404 module:log("debug", "Going to store legacy bookmarks to bookmarks 2 %s.", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	405 local ok, err = publish_to_pep(session.full_jid, bookmarks, false);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	406 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	407 module:log("error", "Failed to store legacy bookmarks to bookmarks 2 for %s, aborting migration: %s", jid, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	408 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	409 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	410 module:log("debug", "Stored legacy bookmarks to bookmarks 2 for %s.", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	411
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	412 local ok, err = private_storage:set(username, "storage:storage:bookmarks", nil);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	413 if not ok then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	414 module:log("error", "Failed to remove legacy bookmarks of %s: %s", jid, err);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	415 return;
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	416 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	417 module:log("debug", "Removed legacy bookmarks of %s, migration done!", jid);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	418 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	419
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	420 module:hook("iq/bare/jabber:iq:private:query", function (event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	421 if event.stanza.attr.type == "get" then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	422 return on_retrieve_private_xml(event);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	423 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	424 return on_publish_private_xml(event);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	425 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	426 end, 1);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	427 module:hook("iq/bare/http://jabber.org/protocol/pubsub:pubsub", function (event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	428 if event.stanza.attr.type == "get" then
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	429 return on_retrieve_legacy_pep(event);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	430 else
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	431 return on_publish_legacy_pep(event);
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	432 end
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	433 end, 1);
12156 17cffaa78f48 mod_bookmarks: Add option for disabling upgrade of legacy bookmarks Kim Alvefur <zash@zash.se> parents: 12155 diff changeset	434 if module:get_option_boolean("upgrade_legacy_bookmarks", true) then
17cffaa78f48 mod_bookmarks: Add option for disabling upgrade of legacy bookmarks Kim Alvefur <zash@zash.se> parents: 12155 diff changeset	435 module:hook("resource-bind", migrate_legacy_bookmarks);
17cffaa78f48 mod_bookmarks: Add option for disabling upgrade of legacy bookmarks Kim Alvefur <zash@zash.se> parents: 12155 diff changeset	436 end
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	437 -- COMPAT XEP-0411 Broadcast as per XEP-0048 + PEP
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	438 local function legacy_broadcast(event)
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	439 local service = event.service;
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	440 local ok, bookmarks = service:get_items(namespace, event.actor);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	441 if bookmarks == "item-not-found" then ok, bookmarks = true, {} end
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	442 if not ok then return end
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	443 local legacy_bookmarks_item = st.stanza("item", { xmlns = xmlns_pubsub; id = "current" })
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	444 :add_child(generate_legacy_storage(bookmarks));
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	445 service:broadcast("items", namespace_legacy, { --[[ no subscribers ]] }, legacy_bookmarks_item, event.actor);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	446 end
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	447 local function broadcast_legacy_removal(event)
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	448 if event.node ~= namespace then return end
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	449 return legacy_broadcast(event);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	450 end
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	451 module:hook("presence/initial", function (event)
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	452 -- Broadcasts to all clients with legacy+notify, not just the one coming online.
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	453 -- Upgrade to XEP-0402 to avoid it
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	454 local service = mod_pep.get_pep_service(event.origin.username);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	455 legacy_broadcast({ service = service, actor = event.origin.full_jid });
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	456 end);
12148 b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	457 module:handle_items("pep-service", function (event)
b63bb2c4b6d9 mod_bookmarks: Import mod_bookmarks2 from prosody-modules @ ad7767a9f3ea Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	458 local service = event.item.service;
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	459 module:hook_object_event(service.events, "item-published/" .. namespace, legacy_broadcast);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	460 module:hook_object_event(service.events, "item-retracted", broadcast_legacy_removal);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	461 module:hook_object_event(service.events, "node-purged", broadcast_legacy_removal);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	462 module:hook_object_event(service.events, "node-deleted", broadcast_legacy_removal);
12155 ae5988739990 mod_bookmarks: Unhook PEP service objects on removal from cache Kim Alvefur <zash@zash.se> parents: 12152 diff changeset	463 end, function (event)
ae5988739990 mod_bookmarks: Unhook PEP service objects on removal from cache Kim Alvefur <zash@zash.se> parents: 12152 diff changeset	464 local service = event.item.service;
12170 750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	465 module:unhook_object_event(service.events, "item-published/" .. namespace, legacy_broadcast);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	466 module:unhook_object_event(service.events, "item-retracted", broadcast_legacy_removal);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	467 module:unhook_object_event(service.events, "node-purged", broadcast_legacy_removal);
750abaf99baf mod_bookmarks: Broadcast notifications per XEP-0048 and XEP-0411 Kim Alvefur <zash@zash.se> parents: 12156 diff changeset	468 module:unhook_object_event(service.events, "node-deleted", broadcast_legacy_removal);
12155 ae5988739990 mod_bookmarks: Unhook PEP service objects on removal from cache Kim Alvefur <zash@zash.se> parents: 12152 diff changeset	469 end, true);

prosody

2515033c2a74

plugins/mod_bookmarks.lua

Software / code / prosody

Annotate

plugins/mod_bookmarks.lua @ 12172:2515033c2a74

Software `/` code `/` prosody