mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.12->trunk

Browse source
This commit is contained in:
Matthew Wild 2024-11-08 10:31:25 +00:00
commit ef342f9734
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/mod_bookmarks.lua
View file

@ -167,10 +167,15 @@ local function publish_to_pep(jid, bookmarks, synchronise)
if synchronise then if synchronise then
-- If we set zero legacy bookmarks, purge the bookmarks 2 node. -- If we set zero legacy bookmarks, purge the bookmarks 2 node.
module:log("debug", "No bookmark in the set, purging instead."); module:log("debug", "No bookmark in the set, purging instead.");
return service:purge(namespace, jid, true); local ok, err = service:purge(namespace, jid, true);
else -- It's okay if no node exists when purging, user has
return true; -- no bookmarks anyway.
if not ok and err ~= "item-not-found" then
module:log("error", "Failed to clear items from bookmarks 2 node: %s", err);
return ok, err;
end
end end
return true;
end end
-- Retrieve the current bookmarks2. -- Retrieve the current bookmarks2.
@ -309,7 +314,7 @@ local function on_publish_legacy_pep(event)
local ok, err = publish_to_pep(session.full_jid, bookmarks, true); local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
if not ok then if not ok then
module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err); module:log("error", "Failed to sync legacy bookmarks to PEP for %s@%s: %s", session.username, session.host, err);
session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP")); session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
return true; return true;
end end
@ -335,7 +340,7 @@ local function on_publish_private_xml(event)
local ok, err = publish_to_pep(session.full_jid, bookmarks, true); local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
if not ok then if not ok then
module:log("error", "Failed to publish to PEP bookmarks for %s@%s: %s", session.username, session.host, err); module:log("error", "Failed to sync private XML bookmarks to PEP for %s@%s: %s", session.username, session.host, err);
session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP")); session.send(st.error_reply(stanza, "cancel", "internal-server-error", "Failed to store bookmarks to PEP"));
return true; return true;
end end