Software / code / prosody
Changeset
12595:0572b6e604a3
Merge 0.12->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 27 Jul 2022 00:10:08 +0200 |
| parents | 12594:29685403be32 (current diff) 12593:1832b6c9c6ed (diff) |
| children | 12596:78f874441e21 |
| files | plugins/mod_storage_sql.lua |
| diffstat | 3 files changed, 33 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- /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
