Merge with trunk.

[prosody.git] / plugins / mod_uptime.lua

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index ffb55a3c2f407de244abf05a64b64e39bfff410d..cf6c6b64785480f6a5251ab7ecd69b53ccffb479 100644 (file)
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -6,28 +6,17 @@
 -- COPYING file in the source package for more information.
 --
 
+local st = require "util.stanza";
 
-
-local st = require "util.stanza"
-
-local jid_split = require "util.jid".split;
-local t_concat = table.concat;
-
-local start_time = os.time();
+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:add_iq_handler({"c2s", "s2sin"}, "jabber:iq:last", 
-       function (origin, stanza)
-               if stanza.tags[1].name == "query" then
-                       if stanza.attr.type == "get" then
-                               local node, host, resource = jid_split(stanza.attr.to);
-                               if node or resource then
-                                       -- TODO
-                               else
-                                       origin.send(st.reply(stanza):tag("query", {xmlns = "jabber:iq:last", seconds = tostring(os.difftime(os.time(), start_time))}));
-                                       return true;
-                               end
-                       end
-               end
-       end);
+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);