From ea85cf4a9ed4a1bccc064002cf446160f88f379c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 11 Oct 2020 12:07:15 +0100
Subject: [PATCH] Return to news timeline

---
 daemon.py       | 8 +++++---
 webinterface.py | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/daemon.py b/daemon.py
index b7753c94..f72146a5 100644
--- a/daemon.py
+++ b/daemon.py
@@ -2966,7 +2966,8 @@ class PubServer(BaseHTTPRequestHandler):
                     print('WARN: nickname not found in ' + actorStr)
                 else:
                     print('WARN: nickname is not an editor' + actorStr)
-                self._redirect_headers(actorStr, cookie, callingDomain)
+                self._redirect_headers(actorStr + '/tlnews',
+                                       cookie, callingDomain)
                 self.server.POSTbusy = False
                 return
 
@@ -2983,7 +2984,8 @@ class PubServer(BaseHTTPRequestHandler):
                     actorStr = \
                         'http://' + i2pDomain + usersPath
                 print('Maximum news data length exceeded ' + str(length))
-                self._redirect_headers(actorStr, cookie, callingDomain)
+                self._redirect_headers(actorStr + 'tlnews',
+                                       cookie, callingDomain)
                 self.server.POSTbusy = False
                 return
 
@@ -3075,7 +3077,7 @@ class PubServer(BaseHTTPRequestHandler):
               i2pDomain):
             actorStr = \
                 'http://' + i2pDomain + usersPath
-        self._redirect_headers(actorStr + '/' + defaultTimeline,
+        self._redirect_headers(actorStr + '/tlnews',
                                cookie, callingDomain)
         self.server.POSTbusy = False
 
diff --git a/webinterface.py b/webinterface.py
index a4cd15f0..d0389ddf 100644
--- a/webinterface.py
+++ b/webinterface.py
@@ -1399,7 +1399,7 @@ def htmlEditNewsPost(translate: {}, baseDir: str, path: str,
     editNewsPostForm += \
         '    <div class="container">\n'
     editNewsPostForm += \
-        '      <a href="' + pathOriginal + '"><button class="cancelbtn">' + \
+        '      <a href="' + pathOriginal + '/tlnews"><button class="cancelbtn">' + \
         translate['Go Back'] + '</button></a>\n'
     editNewsPostForm += \
         '      <input type="submit" name="submitEditedNewsPost" value="' + \