prosody-modules: mod_bookmarks2/mod_bookmarks2.lua annotate

annotate mod_bookmarks2/mod_bookmarks2.lua @ 3715:f03a023cd523

mod_http_muc_log: Compose page title from room data More flexible than composing the title from name and date in the controller. Also opens the door to using other room data fields.

author	Kim Alvefur <zash@zash.se>
date	Sun, 13 Oct 2019 16:16:14 +0200
parents	310061f6e1df
children	9cd6d602ad1b

rev	line source
3678 7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	1 local mm = require "core.modulemanager";
7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	2 if mm.get_modules_for_host(module.host):contains("bookmarks") then
7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	3 error("mod_bookmarks2 and mod_bookmarks are conflicting, please disable one of them.", 0);
7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	4 end
7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	5
3677 90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	6 local st = require "util.stanza";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	7 local jid_split = require "util.jid".split;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	8
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	9 local mod_pep = module:depends "pep";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	10 local private_storage = module:open_store("private", "map");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	11
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	12 local legacy_ns = "storage:bookmarks";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	13 local ns = "urn:xmpp:bookmarks:0";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	14
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	15 local default_options = {
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	16 ["persist_items"] = true;
3678 7575399ae544 mod_bookmarks, mod_bookmarks2: Refuse to load if the other one is also loaded. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3677 diff changeset	17 -- This should be much higher, the XEP recommends 10000 but mod_pep rejects that.
3677 90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	18 ["max_items"] = 255;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	19 ["send_last_published_item"] = "never";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	20 ["access_model"] = "whitelist";
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	21 };
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	22
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	23 module:hook("account-disco-info", function (event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	24 -- This Time it’s Serious!
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	25 event.reply:tag("feature", { var = "urn:xmpp:bookmarks:0#compat" }):up();
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	26 end);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	27
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	28 local function on_retrieve_private_xml(event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	29 local stanza, session = event.stanza, event.origin;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	30 local query = stanza:get_child("query", "jabber:iq:private");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	31 if query == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	32 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	33 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	34
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	35 local bookmarks = query:get_child("storage", "storage:bookmarks");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	36 if bookmarks == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	37 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	38 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	39
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	40 module:log("debug", "Getting private bookmarks: %s", bookmarks);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	41
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	42 local username = session.username;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	43 local jid = username.."@"..session.host;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	44 local service = mod_pep.get_pep_service(username);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	45 local ok, ret = service:get_items("urn:xmpp:bookmarks:0", session.full_jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	46 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	47 if ret == "item-not-found" then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	48 module:log("debug", "Got no PEP bookmarks item for %s, returning empty private bookmarks", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	49 session.send(st.reply(stanza):add_child(query));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	50 else
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	51 module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, id);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	52 session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to retrive bookmarks from PEP"));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	53 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	54 return true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	55 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	56
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	57 local storage = st.stanza("storage", { xmlns = "storage:bookmarks" });
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	58 for i in ipairs(ret) do
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	59 local item = ret[ret[i]];
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	60 local conference = st.stanza("conference");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	61 conference.attr.jid = item.attr.id;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	62 local bookmark = item:get_child("conference", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	63 conference.attr.name = bookmark.attr.name;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	64 conference.attr.autojoin = bookmark.attr.autojoin;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	65 local nick = bookmark:get_child_text("nick", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	66 if nick ~= nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	67 conference:text_tag("nick", nick, { xmlns = "storage:bookmarks" }):up();
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	68 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	69 local password = bookmark:get_child_text("password", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	70 if password ~= nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	71 conference:text_tag("password", password):up();
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	72 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	73 storage:add_child(conference);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	74 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	75
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	76 module:log("debug", "Sending back private for %s: %s", jid, storage);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	77 session.send(st.reply(stanza):query("jabber:iq:private"):add_child(storage));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	78 return true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	79 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	80
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	81 local function compare_bookmark2(a, b)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	82 if a == nil or b == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	83 return false;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	84 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	85 local a_conference = a:get_child("conference", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	86 local b_conference = b:get_child("conference", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	87 local a_nick = a:get_child_text("nick", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	88 local b_nick = b:get_child_text("nick", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	89 local a_password = a:get_child_text("password", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	90 local b_password = b:get_child_text("password", "urn:xmpp:bookmarks:0");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	91 return (a.attr.id == b.attr.id and
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	92 a_conference.attr.name == b_conference.attr.name and
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	93 a_conference.attr.autojoin == b_conference.attr.autojoin and
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	94 a_nick == b_nick and
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	95 a_password == b_password);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	96 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	97
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	98 local function publish_to_pep(jid, bookmarks)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	99 local service = mod_pep.get_pep_service(jid_split(jid));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	100
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	101 -- If we set zero legacy bookmarks, purge the bookmarks 2 node.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	102 if #bookmarks.tags == 0 then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	103 module:log("debug", "No bookmark in the set, purging instead.");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	104 return service:purge("urn:xmpp:bookmarks:0", jid, true);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	105 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	106
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	107 -- Retrieve the current bookmarks2.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	108 module:log("debug", "Retrieving the current bookmarks 2.");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	109 local has_bookmarks2, ret = service:get_items("urn:xmpp:bookmarks:0", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	110 local bookmarks2;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	111 if not has_bookmarks2 and ret == "item-not-found" then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	112 module:log("debug", "Got item-not-found, assuming it was empty until now, creating.");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	113 local ok, err = service:create("urn:xmpp:bookmarks:0", jid, default_options);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	114 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	115 module:log("error", "Creating bookmarks 2 node failed: %s", err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	116 return ok, err;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	117 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	118 bookmarks2 = {};
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	119 elseif not has_bookmarks2 then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	120 module:log("debug", "Got %s error, aborting.", ret);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	121 return false, ret;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	122 else
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	123 module:log("debug", "Got existing bookmarks2.");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	124 bookmarks2 = ret;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	125 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	126
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	127 -- Get a list of all items we may want to remove.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	128 local to_remove = {};
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	129 for i in ipairs(bookmarks2) do
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	130 to_remove[bookmarks2[i]] = true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	131 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	132
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	133 for bookmark in bookmarks:childtags("conference", "storage:bookmarks") do
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	134 -- Create the new conference element by copying everything from the legacy one.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	135 local conference = st.stanza("conference", { xmlns = "urn:xmpp:bookmarks:0" });
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	136 conference.attr.name = bookmark.attr.name;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	137 conference.attr.autojoin = bookmark.attr.autojoin;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	138 local nick = bookmark:get_child_text("nick", "storage:bookmarks");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	139 if nick ~= nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	140 conference:text_tag("nick", nick, { xmlns = "urn:xmpp:bookmarks:0" }):up();
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	141 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	142 local password = bookmark:get_child_text("password", "storage:bookmarks");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	143 if password ~= nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	144 conference:text_tag("password", password, { xmlns = "urn:xmpp:bookmarks:0" }):up();
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	145 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	146
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	147 -- Create its wrapper.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	148 local item = st.stanza("item", { xmlns = "http://jabber.org/protocol/pubsub", id = bookmark.attr.jid })
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	149 :add_child(conference);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	150
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	151 -- Then publish it only if it’s a new one or updating a previous one.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	152 if compare_bookmark2(item, bookmarks2[bookmark.attr.jid]) then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	153 module:log("debug", "Item %s identical to the previous one, skipping.", item.attr.id);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	154 to_remove[bookmark.attr.jid] = nil;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	155 else
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	156 if bookmarks2[bookmark.attr.jid] == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	157 module:log("debug", "Item %s not existing previously, publishing.", item.attr.id);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	158 else
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	159 module:log("debug", "Item %s different from the previous one, publishing.", item.attr.id);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	160 to_remove[bookmark.attr.jid] = nil;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	161 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	162 local ok, err = service:publish("urn:xmpp:bookmarks:0", jid, bookmark.attr.jid, item, default_options);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	163 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	164 module:log("error", "Publishing item %s failed: %s", item.attr.id, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	165 return ok, err;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	166 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	167 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	168 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	169
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	170 -- Now handle retracting items that have been removed.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	171 for id in pairs(to_remove) do
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	172 module:log("debug", "Item %s removed from bookmarks.", id);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	173 local ok, err = service:retract("urn:xmpp:bookmarks:0", jid, id, st.stanza("retract", { id = id }));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	174 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	175 module:log("error", "Retracting item %s failed: %s", id, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	176 return ok, err;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	177 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	178 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	179 return true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	180 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	181
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	182 -- Synchronise Private XML to PEP.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	183 local function on_publish_private_xml(event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	184 local stanza, session = event.stanza, event.origin;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	185 local query = stanza:get_child("query", "jabber:iq:private");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	186 if query == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	187 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	188 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	189
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	190 local bookmarks = query:get_child("storage", legacy_ns);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	191 if bookmarks == nil then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	192 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	193 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	194
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	195 module:log("debug", "Private bookmarks set by client, publishing to pep.");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	196
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	197 local ok, err = publish_to_pep(session.full_jid, bookmarks);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	198 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	199 module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	200 session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	201 return true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	202 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	203
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	204 session.send(st.reply(stanza));
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	205 return true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	206 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	207
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	208 local function migrate_legacy_bookmarks(event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	209 local session = event.session;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	210 local username = session.username;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	211 local service = mod_pep.get_pep_service(username);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	212 local jid = username.."@"..session.host;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	213
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	214 local data, err = private_storage:get(username, "storage:storage:bookmarks");
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	215 if not data then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	216 module:log("debug", "No existing legacy bookmarks for %s, migration already done: %s", jid, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	217 local ok, ret = service:get_items("urn:xmpp:bookmarks:0", session.full_jid);
3696 310061f6e1df mod_bookmarks2: Fix traceback on updating from no legacy bookmarks to bookmarks 2. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: 3678 diff changeset	218 if not ok or not ret then
3677 90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	219 module:log("debug", "Additionally, no bookmarks 2 were existing for %s, assuming empty.", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	220 module:fire_event("bookmarks/empty", { session = session });
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	221 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	222 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	223 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	224 local bookmarks = st.deserialize(data);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	225 module:log("debug", "Got legacy bookmarks of %s: %s", jid, bookmarks);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	226
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	227 -- We don’t care if deleting succeeds or not, we only want to start with a non-existent node.
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	228 module:log("debug", "Deleting possibly existing PEP item for %s.", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	229 service:delete("urn:xmpp:bookmarks:0", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	230
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	231 module:log("debug", "Going to store PEP item for %s.", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	232 local ok, err = publish_to_pep(session.full_jid, bookmarks);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	233 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	234 module:log("error", "Failed to store bookmarks to PEP for %s, aborting migration: %s", jid, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	235 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	236 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	237 module:log("debug", "Stored bookmarks to PEP for %s.", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	238
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	239 local ok, err = private_storage:set(username, "storage:storage:bookmarks", nil);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	240 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	241 module:log("error", "Failed to remove private bookmarks of %s: %s", jid, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	242 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	243 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	244 module:log("debug", "Removed private bookmarks of %s, migration done!", jid);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	245 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	246
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	247 local function on_node_created(event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	248 local service, node, actor = event.service, event.node, event.actor;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	249 if node ~= "storage:bookmarks" then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	250 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	251 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	252 local ok, node_config = service:get_node_config(node, actor);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	253 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	254 module:log("error", "Failed to get node config of %s: %s", node, node_config);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	255 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	256 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	257 local changed = false;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	258 for config_field, value in pairs(default_options) do
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	259 if node_config[config_field] ~= value then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	260 node_config[config_field] = value;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	261 changed = true;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	262 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	263 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	264 if not changed then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	265 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	266 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	267 local ok, err = service:set_node_config(node, actor, node_config);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	268 if not ok then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	269 module:log("error", "Failed to set node config of %s: %s", node, err);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	270 return;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	271 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	272 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	273
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	274 module:hook("iq/bare/jabber:iq:private:query", function (event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	275 if event.stanza.attr.type == "get" then
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	276 return on_retrieve_private_xml(event);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	277 else
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	278 return on_publish_private_xml(event);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	279 end
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	280 end, 1);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	281 module:hook("resource-bind", migrate_legacy_bookmarks);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	282 module:handle_items("pep-service", function (event)
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	283 local service = event.item.service;
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	284 module:hook_object_event(service.events, "node-created", on_node_created);
90f88a643973 mod_bookmarks2: Add new module. Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> parents: diff changeset	285 end, function () end, true);

Mercurial > prosody-modules

annotate mod_bookmarks2/mod_bookmarks2.lua @ 3715:f03a023cd523