diff options
author | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-02-12 19:26:54 +0100 |
commit | 741b175347e86a18273060fc884b1d5c8899cc5e (patch) | |
tree | 6eb49f8bddde74f4f7a621d0fb2770d60c093b4f /plugins/mod_ping.lua | |
parent | 6d743a0544280a231a08d8ab6aeedf9d57090c2a (diff) | |
parent | a8479fce152379d3e095aa0204aa022c5b47d4e0 (diff) | |
download | prosody-741b175347e86a18273060fc884b1d5c8899cc5e.tar.gz prosody-741b175347e86a18273060fc884b1d5c8899cc5e.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'plugins/mod_ping.lua')
-rw-r--r-- | plugins/mod_ping.lua | 9 |
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 |