diff --git a/newsdaemon.py b/newsdaemon.py index ca466a48..3d2fbbe0 100644 --- a/newsdaemon.py +++ b/newsdaemon.py @@ -73,11 +73,12 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str, if os.path.isfile(filename): # if a local post exists as html then change the link # to the local one - htmlFilename = \ - baseDir + '/accounts/news@' + domain + \ - '/postcache/' + newPostId.replace('/', '#') + '.html' - if os.path.isfile(htmlFilename): - newswire[originalDateStr][1] = '/@news/' + statusNumber + #htmlFilename = \ + # baseDir + '/accounts/news@' + domain + \ + # '/postcache/' + newPostId.replace('/', '#') + '.html' + #if os.path.isfile(htmlFilename): + newswire[originalDateStr][1] = \ + '/users/news/statuses/' + statusNumber # don't create the post if it already exists continue @@ -128,16 +129,16 @@ def convertRSStoActivityPub(baseDir: str, httpPrefix: str, # convert json to html 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 + #individualPostAsHtml(True, recentPostsCache, maxRecentPosts, + # iconsDir, translate, pageNumber, + # baseDir, session, cachedWebfingers, + # personCache, + # 'news', domain, port, blog, + # None, True, False, + # httpPrefix, __version__, 'outbox', + # True, True, True, False, True) + newswire[originalDateStr][1] = \ + '/users/news/statuses/' + statusNumber def runNewswireDaemon(baseDir: str, httpd,