diff options
| -rw-r--r-- | core/modulemanager.lua | 21 | ||||
| -rw-r--r-- | plugins/mod_pep.lua | 4 |
2 files changed, 24 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua index 004b7dfb..fdc4832b 100644 --- a/core/modulemanager.lua +++ b/core/modulemanager.lua @@ -47,6 +47,7 @@ local handler_info = {}; local modulehelpers = setmetatable({}, { __index = _G }); local features_table = multitable_new(); +local identities_table = multitable_new(); local handler_table = multitable_new(); local hooked = multitable_new(); local hooks = multitable_new(); @@ -162,6 +163,7 @@ function unload(host, name, ...) end modulemap[host][name] = nil; features_table:remove(host, name); + identities_table:remove(host, name); local params = handler_table:get(host, name); -- , {module.host, origin_type, tag, xmlns} for _, param in pairs(params or NULL) do local handlers = stanza_handlers:get(param[1], param[2], param[3], param[4]); @@ -326,6 +328,22 @@ end addDiscoInfoHandler("*host", function(reply, to, from, node) if #node == 0 then local done = {}; + for module, identities in pairs(identities_table:get(to) or NULL) do -- for each module + for identity, attr in pairs(identities) do + if not done[identity] then + reply:tag("identity", attr):up(); -- TODO cache + done[identity] = true; + end + end + end + for module, identities in pairs(identities_table:get("*") or NULL) do -- for each module + for identity, attr in pairs(identities) do + if not done[identity] then + reply:tag("identity", attr):up(); -- TODO cache + done[identity] = true; + end + end + end for module, features in pairs(features_table:get(to) or NULL) do -- for each module for feature in pairs(features) do if not done[feature] then @@ -349,6 +367,9 @@ end); function api:add_feature(xmlns) features_table:set(self.host, self.name, xmlns, true); end +function api:add_identity(category, typ) + identities_table:set(self.host, self.name, category.."\0"..typ, {category = category, typ = typ}); +end local event_hook = function(host, mod_name, event_name, ...) if type((...)) == "table" and (...).host and (...).host ~= host then return; end diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 0c360b38..5274cf81 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -11,6 +11,8 @@ local load_roster = require "core.rostermanager".load_roster; local data = {}; local recipients = {}; +module:add_identity("pubsub", "pep"); + local function publish(session, node, item) local stanza = st.message({from=session.full_jid, type='headline'}) :tag('event', {xmlns='http://jabber.org/protocol/pubsub#event'}) @@ -51,7 +53,7 @@ module:hook("presence/bare", function(data) if t == "unavailable" or t == "error" then if recipients[user] then recipients[user][recipient] = nil; end elseif not t then - recipients[user] = recipients[user][recipient] or {}; + recipients[user] = recipients[user] or {}; if not recipients[user][recipient] then recipients[user][recipient] = true; for node, message in pairs(data[user] or {}) do |