mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

News inbox

main
Bob Mottram 2020-10-07 20:04:15 +01:00
parent 5d53593c83
commit b42d7c14e4
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
daemon.py
View File

@ -120,6 +120,7 @@ from webinterface import htmlInboxDMs
from webinterface import htmlInboxReplies from webinterface import htmlInboxReplies
from webinterface import htmlInboxMedia from webinterface import htmlInboxMedia
from webinterface import htmlInboxBlogs from webinterface import htmlInboxBlogs
from webinterface import htmlInboxNews
from webinterface import htmlUnblockConfirm from webinterface import htmlUnblockConfirm
from webinterface import htmlPersonOptions from webinterface import htmlPersonOptions
from webinterface import htmlIndividualPost from webinterface import htmlIndividualPost
@ -6537,27 +6538,26 @@ class PubServer(BaseHTTPRequestHandler):
if '/' in currNickname: if '/' in currNickname:
currNickname = currNickname.split('/')[0] currNickname = currNickname.split('/')[0]
msg = \ msg = \
htmlInboxBlogs(self.server.defaultTimeline, htmlInboxNews(self.server.defaultTimeline,
self.server.recentPostsCache, self.server.recentPostsCache,
self.server.maxRecentPosts, self.server.maxRecentPosts,
self.server.translate, self.server.translate,
pageNumber, maxPostsInNewsFeed, pageNumber, maxPostsInNewsFeed,
self.server.session, self.server.session,
baseDir, baseDir,
self.server.cachedWebfingers, self.server.cachedWebfingers,
self.server.personCache, self.server.personCache,
nickname, nickname,
domain, domain,
port, port,
inboxNewsFeed, inboxNewsFeed,
self.server.allowDeletion, self.server.allowDeletion,
httpPrefix, httpPrefix,
self.server.projectVersion, self.server.projectVersion,
self._isMinimal(nickname), self._isMinimal(nickname),
self.server.YTReplacementDomain, self.server.YTReplacementDomain,
self.server.newswire) self.server.newswire)
msg = msg.replace('/news/', '/' + currNickname + '/') msg = msg.replace('/news/', '/' + currNickname + '/')
msg = msg.replace('tlblogs', 'tlnews')
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg), self._set_headers('text/html', len(msg),
cookie, callingDomain) cookie, callingDomain)

19
webinterface.py
View File

@ -6340,6 +6340,25 @@ def htmlInboxBlogs(defaultTimeline: str,
minimal, YTReplacementDomain, newswire) minimal, YTReplacementDomain, newswire)
def htmlInboxNews(defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int,
translate: {}, pageNumber: int, itemsPerPage: int,
session, baseDir: str, wfRequest: {}, personCache: {},
nickname: str, domain: str, port: int, inboxJson: {},
allowDeletion: bool,
httpPrefix: str, projectVersion: str,
minimal: bool, YTReplacementDomain: str,
newswire: {}) -> str:
"""Show the news timeline as html
"""
return htmlTimeline(defaultTimeline, recentPostsCache, maxRecentPosts,
translate, pageNumber,
itemsPerPage, session, baseDir, wfRequest, personCache,
nickname, domain, port, inboxJson, 'tlnews',
allowDeletion, httpPrefix, projectVersion, False,
minimal, YTReplacementDomain, newswire)
def htmlModeration(defaultTimeline: str, def htmlModeration(defaultTimeline: str,
recentPostsCache: {}, maxRecentPosts: int, recentPostsCache: {}, maxRecentPosts: int,
translate: {}, pageNumber: int, itemsPerPage: int, translate: {}, pageNumber: int, itemsPerPage: int,