comparison util/pubsub.lua @ 14186:d975d280baec

Merge 13.0->trunk
author Matthew Wild <mwild1@gmail.com>
date Mon, 25 May 2026 19:01:23 +0100
parents 221f3378e7f4 e23b9651145d
children 4f12f98c2ec1
comparison
equal deleted inserted replaced
14168:4f4c346e4f39 14186:d975d280baec
353 local ok, err = self:add_subscription(node, true, jid); 353 local ok, err = self:add_subscription(node, true, jid);
354 if not ok then 354 if not ok then
355 return ok, err; 355 return ok, err;
356 end 356 end
357 elseif jid_sub and not self:may(node, jid, "be_subscribed") then 357 elseif jid_sub and not self:may(node, jid, "be_subscribed") then
358 local ok, err = self:add_subscription(node, true, jid); 358 local ok, err = self:remove_subscription(node, true, jid);
359 if not ok then 359 if not ok then
360 return ok, err; 360 return ok, err;
361 end 361 end
362 end 362 end
363 return true; 363 return true;
660 self.data[node] = nil; 660 self.data[node] = nil;
661 661
662 if self.config.nodestore then 662 if self.config.nodestore then
663 local ok, err = delete_node_in_store(self, node); 663 local ok, err = delete_node_in_store(self, node);
664 if not ok then 664 if not ok then
665 self.nodes[node] = nil; 665 self.nodes[node] = node_obj;
666 return ok, err; 666 return ok, err;
667 end 667 end
668 end 668 end
669 669
670 self.events.fire_event("node-deleted", { service = self, node = node, actor = actor }); 670 self.events.fire_event("node-deleted", { service = self, node = node, actor = actor });