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

Merge 0.12->trunk

Browse source
This commit is contained in:
Kim Alvefur 2022-07-27 00:10:08 +02:00
commit 7c8dd7ee42
3 changed files with 33 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mod_bookmarks.lua
View file

@ -87,7 +87,11 @@ local function on_retrieve_legacy_pep(event)
local service = mod_pep.get_pep_service(username); local service = mod_pep.get_pep_service(username);
local ok, ret = service:get_items(namespace, session.full_jid); local ok, ret = service:get_items(namespace, session.full_jid);
if not ok then 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")); session.send(st.error_reply(stanza, "cancel", ret, "Failed to retrieve bookmarks from PEP"));
return true; return true;
end end

2
plugins/mod_storage_sql.lua
View file

@ -832,7 +832,7 @@ local function normalize_params(params)
end end
function module.load() function module.load()
if prosody.prosodyctl then return; end if prosody.process_type == "prosodyctl" then return; end
local engines = module:shared("/*/sql/connections"); local engines = module:shared("/*/sql/connections");
local params = normalize_params(module:get_option("sql", default_params)); local params = normalize_params(module:get_option("sql", default_params));
local db_uri = sql.db2uri(params); local db_uri = sql.db2uri(params);

27
spec/scansion/empty_bookmarks.scs Normal file
View file

@ -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