From 00b15b847b57b331fb934bfa76176d4eee194622 Mon Sep 17 00:00:00 2001
From: Er2 <er2@dismail.de>
Date: Tue, 18 Jan 2022 18:50:00 +0000
Subject: [PATCH] add uptime

---
 src/cmds/ping.lua   | 10 ++++++++--
 src/locales/en.json |  2 +-
 src/locales/ru.json |  2 +-
 src/parts/core.lua  | 11 +++++++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/cmds/ping.lua b/src/cmds/ping.lua
index 926cef7..78e0726 100644
--- a/src/cmds/ping.lua
+++ b/src/cmds/ping.lua
@@ -1,5 +1,11 @@
 return {
   run = function(C, msg)
-    C.api:send(msg, msg.loc.pat:format(os.time() - msg.date))
+    local t = os.time()
+    local ps, ls, lm, lh, ld
+    ps, ls = t - msg.date, t - C.loaded
+    lm = ls / 60
+    lh = lm / 60
+    ld = lh / 24
+    C.api:send(msg, msg.loc.pat:format(ps, ld, lh, lm, ls))
   end
-}
\ No newline at end of file
+}
diff --git a/src/locales/en.json b/src/locales/en.json
index 55a04fc..7aec5cd 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -17,7 +17,7 @@
     "ping": {
       "desc": "ping pong",
 
-      "pat": "Pong! %ds"
+      "pat": "Pong! %ds. Uptime: %d days (%dh, %dm.)"
     },
     "rub": {
       "args": "[valute]...",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 5efe927..96bc655 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -17,7 +17,7 @@
     "ping": {
       "desc": "пинг-понг",
 
-      "pat": "Понг! %d секунд"
+      "pat": "Понг! %dс. В сети: %d дней (%dч, %dм.)"
     },
     "rub": {
       "args": "[валюта]...",
diff --git a/src/parts/core.lua b/src/parts/core.lua
index b152c57..8e072a8 100644
--- a/src/parts/core.lua
+++ b/src/parts/core.lua
@@ -2,6 +2,7 @@
 
 local Core = {
   config = config,
+  loaded = 0,
 }
 (require 'etc.events')(Core) -- add events
 
@@ -13,8 +14,7 @@ function Core:load(what)
 
     print(('Loading %s (%d / %d) %s...'):format(what:sub(0, -2), i, s, v))
     -- Lint
-    if true then 
-    --pcall(require, 'src.'.. what ..'.'.. v) then
+    if pcall(require, 'src.'.. what ..'.'.. v) then
       local a=require('src.'.. what ..'.'.. v)
       if     what == 'events' then self.api:on(v, a)
       elseif what == 'cmds'   then self.cmds[v] = a
@@ -23,6 +23,7 @@ function Core:load(what)
     else print 'fail' end
   end
   print(('Loaded %d %s'):format(s, what))
+  self.loaded = os.time()
 end
 
 function Core:ev(t, i, name, ...)
@@ -44,4 +45,10 @@ function Core:init()
   self:emit 'ready'
 end
 
+function Core:stop()
+  self.api:destroy()
+  print 'Stopped'
+  print('Uptime: '.. os.time() - self.loaded.. ' seconds')
+end
+
 Core:init()