aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-01-29 04:54:08 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-01-29 04:54:08 +0500
commitd76f04e84ecd78b6b9b0e2e354d51a847491fea4 (patch)
treebdd1dfe8c1990036e76b8cffc9db2dface0458ac /plugins
parent3dda2fcfac6774f42c10338bfc2362ad666b9c5b (diff)
parent4e486d4ba9300c553a7a8fce15037141d48a77f5 (diff)
downloadprosody-d76f04e84ecd78b6b9b0e2e354d51a847491fea4.tar.gz
prosody-d76f04e84ecd78b6b9b0e2e354d51a847491fea4.zip
Merge 0.8->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_ping.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index c0ba6189..0bfcac66 100644
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -22,8 +22,10 @@ module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);
-- Ad-hoc command
+local datetime = require "util.datetime".datetime;
+
function ping_command_handler (self, data, state)
- local now = os.date("%Y-%m-%dT%X");
+ local now = datetime();
return { info = "Pong\n"..now, status = "completed" };
end