aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-05-16 19:05:20 +0200
committerKim Alvefur <zash@zash.se>2021-05-16 19:05:20 +0200
commitf650ac55372078ef52bea9da68d881db7c756f11 (patch)
tree1fa13837da078e3dbaa8a490081e3d77d440dd92
parentf5757cae7fff33b74783b8006cbfc1a57ec7c4be (diff)
parent0c6f17043f100150629d9b4c9c27a3489958f67c (diff)
downloadprosody-f650ac55372078ef52bea9da68d881db7c756f11.tar.gz
prosody-f650ac55372078ef52bea9da68d881db7c756f11.zip
Merge 0.11->trunk
-rw-r--r--plugins/mod_pep.lua12
-rw-r--r--util/pubsub.lua4
2 files changed, 4 insertions, 12 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 65f99958..da74639e 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -214,18 +214,6 @@ function get_pep_service(username)
check_node_config = check_node_config;
});
- local nodes, err = known_nodes:get(username);
- if nodes then
- module:log("debug", "Restoring nodes for user %s", username);
- for node in pairs(nodes) do
- module:log("debug", "Restoring node %q", node);
- service:create(node, true);
- end
- elseif err then
- module:log("error", "Could not restore nodes for %s: %s", username, err);
- else
- module:log("debug", "No known nodes");
- end
services[username] = service;
module:add_item("pep-service", { service = service, jid = user_bare });
return service;
diff --git a/util/pubsub.lua b/util/pubsub.lua
index cfac7a68..98399dae 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -565,6 +565,10 @@ function service:publish(node, actor, id, item, requested_config) --> ok, err
return nil, "invalid-item";
end
local node_data = self.data[node];
+ if not node_data then
+ -- FIXME how is this possible? #1657
+ return nil, "internal-server-error";
+ end
local ok = node_data:set(id, item);
if not ok then
return nil, "internal-server-error";