forked from indymedia/epicyon
More inbox arguments
parent
fcf36cdac2
commit
b65cee7f9f
57
daemon.py
57
daemon.py
|
@ -5463,14 +5463,24 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
onionDomain: str, i2pDomain: str,
|
onionDomain: str, i2pDomain: str,
|
||||||
GETstartTime, GETtimings: {},
|
GETstartTime, GETtimings: {},
|
||||||
proxyType: str, cookie: str,
|
proxyType: str, cookie: str,
|
||||||
debug: str) -> bool:
|
debug: str,
|
||||||
|
recentPostsCache: {}, session,
|
||||||
|
ocapAlways: bool,
|
||||||
|
defaultTimeline: str,
|
||||||
|
maxRecentPosts: int,
|
||||||
|
translate: {},
|
||||||
|
cachedWebfingers: {},
|
||||||
|
personCache: {},
|
||||||
|
allowDeletion: bool,
|
||||||
|
projectVersion: str,
|
||||||
|
YTReplacementDomain: str) -> bool:
|
||||||
"""Shows the inbox timeline
|
"""Shows the inbox timeline
|
||||||
"""
|
"""
|
||||||
if '/users/' in path:
|
if '/users/' in path:
|
||||||
if authorized:
|
if authorized:
|
||||||
inboxFeed = \
|
inboxFeed = \
|
||||||
personBoxJson(self.server.recentPostsCache,
|
personBoxJson(recentPostsCache,
|
||||||
self.server.session,
|
session,
|
||||||
baseDir,
|
baseDir,
|
||||||
domain,
|
domain,
|
||||||
port,
|
port,
|
||||||
|
@ -5478,7 +5488,7 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
httpPrefix,
|
httpPrefix,
|
||||||
maxPostsInFeed, 'inbox',
|
maxPostsInFeed, 'inbox',
|
||||||
authorized,
|
authorized,
|
||||||
self.server.ocapAlways)
|
ocapAlways)
|
||||||
if inboxFeed:
|
if inboxFeed:
|
||||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||||
'show status done',
|
'show status done',
|
||||||
|
@ -5497,8 +5507,8 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
if 'page=' not in path:
|
if 'page=' not in path:
|
||||||
# if no page was specified then show the first
|
# if no page was specified then show the first
|
||||||
inboxFeed = \
|
inboxFeed = \
|
||||||
personBoxJson(self.server.recentPostsCache,
|
personBoxJson(recentPostsCache,
|
||||||
self.server.session,
|
session,
|
||||||
baseDir,
|
baseDir,
|
||||||
domain,
|
domain,
|
||||||
port,
|
port,
|
||||||
|
@ -5506,29 +5516,29 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
httpPrefix,
|
httpPrefix,
|
||||||
maxPostsInFeed, 'inbox',
|
maxPostsInFeed, 'inbox',
|
||||||
authorized,
|
authorized,
|
||||||
self.server.ocapAlways)
|
ocapAlways)
|
||||||
self._benchmarkGETtimings(GETstartTime,
|
self._benchmarkGETtimings(GETstartTime,
|
||||||
GETtimings,
|
GETtimings,
|
||||||
'show status done',
|
'show status done',
|
||||||
'show inbox page')
|
'show inbox page')
|
||||||
msg = htmlInbox(self.server.defaultTimeline,
|
msg = htmlInbox(defaultTimeline,
|
||||||
self.server.recentPostsCache,
|
recentPostsCache,
|
||||||
self.server.maxRecentPosts,
|
maxRecentPosts,
|
||||||
self.server.translate,
|
translate,
|
||||||
pageNumber, maxPostsInFeed,
|
pageNumber, maxPostsInFeed,
|
||||||
self.server.session,
|
session,
|
||||||
baseDir,
|
baseDir,
|
||||||
self.server.cachedWebfingers,
|
cachedWebfingers,
|
||||||
self.server.personCache,
|
personCache,
|
||||||
nickname,
|
nickname,
|
||||||
domain,
|
domain,
|
||||||
port,
|
port,
|
||||||
inboxFeed,
|
inboxFeed,
|
||||||
self.server.allowDeletion,
|
allowDeletion,
|
||||||
httpPrefix,
|
httpPrefix,
|
||||||
self.server.projectVersion,
|
projectVersion,
|
||||||
self._isMinimal(nickname),
|
self._isMinimal(nickname),
|
||||||
self.server.YTReplacementDomain)
|
YTReplacementDomain)
|
||||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||||
'show status done',
|
'show status done',
|
||||||
'show inbox html')
|
'show inbox html')
|
||||||
|
@ -8428,7 +8438,18 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
self.server.i2pDomain,
|
self.server.i2pDomain,
|
||||||
GETstartTime, GETtimings,
|
GETstartTime, GETtimings,
|
||||||
self.server.proxyType,
|
self.server.proxyType,
|
||||||
cookie, self.server.debug):
|
cookie, self.server.debug,
|
||||||
|
self.server.recentPostsCache,
|
||||||
|
self.server.session,
|
||||||
|
self.server.ocapAlways,
|
||||||
|
self.server.defaultTimeline,
|
||||||
|
self.server.maxRecentPosts,
|
||||||
|
self.server.translate,
|
||||||
|
self.server.cachedWebfingers,
|
||||||
|
self.server.personCache,
|
||||||
|
self.server.allowDeletion,
|
||||||
|
self.server.projectVersion,
|
||||||
|
self.server.YTReplacementDomain):
|
||||||
return
|
return
|
||||||
|
|
||||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||||
|
|
Loading…
Reference in New Issue