diff options
| -rw-r--r-- | util/discohelper.lua | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/util/discohelper.lua b/util/discohelper.lua index c2301937..b33b859c 100644 --- a/util/discohelper.lua +++ b/util/discohelper.lua @@ -7,57 +7,57 @@ -- -
-local t_insert = table.insert;
-local jid_split = require "util.jid".split;
-local ipairs = ipairs;
-local st = require "util.stanza";
-
-module "discohelper";
-
-local function addDiscoItemsHandler(self, jid, func)
- if self.item_handlers[jid] then
- t_insert(self.item_handlers[jid], func);
- else
- self.item_handlers[jid] = {func};
- end
-end
-
-local function addDiscoInfoHandler(self, jid, func)
- if self.info_handlers[jid] then
- t_insert(self.info_handlers[jid], func);
- else
- self.info_handlers[jid] = {func};
- end
-end
-
-local function handle(self, stanza)
- if stanza.name == "iq" and stanza.tags[1].name == "query" then
- local query = stanza.tags[1];
- local to = stanza.attr.to;
- local from = stanza.attr.from
- local node = query.attr.node or "";
- local to_node, to_host = jid_split(to);
-
- local reply = st.reply(stanza):query(query.attr.xmlns);
- local handlers;
- if query.attr.xmlns == "http://jabber.org/protocol/disco#info" then -- select handler set
- handlers = self.info_handlers;
- elseif query.attr.xmlns == "http://jabber.org/protocol/disco#items" then
- handlers = self.item_handlers;
- end
+ +local t_insert = table.insert; +local jid_split = require "util.jid".split; +local ipairs = ipairs; +local st = require "util.stanza"; + +module "discohelper"; + +local function addDiscoItemsHandler(self, jid, func) + if self.item_handlers[jid] then + t_insert(self.item_handlers[jid], func); + else + self.item_handlers[jid] = {func}; + end +end + +local function addDiscoInfoHandler(self, jid, func) + if self.info_handlers[jid] then + t_insert(self.info_handlers[jid], func); + else + self.info_handlers[jid] = {func}; + end +end + +local function handle(self, stanza) + if stanza.name == "iq" and stanza.tags[1].name == "query" then + local query = stanza.tags[1]; + local to = stanza.attr.to; + local from = stanza.attr.from + local node = query.attr.node or ""; + local to_node, to_host = jid_split(to); + + local reply = st.reply(stanza):query(query.attr.xmlns); + local handlers; + if query.attr.xmlns == "http://jabber.org/protocol/disco#info" then -- select handler set + handlers = self.info_handlers; + elseif query.attr.xmlns == "http://jabber.org/protocol/disco#items" then + handlers = self.item_handlers; + end local handler; local found; -- to keep track of any handlers found - if to_node then -- handlers which get called always
- handler = handlers["*node"];
- else
- handler = handlers["*host"];
- end
- if handler then -- call always called handler
- for _, h in ipairs(handler) do
- if h(reply, to, from, node) then found = true; end
- end
- end
+ if to_node then -- handlers which get called always + handler = handlers["*node"]; + else + handler = handlers["*host"]; + end + if handler then -- call always called handler + for _, h in ipairs(handler) do + if h(reply, to, from, node) then found = true; end + end + end handler = handlers[to]; -- get the handler if not handler then -- if not found then use default handler if to_node then @@ -71,19 +71,19 @@ local function handle(self, stanza) if h(reply, to, from, node) then found = true; end end end - if found then return reply; end -- return the reply if there was one
- return st.error_reply(stanza, "cancel", "service-unavailable");
- end
-end
-
-function new()
- return {
- item_handlers = {};
- info_handlers = {};
- addDiscoItemsHandler = addDiscoItemsHandler;
- addDiscoInfoHandler = addDiscoInfoHandler;
- handle = handle;
- };
-end
-
-return _M;
+ if found then return reply; end -- return the reply if there was one + return st.error_reply(stanza, "cancel", "service-unavailable"); + end +end + +function new() + return { + item_handlers = {}; + info_handlers = {}; + addDiscoItemsHandler = addDiscoItemsHandler; + addDiscoInfoHandler = addDiscoInfoHandler; + handle = handle; + }; +end + +return _M; |