From bbbf470149740739b194ea18a98c5c95cfea2f14 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 8 Oct 2020 13:28:02 +0100
Subject: [PATCH] Boxname

---
 inbox.py      |  2 +-
 newsdaemon.py | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/inbox.py b/inbox.py
index c7309a7d..45478e77 100644
--- a/inbox.py
+++ b/inbox.py
@@ -136,7 +136,7 @@ def inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
     pageNumber = -999
     avatarUrl = None
     if boxname != 'tlevents' and boxname != 'outbox':
-        boxName = 'inbox'
+        boxname = 'inbox'
     individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
                          getIconsDir(baseDir), translate, pageNumber,
                          baseDir, session, cachedWebfingers, personCache,
diff --git a/newsdaemon.py b/newsdaemon.py
index 02d2d68f..2b5535fb 100644
--- a/newsdaemon.py
+++ b/newsdaemon.py
@@ -11,10 +11,10 @@ import time
 from collections import OrderedDict
 from newswire import getDictFromNewswire
 from posts import createNewsPost
-from inbox import inboxStorePostToHtmlCache
+from inbox import individualPostAsHtml
 from utils import saveJson
 from utils import getStatusNumber
-
+from webinterface import getIconsDir
 
 def updateFeedsIndex(baseDir: str, domain: str, postId: str) -> None:
     """Updates the index used for imported RSS feeds
@@ -125,11 +125,17 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str,
         if saveJson(blog, filename):
             updateFeedsIndex(baseDir, domain, postId + '.json')
             # convert json to html
-            inboxStorePostToHtmlCache(recentPostsCache, maxRecentPosts,
-                                      translate, baseDir, httpPrefix,
-                                      session, cachedWebfingers, personCache,
-                                      'news', domain, port,
-                                      blog, False, 'outbox')
+            iconsDir = getIconsDir(baseDir)
+            pageNumber = -999
+            avatarUrl = None
+            individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
+                                 iconsDir, translate, pageNumber,
+                                 baseDir, session, cachedWebfingers,
+                                 personCache,
+                                 'news', domain, port, blog,
+                                 avatarUrl, True, False,
+                                 httpPrefix, __version__, 'outbox',
+                                 True, True, True, False, True)
             newswire[originalDateStr][1] = '/@news/' + statusNumber