# HG changeset patch # User Kim Alvefur <zash@zash.se> # Date 1530892850 -7200 # Node ID 4d2738b99b07c6898eefe71ba608b3325f0abdeb # Parent 6897b2e18bdf374265c73e60d1fb435d1d370262 mod_pubsub: Move service discovery to pubsub.lib to allow reuse diff -r 6897b2e18bdf -r 4d2738b99b07 plugins/mod_pubsub/mod_pubsub.lua --- a/plugins/mod_pubsub/mod_pubsub.lua Fri Jul 06 16:04:53 2018 +0200 +++ b/plugins/mod_pubsub/mod_pubsub.lua Fri Jul 06 18:00:50 2018 +0200 @@ -88,26 +88,11 @@ end module:hook("host-disco-info-node", function (event) - local stanza, reply, node = event.stanza, event.reply, event.node; - local ok, ret = service:get_nodes(stanza.attr.from); - if not ok or not ret[node] then - return; - end - event.exists = true; - reply:tag("identity", { category = "pubsub", type = "leaf" }); + return lib_pubsub.handle_disco_info_node(event, service); end); module:hook("host-disco-items-node", function (event) - local stanza, reply, node = event.stanza, event.reply, event.node; - local ok, ret = service:get_items(node, stanza.attr.from); - if not ok then - return; - end - - for _, id in ipairs(ret) do - reply:tag("item", { jid = module.host, name = id }):up(); - end - event.exists = true; + return lib_pubsub.handle_disco_items_node(event, service); end); diff -r 6897b2e18bdf -r 4d2738b99b07 plugins/mod_pubsub/pubsub.lib.lua --- a/plugins/mod_pubsub/pubsub.lib.lua Fri Jul 06 16:04:53 2018 +0200 +++ b/plugins/mod_pubsub/pubsub.lib.lua Fri Jul 06 18:00:50 2018 +0200 @@ -138,6 +138,30 @@ return supported_features; end +function _M.handle_disco_info_node(event, service) + local stanza, reply, node = event.stanza, event.reply, event.node; + local ok, ret = service:get_nodes(stanza.attr.from); + local node_obj = ret[node]; + if not ok or not node_obj then + return; + end + event.exists = true; + reply:tag("identity", { category = "pubsub", type = "leaf" }):up(); +end + +function _M.handle_disco_items_node(event, service) + local stanza, reply, node = event.stanza, event.reply, event.node; + local ok, ret = service:get_items(node, stanza.attr.from); + if not ok then + return; + end + + for _, id in ipairs(ret) do + reply:tag("item", { jid = module.host, name = id }):up(); + end + event.exists = true; +end + function _M.handle_pubsub_iq(event, service) local origin, stanza = event.origin, event.stanza; local pubsub_tag = stanza.tags[1];