1 files changed, 37 insertions, 24 deletions
diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index eb0ca7cc..3f275b2f 100644
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -1,35 +1,48 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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 jid_split = require "util.jid".split;
-local t_concat = table.concat;
+local st = require "util.stanza";
 
 local start_time = prosody.start_time;
+module:hook_global("server-started", function() start_time = prosody.start_time end);
 
-prosody.events.add_handler("server-started", function () start_time = prosody.start_time end);
-
+-- XEP-0012: Last activity
 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);
+
+-- Ad-hoc command
+local adhoc_new = module:require "adhoc".new;
+
+function uptime_text()
+	local t = os.time()-prosody.start_time;
+	local seconds = t%60;
+	t = (t - seconds)/60;
+	local minutes = t%60;
+	t = (t - minutes)/60;
+	local hours = t%24;
+	t = (t - hours)/24;
+	local days = t;
+	return string.format("This server has been running for %d day%s, %d hour%s and %d minute%s (since %s)",
+		days, (days ~= 1 and "s") or "", hours, (hours ~= 1 and "s") or "",
+		minutes, (minutes ~= 1 and "s") or "", os.date("%c", prosody.start_time));
+end
+
+function uptime_command_handler (self, data, state)
+	return { info = uptime_text(), status = "completed" };
+end
+
+local descriptor = adhoc_new("Get uptime", "uptime", uptime_command_handler);
+
+module:add_item ("adhoc", descriptor);