diff options
| -rw-r--r-- | util/discohelper.lua | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/util/discohelper.lua b/util/discohelper.lua index 4d3bc3f6..7966ac55 100644 --- a/util/discohelper.lua +++ b/util/discohelper.lua @@ -57,20 +57,8 @@ local function handle(self, stanza) elseif query.attr.xmlns == "http://jabber.org/protocol/disco#items" then
handlers = self.item_handlers;
end
- local handler = handlers[to]; -- get the handler
- if not handler then -- if not found then use default handler
- if to_node then
- handler = handlers["*defaultnode"];
- else
- handler = handlers["*defaulthost"];
- end
- end
- local found; -- to keep track of any handlers found
- if handler then
- for _, h in ipairs(handler) do
- if h(reply, to, from, node) then found = true; end
- end
- 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
@@ -81,6 +69,19 @@ local function handle(self, stanza) 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 + handler = handlers["*defaultnode"]; + else + handler = handlers["*defaulthost"]; + end + end + if handler then + for _, h in ipairs(handler) do + 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
|