X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_ping.lua;h=0bfcac667d96e332573c7a4be1efb38a46f0f37b;hb=refs%2Fheads%2Fnohangouts-0.8.2;hp=2cefff6162ebb41666aeb9bddcfc273baea5593e;hpb=7a04d599e21f4fc75cd23488ffa429a4b23c71fa;p=prosody.git

diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index 2cefff61..0bfcac66 100644
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -1,20 +1,35 @@
--- 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");
+
+local function ping_handler(event)
+	if event.stanza.attr.type == "get" then
+		event.origin.send(st.reply(event.stanza));
+		return true;
+	end
+end
+
+module:hook("iq/bare/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq/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);
 
-
-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);