mod_uptime: Updated to use events (which also fixes a few minor issues).

1 files changed, 15 insertions, 18 deletions

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index eb0ca7cc..2737a9f2 100644
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -6,30 +6,27 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local st = require "util.stanza"
 
 local jid_split = require "util.jid".split;
 local t_concat = table.concat;
 
 local start_time = prosody.start_time;
-
-prosody.events.add_handler("server-started", function () start_time = prosody.start_time end);
+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);
+
+module:hook("iq/bare/jabber:iq:last:query", function(event)
+	local origin, stanza = event.origin, event.stanza;
+	if stanza.attr.type == "get" then
+		-- TODO last activity
+	end
+end);