Merge 0.10->trunk

[prosody.git] / plugins / mod_ping.lua

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index db80f382894cc0e39d56767139f2bda8fbf42b2c..1a5034094c9f2ac61744c1a4324e316dc065ba94 100644 (file)
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -1,20 +1,32 @@
--- Prosody IM v0.4
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
--- 
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
 
-
-
 local st = require "util.stanza";
 
 module:add_feature("urn:xmpp:ping");
 
-module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:ping",
-       function(session, stanza)
-               if stanza.attr.type == "get" then
-                       session.send(st.reply(stanza));
-               end
-       end);
+local function ping_handler(event)
+       return event.origin.send(st.reply(event.stanza));
+end
+
+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
+
+local datetime = require "util.datetime".datetime;
+
+function ping_command_handler (self, data, state)
+       local now = datetime();
+       return { info = "Pong\n"..now, status = "completed" };
+end
+
+local adhoc_new = module:require "adhoc".new;
+local descriptor = adhoc_new("Ping", "ping", ping_command_handler);
+module:add_item ("adhoc", descriptor);
+