Merge with trunk.

[prosody.git] / plugins / mod_uptime.lua

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index 00625ee573a8e85f95e574e05c853a093627fa0b..cf6c6b64785480f6a5251ab7ecd69b53ccffb479 100644 (file)
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -1,33 +1,22 @@
--- Prosody IM v0.3
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- 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";
 
-\r
-local st = require "util.stanza"\r
-\r
-local jid_split = require "util.jid".split;\r
-local t_concat = table.concat;\r
-\r
-local start_time = os.time();\r
-\r
-module:add_feature("jabber:iq:last");\r
-\r
-module:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", \r
-       function (origin, stanza)\r
-               if stanza.tags[1].name == "query" then\r
-                       if stanza.attr.type == "get" then\r
-                               local node, host, resource = jid_split(stanza.attr.to);\r
-                               if node or resource then\r
-                                       -- TODO\r
-                               else\r
-                                       origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));\r
-                                       return true;\r
-                               end\r
-                       end\r
-               end\r
-       end);\r
+local start_time = prosody.start_time;
+prosody.events.add_handler("server-started", function() start_time = prosody.start_time end);
+
+module:add_feature("jabber:iq:last");
+
+module:hook("iq/host/jabber:iq:last:query", function(event)
+       local origin, stanza = event.origin, event.stanza;
+       if stanza.attr.type == "get" then
+               origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));
+               return true;
+       end
+end);