From f405dbead3a25698b8615a3f374f697552e7c8fa Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 9 Oct 2020 10:13:16 +0100
Subject: [PATCH] Save newswire state at time of vote changes

---
 daemon.py     | 12 ++++++++++++
 newsdaemon.py |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/daemon.py b/daemon.py
index 68894c865..df0cd6016 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4721,6 +4721,12 @@ class PubServer(BaseHTTPRequestHandler):
                 if 'vote:' + nickname not in newswire[dateStr][2]:
                     newswire[dateStr][2].append('vote:' + nickname)
                     filename = newswire[dateStr][3]
+                    try:
+                        newswireStateFilename = \
+                            baseDir + '/accounts/.newswirestate.json'
+                        saveJson(newswire, newswireStateFilename)
+                    except Exception as e:
+                        print('ERROR saving newswire state, ' + str(e))
                     if filename:
                         saveJson(newswire[dateStr][2],
                                  filename + '.votes')
@@ -4762,6 +4768,12 @@ class PubServer(BaseHTTPRequestHandler):
                 if 'vote:' + nickname in newswire[dateStr][2]:
                     newswire[dateStr][2].remove('vote:' + nickname)
                     filename = newswire[dateStr][3]
+                    try:
+                        newswireStateFilename = \
+                            baseDir + '/accounts/.newswirestate.json'
+                        saveJson(newswire, newswireStateFilename)
+                    except Exception as e:
+                        print('ERROR saving newswire state, ' + str(e))
                     if filename:
                         saveJson(newswire[dateStr][2],
                                  filename + '.votes')
diff --git a/newsdaemon.py b/newsdaemon.py
index 4792732d4..47d4a24c9 100644
--- a/newsdaemon.py
+++ b/newsdaemon.py
@@ -146,7 +146,7 @@ def runNewswireDaemon(baseDir: str, httpd,
                       translate: {}) -> None:
     """Periodically updates RSS feeds
     """
-    newswireFilename = baseDir + '/accounts/.currentnewswire.json'
+    newswireStateFilename = baseDir + '/accounts/.newswirestate.json'
 
     # initial sleep to allow the system to start up
     time.sleep(50)
@@ -167,13 +167,13 @@ def runNewswireDaemon(baseDir: str, httpd,
             continue
 
         if not httpd.newswire:
-            if os.path.isfile(newswireFilename):
-                httpd.newswire = loadJson(newswireFilename)
+            if os.path.isfile(newswireStateFilename):
+                httpd.newswire = loadJson(newswireStateFilename)
 
         mergeWithPreviousNewswire(httpd.newswire, newNewswire)
 
         httpd.newswire = newNewswire
-        saveJson(httpd.newswire, newswireFilename)
+        saveJson(httpd.newswire, newswireStateFilename)
         print('Newswire updated')
 
         convertRSStoActivityPub(baseDir,