Merge 0.10->trunk

[prosody.git] / plugins / mod_time.lua

diff --git a/plugins/mod_time.lua b/plugins/mod_time.lua
index 9a61d90ca8ccb59f009e46e0aa31b44fbd3fb3a6..ae7da91627b195bdb661866972e7ebeffd742c95 100644 (file)
--- a/plugins/mod_time.lua
+++ b/plugins/mod_time.lua
@@ -1,49 +1,44 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
--- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- 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";
+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
 
-\r
-local st = require "util.stanza";\r
-local datetime = require "util.datetime".datetime;\r
-local legacy = require "util.datetime".legacy;\r
-\r
--- XEP-0202: Entity Time\r
-\r
-require "core.discomanager".set("time", "urn:xmpp:time");\r
-\r
-module:add_iq_handler({"c2s", "s2sin"}, "urn:xmpp:time",\r
-       function(session, stanza)\r
-               if stanza.attr.type == "get" then\r
-                       session.send(st.reply(stanza):tag("time", {xmlns="urn:xmpp:time"})\r
-                               :tag("tzo"):text("+00:00"):up() -- FIXME get the timezone in a platform independent fashion\r
-                               :tag("utc"):text(datetime()));\r
-               end\r
-       end);\r
-\r
--- XEP-0090: Entity Time (deprecated)\r
-\r
-require "core.discomanager".set("time", "jabber:iq:time");\r
-\r
-module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:time",\r
-       function(session, stanza)\r
-               if stanza.attr.type == "get" then\r
-                       session.send(st.reply(stanza):tag("query", {xmlns="jabber:iq:time"})\r
-                               :tag("utc"):text(legacy()));\r
-               end\r
-       end);\r
+module:hook("iq/bare/jabber:iq:time:query", legacy_time_handler);
+module:hook("iq/host/jabber:iq:time:query", legacy_time_handler);