X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=plugins%2Fmod_uptime.lua;h=c3860af6535508ea58200bc06657f6a644fa6659;hb=e4985c5b4fd8d8e2446abd72d0bd4f4ac622c974;hp=33dd66fbcb5abd97ce07fc05d0c35405a015f464;hpb=5466de23f56d2121e384f47fe14f32b4ff5ed587;p=prosody.git

diff --git a/plugins/mod_uptime.lua b/plugins/mod_uptime.lua
index 33dd66fb..c3860af6 100644
--- a/plugins/mod_uptime.lua
+++ b/plugins/mod_uptime.lua
@@ -1,44 +1,48 @@
--- Prosody IM v0.2
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 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.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
+local st = require "util.stanza";
+
+local start_time = prosody.start_time;
+prosody.events.add_handler("server-started", function() start_time = prosody.start_time end);
+
+-- XEP-0012: Last activity
+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);
+
+-- 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);
 
-
-local st = require "util.stanza"
-
-local jid_split = require "util.jid".split;
-local t_concat = table.concat;
-
-local start_time = os.time();
-
-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:add_item ("adhoc", descriptor);