main
Bob Mottram 2020-10-08 13:28:02 +01:00
parent 90283d5707
commit bbbf470149
2 changed files with 14 additions and 8 deletions

View File

@ -136,7 +136,7 @@ def inboxStorePostToHtmlCache(recentPostsCache: {}, maxRecentPosts: int,
pageNumber = -999 pageNumber = -999
avatarUrl = None avatarUrl = None
if boxname != 'tlevents' and boxname != 'outbox': if boxname != 'tlevents' and boxname != 'outbox':
boxName = 'inbox' boxname = 'inbox'
individualPostAsHtml(True, recentPostsCache, maxRecentPosts, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
getIconsDir(baseDir), translate, pageNumber, getIconsDir(baseDir), translate, pageNumber,
baseDir, session, cachedWebfingers, personCache, baseDir, session, cachedWebfingers, personCache,

View File

@ -11,10 +11,10 @@ import time
from collections import OrderedDict from collections import OrderedDict
from newswire import getDictFromNewswire from newswire import getDictFromNewswire
from posts import createNewsPost from posts import createNewsPost
from inbox import inboxStorePostToHtmlCache from inbox import individualPostAsHtml
from utils import saveJson from utils import saveJson
from utils import getStatusNumber from utils import getStatusNumber
from webinterface import getIconsDir
def updateFeedsIndex(baseDir: str, domain: str, postId: str) -> None: def updateFeedsIndex(baseDir: str, domain: str, postId: str) -> None:
"""Updates the index used for imported RSS feeds """Updates the index used for imported RSS feeds
@ -125,11 +125,17 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str,
if saveJson(blog, filename): if saveJson(blog, filename):
updateFeedsIndex(baseDir, domain, postId + '.json') updateFeedsIndex(baseDir, domain, postId + '.json')
# convert json to html # convert json to html
inboxStorePostToHtmlCache(recentPostsCache, maxRecentPosts, iconsDir = getIconsDir(baseDir)
translate, baseDir, httpPrefix, pageNumber = -999
session, cachedWebfingers, personCache, avatarUrl = None
'news', domain, port, individualPostAsHtml(True, recentPostsCache, maxRecentPosts,
blog, False, 'outbox') 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 newswire[originalDateStr][1] = '/@news/' + statusNumber