From b0b64a835e386833efbb5e98a65a9585a1ebc2bd Mon Sep 17 00:00:00 2001
From: Zac Herd <mrdetonia@protonmail.com>
Date: Mon, 25 Feb 2019 13:58:54 +0000
Subject: [PATCH] v1.2.2, move persistent storage into persist/ subdir, in
 preparation for docker

---
 admincommands.py                        | 5 -----
 bot.py                                  | 4 ++--
 commands.py                             | 2 +-
 common.py                               | 2 +-
 helpers.py                              | 0
 {markovs => persist/markovs}/.gitignore | 0
 6 files changed, 4 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 commands.py
 mode change 100755 => 100644 common.py
 mode change 100755 => 100644 helpers.py
 rename {markovs => persist/markovs}/.gitignore (100%)

diff --git a/admincommands.py b/admincommands.py
index 2672afe..f7ce7f2 100644
--- a/admincommands.py
+++ b/admincommands.py
@@ -24,11 +24,6 @@ def cmd_die(client, msg):
     yield from client.send_message(msg.channel, "But will I dream? ;-;")
     yield from client.logout()
 
-    if msg.content[5:] == "reload":
-        # touch file to signal reload
-        with open("reload", "a"):
-            os.utime("reload", None)
-
 
 @asyncio.coroutine
 def cmd_quiet(client, msg):
diff --git a/bot.py b/bot.py
index ff1cd98..1d95e26 100644
--- a/bot.py
+++ b/bot.py
@@ -70,14 +70,14 @@ def on_message(msg):
         if msg.content != "":
             history[msg.server.id + msg.author.id] = (msg.server.id,
                                                       time.time(), msg.content)
-            with open('hist.json', 'w') as fp:
+            with open('./persist/hist.json', 'w') as fp:
                 json.dump(history, fp)
 
         # log user messages for markov chains, ignoring messages with certain substrings
         filters = ['`', 'http://', 'https://']
         if not any(x in msg.content for x in filters):
             try:
-                with open('./markovs/' + msg.server.id + '-' + msg.author.id,
+                with open('./persist/markovs/' + msg.server.id + '-' + msg.author.id,
                           'a') as fp:
                     fp.write('\n' + msg.content)
             except PermissionError:
diff --git a/commands.py b/commands.py
old mode 100755
new mode 100644
index 0600ff6..9daf0aa
--- a/commands.py
+++ b/commands.py
@@ -123,7 +123,7 @@ def cmd_markov(client, msg):
                 reponse = "I can't find `{}`".format(tmp)
 
     if target != "":
-        mfile = "./markovs/" + target
+        mfile = "./persist/markovs/" + target
         if os.path.isfile(mfile):
             mc = markov.Markov(open(mfile))
             response = mc.generate_text(random.randint(20, 40))
diff --git a/common.py b/common.py
old mode 100755
new mode 100644
index f0a7cbb..7d2b09e
--- a/common.py
+++ b/common.py
@@ -10,7 +10,7 @@ import os
 import json
 
 # bot version
-version = "v1.2.0"
+version = "v1.2.2"
 
 # TODO: generate this on the fly and make it look acceptable
 # text shown by .help command
diff --git a/helpers.py b/helpers.py
old mode 100755
new mode 100644
diff --git a/markovs/.gitignore b/persist/markovs/.gitignore
similarity index 100%
rename from markovs/.gitignore
rename to persist/markovs/.gitignore