From b9ba45122bbda8c5ac62a4eda4ad8b964d2f2ffe Mon Sep 17 00:00:00 2001
From: deathbybandaid <sam@deathbybandaid.net>
Date: Fri, 31 May 2019 12:28:36 -0400
Subject: [PATCH] uptime

---
 sopel_modules/SpiceBot/Events.py              |  4 ++-
 .../SpiceBot_Core_Commands/Uptime.py          | 15 +++++++++++
 .../SpiceBot_Core_Commands/__init__.py        |  1 +
 sopel_modules/SpiceBot_Uptime/Uptime.py       | 27 -------------------
 sopel_modules/SpiceBot_Uptime/__init__.py     |  8 ------
 5 files changed, 19 insertions(+), 36 deletions(-)
 create mode 100644 sopel_modules/SpiceBot_Core_Commands/Uptime.py
 delete mode 100644 sopel_modules/SpiceBot_Uptime/Uptime.py
 delete mode 100644 sopel_modules/SpiceBot_Uptime/__init__.py

diff --git a/sopel_modules/SpiceBot/Events.py b/sopel_modules/SpiceBot/Events.py
index a6e1e5b..189cbe2 100644
--- a/sopel_modules/SpiceBot/Events.py
+++ b/sopel_modules/SpiceBot/Events.py
@@ -10,6 +10,7 @@ self-trigger the bot into performing actions
 import sopel
 import functools
 import threading
+import time
 
 from .Logs import logs
 
@@ -34,6 +35,7 @@ class BotEvents(object):
     def __init__(self):
         self.lock = threading.Lock()
         self.RPL_WELCOME = '001'  # This is a defined IRC event
+        self.BOT_UPTIME = time.time()
         self.BOT_WELCOME = '1001'
         self.BOT_READY = '1002'
         self.BOT_CONNECTED = '1003'
@@ -41,7 +43,7 @@ class BotEvents(object):
         self.BOT_RECONNECTED = '1005'
         self.defaultevents = [self.BOT_WELCOME, self.BOT_READY, self.BOT_CONNECTED, self.BOT_LOADED, self.BOT_RECONNECTED]
         self.dict = {
-                    "assigned_IDs": {1000: "Default", 1001: "BOT_WELCOME", 1002: "BOT_READY", 1003: "BOT_CONNECTED", 1004: "BOT_LOADED", 1005: "BOT_RECONNECTED"},
+                    "assigned_IDs": {1000: "BOT_UPTIME", 1001: "BOT_WELCOME", 1002: "BOT_READY", 1003: "BOT_CONNECTED", 1004: "BOT_LOADED", 1005: "BOT_RECONNECTED"},
                     "triggers_recieved": {},
                     "trigger_queue": [],
                     "startup_required": [self.BOT_WELCOME, self.BOT_READY, self.BOT_CONNECTED],
diff --git a/sopel_modules/SpiceBot_Core_Commands/Uptime.py b/sopel_modules/SpiceBot_Core_Commands/Uptime.py
new file mode 100644
index 0000000..b8aa223
--- /dev/null
+++ b/sopel_modules/SpiceBot_Core_Commands/Uptime.py
@@ -0,0 +1,15 @@
+# coding=utf-8
+
+from __future__ import unicode_literals, absolute_import, division, print_function
+
+import sopel.module
+
+import time
+
+import sopel_modules.SpiceBot as SpiceBot
+
+
+@sopel.module.nickname_commands('uptime')
+def bot_command_srewyou(bot, trigger):
+    timesince = str(SpiceBot.humanized_time(time.time() - SpiceBot.events.BOT_UPTIME)) + " ago."
+    bot.osd("I have been running since " + timesince)
diff --git a/sopel_modules/SpiceBot_Core_Commands/__init__.py b/sopel_modules/SpiceBot_Core_Commands/__init__.py
index 38f3e8e..f686aba 100644
--- a/sopel_modules/SpiceBot_Core_Commands/__init__.py
+++ b/sopel_modules/SpiceBot_Core_Commands/__init__.py
@@ -9,6 +9,7 @@ This module contains references only for other modules to utilize.
 from .Commands import *
 from .Channels import *
 from .Database import *
+from .Uptime import *
 
 __author__ = 'Sam Zick'
 __email__ = 'sam@deathbybandaid.net'
diff --git a/sopel_modules/SpiceBot_Uptime/Uptime.py b/sopel_modules/SpiceBot_Uptime/Uptime.py
deleted file mode 100644
index 8273582..0000000
--- a/sopel_modules/SpiceBot_Uptime/Uptime.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-import time
-
-import sopel_modules.SpiceBot as SpiceBot
-
-
-def setup(bot):
-    if 'SpiceBot_Uptime' not in bot.memory:
-        now = time.time()
-        SpiceBot.logs.log('SpiceBot_Uptime', "Start time set to " + str(time.time()))
-        bot.memory["SpiceBot_Uptime"] = now
-
-
-def shutdown(bot):
-    if "SpiceBot_Uptime" in bot.memory:
-        del bot.memory["SpiceBot_Uptime"]
-
-
-@sopel.module.nickname_commands('uptime')
-def bot_command_srewyou(bot, trigger):
-    timesince = str(SpiceBot.humanized_time(time.time() - bot.memory["SpiceBot_Uptime"])) + " ago."
-    bot.osd("I have been running since " + timesince)
diff --git a/sopel_modules/SpiceBot_Uptime/__init__.py b/sopel_modules/SpiceBot_Uptime/__init__.py
deleted file mode 100644
index d0079c0..0000000
--- a/sopel_modules/SpiceBot_Uptime/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# coding=utf8
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-from .Uptime import *
-
-__author__ = 'Sam Zick'
-__email__ = 'sam@deathbybandaid.net'
-__version__ = '0.1.1'