# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1658873408 -7200
# Node ID 0572b6e604a37096e12f97831ece59be6f1566af
# Parent  29685403be32d9dd29e4fdab45ffeb473c8a835e# Parent  1832b6c9c6edc2e53de26c6cde289bec1945cec3
Merge 0.12->trunk

diff -r 29685403be32 -r 0572b6e604a3 plugins/mod_bookmarks.lua
--- a/plugins/mod_bookmarks.lua	Wed Jun 01 15:06:59 2022 +0200
+++ b/plugins/mod_bookmarks.lua	Wed Jul 27 00:10:08 2022 +0200
@@ -87,7 +87,11 @@
 	local service = mod_pep.get_pep_service(username);
 	local ok, ret = service:get_items(namespace, session.full_jid);
 	if not ok then
-		module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
+		if ret == "item-not-found" then
+			module:log("debug", "Got no PEP bookmarks item for %s, returning empty private bookmarks", jid);
+		else
+			module:log("error", "Failed to retrieve PEP bookmarks of %s: %s", jid, ret);
+		end
 		session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrieve bookmarks from PEP"));
 		return true;
 	end
diff -r 29685403be32 -r 0572b6e604a3 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Wed Jun 01 15:06:59 2022 +0200
+++ b/plugins/mod_storage_sql.lua	Wed Jul 27 00:10:08 2022 +0200
@@ -832,7 +832,7 @@
 end
 
 function module.load()
-	if prosody.prosodyctl then return; end
+	if prosody.process_type == "prosodyctl" then return; end
 	local engines = module:shared("/*/sql/connections");
 	local params = normalize_params(module:get_option("sql", default_params));
 	local db_uri = sql.db2uri(params);
diff -r 29685403be32 -r 0572b6e604a3 spec/scansion/empty_bookmarks.scs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/spec/scansion/empty_bookmarks.scs	Wed Jul 27 00:10:08 2022 +0200
@@ -0,0 +1,27 @@
+# mod_scansion_record on host 'localhost' recording started 2022-07-26T21:39:55Z
+
+[Client] Romeo
+	password: password
+	jid: juliet@localhost/UaksS4M1xYZB
+
+-----
+
+Romeo connects
+
+Romeo sends:
+	<iq xml:lang='en' type='get' id='bNBJLtpIJXpq'>
+		<pubsub xmlns='http://jabber.org/protocol/pubsub'>
+			<items node='storage:bookmarks'/>
+		</pubsub>
+	</iq>
+
+Romeo receives:
+	<iq id='bNBJLtpIJXpq' type='error'>
+		<error type='cancel'>
+			<item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+		</error>
+	</iq>
+
+Romeo disconnects
+
+# recording ended on 2022-07-26T21:40:45Z