From ae8c7c6e309e43b236e7ad648be698facfaaf7d3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 7 Oct 2020 19:05:08 +0100
Subject: [PATCH] Create news timeline

---
 daemon.py | 12 ++++--------
 posts.py  |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/daemon.py b/daemon.py
index 075e9d44a..a2eea4fd1 100644
--- a/daemon.py
+++ b/daemon.py
@@ -6499,19 +6499,15 @@ class PubServer(BaseHTTPRequestHandler):
         """
         if '/users/' in path:
             if authorized:
-                currNickname = path.split('/users/')[1]
-                if '/' in currNickname:
-                    currNickname = currNickname.split('/')[0]
-                newsPath = path.replace('/' + currNickname + '/', '/news/')
                 inboxNewsFeed = \
                     personBoxJson(self.server.recentPostsCache,
                                   self.server.session,
                                   baseDir,
                                   domain,
                                   port,
-                                  newsPath,
+                                  path,
                                   httpPrefix,
-                                  maxPostsInNewsFeed, 'outbox',
+                                  maxPostsInNewsFeed, 'tlnews',
                                   True)
                 if not inboxNewsFeed:
                     inboxNewsFeed = []
@@ -6533,9 +6529,9 @@ class PubServer(BaseHTTPRequestHandler):
                                           baseDir,
                                           domain,
                                           port,
-                                          newsPath + '?page=1',
+                                          path + '?page=1',
                                           httpPrefix,
-                                          maxPostsInBlogsFeed, 'outbox',
+                                          maxPostsInBlogsFeed, 'tlnews',
                                           True)
                     msg = \
                         htmlInboxBlogs(self.server.defaultTimeline,
diff --git a/posts.py b/posts.py
index 739f565ce..a5331e83f 100644
--- a/posts.py
+++ b/posts.py
@@ -2509,7 +2509,7 @@ def createMediaTimeline(session, baseDir: str, nickname: str, domain: str,
 def createNewsTimeline(session, baseDir: str, nickname: str, domain: str,
                        port: int, httpPrefix: str, itemsPerPage: int,
                        headerOnly: bool, pageNumber=None) -> {}:
-    return createBoxIndexed({}, session, baseDir, 'tlnews', nickname,
+    return createBoxIndexed({}, session, baseDir, 'outbox', 'news',
                             domain, port, httpPrefix,
                             itemsPerPage, headerOnly, True,
                             pageNumber)