# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1731061885 0
# Node ID 84ee435f284eca4cc68a016b9cb6bd53a797d3b8
# Parent  7f05254fb0423a13c17a0cff2b3c89b5c33a1232# Parent  d6545c533ce28b59dd55dcd27f376917cdd85119
Merge 0.12->trunk

diff -r 7f05254fb042 -r 84ee435f284e plugins/mod_bookmarks.lua
--- a/plugins/mod_bookmarks.lua	Sat Nov 02 23:08:28 2024 +0100
+++ b/plugins/mod_bookmarks.lua	Fri Nov 08 10:31:25 2024 +0000
@@ -167,10 +167,15 @@
 		if synchronise then
 			-- If we set zero legacy bookmarks, purge the bookmarks 2 node.
 			module:log("debug", "No bookmark in the set, purging instead.");
-			return service:purge(namespace, jid, true);
-		else
-			return true;
+			local ok, err = service:purge(namespace, jid, true);
+			-- It's okay if no node exists when purging, user has
+			-- 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
+		return true;
 	end
 
 	-- Retrieve the current bookmarks2.
@@ -309,7 +314,7 @@
 
 	local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
 	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"));
 		return true;
 	end
@@ -335,7 +340,7 @@
 
 	local ok, err = publish_to_pep(session.full_jid, bookmarks, true);
 	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"));
 		return true;
 	end