X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_time.lua;h=7d900ae9cee4526a91bd8e10a9ea664d9eaa661f;hb=99a0a02d0ca6d273bfa72fed0c59b990db77480b;hp=bf079692904999748b8ed07dd807a3e15bbd1bb2;hpb=7f7804a18d4aa7677631c618d8c5d5f8f2b2d6e2;p=prosody.git

diff --git a/plugins/mod_time.lua b/plugins/mod_time.lua
index bf079692..7d900ae9 100644
--- a/plugins/mod_time.lua
+++ b/plugins/mod_time.lua
@@ -1,29 +1,44 @@
-
-local st = require "util.stanza";
-local datetime = require "util.datetime".datetime;
-local legacy = require "util.datetime".legacy;
-
--- XEP-0202: Entity Time
-
-require "core.discomanager".set("time", "urn:xmpp:time");
-
-add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:time",
-	function(session, stanza)
-		if stanza.attr.type == "get" then
-			session.send(st.reply(stanza):tag("time", {xmlns="urn:xmpp:time"})
-				:tag("tzo"):text("+00:00"):up() -- FIXME get the timezone in a platform independent fashion
-				:tag("utc"):text(datetime()));
-		end
-	end);
-
--- XEP-0090: Entity Time (deprecated)
-
-require "core.discomanager".set("time", "jabber:iq:time");
-
-add_iq_handler({"c2s", "s2sin"}, "jabber:iq:time",
-	function(session, stanza)
-		if stanza.attr.type == "get" then
-			session.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"})
-				:tag("utc"):text(legacy()));
-		end
-	end);
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 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";
+local datetime = require "util.datetime".datetime;
+local legacy = require "util.datetime".legacy;
+
+-- XEP-0202: Entity Time
+
+module:add_feature("urn:xmpp:time");
+
+local function time_handler(event)
+	local origin, stanza = event.origin, event.stanza;
+	if stanza.attr.type == "get" then
+		origin.send(st.reply(stanza):tag("time", {xmlns="urn:xmpp:time"})
+			:tag("tzo"):text("+00:00"):up() -- TODO get the timezone in a platform independent fashion
+			:tag("utc"):text(datetime()));
+		return true;
+	end
+end
+
+module:hook("iq/bare/urn:xmpp:time:time", time_handler);
+module:hook("iq/host/urn:xmpp:time:time", time_handler);
+
+-- XEP-0090: Entity Time (deprecated)
+
+module:add_feature("jabber:iq:time");
+
+local function legacy_time_handler(event)
+	local origin, stanza = event.origin, event.stanza;
+	if stanza.attr.type == "get" then
+		origin.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"})
+			:tag("utc"):text(legacy()));
+		return true;
+	end
+end
+
+module:hook("iq/bare/jabber:iq:time:query", legacy_time_handler);
+module:hook("iq/host/jabber:iq:time:query", legacy_time_handler);