aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_ping.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-12 19:26:54 +0100
committerKim Alvefur <zash@zash.se>2014-02-12 19:26:54 +0100
commit08f04b1419c2c8878d3836d11cd7af806a083898 (patch)
tree6eb49f8bddde74f4f7a621d0fb2770d60c093b4f /plugins/mod_ping.lua
parentdb97ec41b600653e046c0d6ee7c2625105a5a761 (diff)
parenta0ece01720887a029783f813da186d624aa41ba8 (diff)
downloadprosody-08f04b1419c2c8878d3836d11cd7af806a083898.tar.gz
prosody-08f04b1419c2c8878d3836d11cd7af806a083898.zip
Merge 0.10 -> trunk
Diffstat (limited to 'plugins/mod_ping.lua')
-rw-r--r--plugins/mod_ping.lua9
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index eddb92d2..1a503409 100644
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -11,14 +11,11 @@ local st = require "util.stanza";
module:add_feature("urn:xmpp:ping");
local function ping_handler(event)
- if event.stanza.attr.type == "get" then
- event.origin.send(st.reply(event.stanza));
- return true;
- end
+ return event.origin.send(st.reply(event.stanza));
end
-module:hook("iq/bare/urn:xmpp:ping:ping", ping_handler);
-module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq-get/bare/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq-get/host/urn:xmpp:ping:ping", ping_handler);
-- Ad-hoc command