forked from indymedia/epicyon
Reduce indentation
parent
ee5682a728
commit
5e7dc8dc50
131
daemon.py
131
daemon.py
|
|
@ -2344,14 +2344,15 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
if self.path.endswith('/inbox') or '/inbox?page=' in self.path:
|
if self.path.endswith('/inbox') or '/inbox?page=' in self.path:
|
||||||
if '/users/' in self.path:
|
if '/users/' in self.path:
|
||||||
if authorized:
|
if authorized:
|
||||||
inboxFeed=personBoxJson(self.server.session, \
|
inboxFeed= \
|
||||||
self.server.baseDir, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.domain, \
|
self.server.baseDir, \
|
||||||
self.server.port, \
|
self.server.domain, \
|
||||||
self.path, \
|
self.server.port, \
|
||||||
self.server.httpPrefix, \
|
self.path, \
|
||||||
maxPostsInFeed, 'inbox', \
|
self.server.httpPrefix, \
|
||||||
authorized,self.server.ocapAlways)
|
maxPostsInFeed, 'inbox', \
|
||||||
|
authorized,self.server.ocapAlways)
|
||||||
if inboxFeed:
|
if inboxFeed:
|
||||||
if self._requestHTTP():
|
if self._requestHTTP():
|
||||||
nickname=self.path.replace('/users/','').replace('/inbox','')
|
nickname=self.path.replace('/users/','').replace('/inbox','')
|
||||||
|
|
@ -2365,14 +2366,15 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
pageNumber=1
|
pageNumber=1
|
||||||
if 'page=' not in self.path:
|
if 'page=' not in self.path:
|
||||||
# if no page was specified then show the first
|
# if no page was specified then show the first
|
||||||
inboxFeed=personBoxJson(self.server.session, \
|
inboxFeed= \
|
||||||
self.server.baseDir, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.domain, \
|
self.server.baseDir, \
|
||||||
self.server.port, \
|
self.server.domain, \
|
||||||
self.path+'?page=1', \
|
self.server.port, \
|
||||||
self.server.httpPrefix, \
|
self.path+'?page=1', \
|
||||||
maxPostsInFeed, 'inbox', \
|
self.server.httpPrefix, \
|
||||||
authorized,self.server.ocapAlways)
|
maxPostsInFeed, 'inbox', \
|
||||||
|
authorized,self.server.ocapAlways)
|
||||||
msg=htmlInbox(self.server.translate, \
|
msg=htmlInbox(self.server.translate, \
|
||||||
pageNumber,maxPostsInFeed, \
|
pageNumber,maxPostsInFeed, \
|
||||||
self.server.session, \
|
self.server.session, \
|
||||||
|
|
@ -2416,14 +2418,15 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
if self.path.endswith('/dm') or '/dm?page=' in self.path:
|
if self.path.endswith('/dm') or '/dm?page=' in self.path:
|
||||||
if '/users/' in self.path:
|
if '/users/' in self.path:
|
||||||
if authorized:
|
if authorized:
|
||||||
inboxDMFeed=personBoxJson(self.server.session, \
|
inboxDMFeed= \
|
||||||
self.server.baseDir, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.domain, \
|
self.server.baseDir, \
|
||||||
self.server.port, \
|
self.server.domain, \
|
||||||
self.path, \
|
self.server.port, \
|
||||||
self.server.httpPrefix, \
|
self.path, \
|
||||||
maxPostsInFeed, 'dm', \
|
self.server.httpPrefix, \
|
||||||
authorized,self.server.ocapAlways)
|
maxPostsInFeed, 'dm', \
|
||||||
|
authorized,self.server.ocapAlways)
|
||||||
if inboxDMFeed:
|
if inboxDMFeed:
|
||||||
if self._requestHTTP():
|
if self._requestHTTP():
|
||||||
nickname=self.path.replace('/users/','').replace('/dm','')
|
nickname=self.path.replace('/users/','').replace('/dm','')
|
||||||
|
|
@ -2437,14 +2440,15 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
pageNumber=1
|
pageNumber=1
|
||||||
if 'page=' not in self.path:
|
if 'page=' not in self.path:
|
||||||
# if no page was specified then show the first
|
# if no page was specified then show the first
|
||||||
inboxDMFeed=personBoxJson(self.server.session, \
|
inboxDMFeed= \
|
||||||
self.server.baseDir, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.domain, \
|
self.server.baseDir, \
|
||||||
self.server.port, \
|
self.server.domain, \
|
||||||
self.path+'?page=1', \
|
self.server.port, \
|
||||||
self.server.httpPrefix, \
|
self.path+'?page=1', \
|
||||||
maxPostsInFeed, 'dm', \
|
self.server.httpPrefix, \
|
||||||
authorized,self.server.ocapAlways)
|
maxPostsInFeed, 'dm', \
|
||||||
|
authorized,self.server.ocapAlways)
|
||||||
msg=htmlInboxDMs(self.server.translate, \
|
msg=htmlInboxDMs(self.server.translate, \
|
||||||
pageNumber,maxPostsInFeed, \
|
pageNumber,maxPostsInFeed, \
|
||||||
self.server.session, \
|
self.server.session, \
|
||||||
|
|
@ -2745,13 +2749,14 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
self._benchmarkGETtimings(GETstartTime,GETtimings,47)
|
self._benchmarkGETtimings(GETstartTime,GETtimings,47)
|
||||||
|
|
||||||
# get outbox feed for a person
|
# get outbox feed for a person
|
||||||
outboxFeed=personBoxJson(self.server.session, \
|
outboxFeed= \
|
||||||
self.server.baseDir,self.server.domain, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.port,self.path, \
|
self.server.baseDir,self.server.domain, \
|
||||||
self.server.httpPrefix, \
|
self.server.port,self.path, \
|
||||||
maxPostsInFeed, 'outbox', \
|
self.server.httpPrefix, \
|
||||||
authorized, \
|
maxPostsInFeed, 'outbox', \
|
||||||
self.server.ocapAlways)
|
authorized, \
|
||||||
|
self.server.ocapAlways)
|
||||||
if outboxFeed:
|
if outboxFeed:
|
||||||
if self._requestHTTP():
|
if self._requestHTTP():
|
||||||
nickname= \
|
nickname= \
|
||||||
|
|
@ -2766,15 +2771,16 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
pageNumber=1
|
pageNumber=1
|
||||||
if 'page=' not in self.path:
|
if 'page=' not in self.path:
|
||||||
# if a page wasn't specified then show the first one
|
# if a page wasn't specified then show the first one
|
||||||
outboxFeed=personBoxJson(self.server.session, \
|
outboxFeed= \
|
||||||
self.server.baseDir, \
|
personBoxJson(self.server.session, \
|
||||||
self.server.domain, \
|
self.server.baseDir, \
|
||||||
self.server.port, \
|
self.server.domain, \
|
||||||
self.path+'?page=1', \
|
self.server.port, \
|
||||||
self.server.httpPrefix, \
|
self.path+'?page=1', \
|
||||||
maxPostsInFeed, 'outbox', \
|
self.server.httpPrefix, \
|
||||||
authorized, \
|
maxPostsInFeed, 'outbox', \
|
||||||
self.server.ocapAlways)
|
authorized, \
|
||||||
|
self.server.ocapAlways)
|
||||||
msg=htmlOutbox(self.server.translate, \
|
msg=htmlOutbox(self.server.translate, \
|
||||||
pageNumber,maxPostsInFeed, \
|
pageNumber,maxPostsInFeed, \
|
||||||
self.server.session, \
|
self.server.session, \
|
||||||
|
|
@ -2876,11 +2882,12 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
|
|
||||||
self._benchmarkGETtimings(GETstartTime,GETtimings,49)
|
self._benchmarkGETtimings(GETstartTime,GETtimings,49)
|
||||||
|
|
||||||
shares=getSharesFeedForPerson(self.server.baseDir, \
|
shares= \
|
||||||
self.server.domain, \
|
getSharesFeedForPerson(self.server.baseDir, \
|
||||||
self.server.port,self.path, \
|
self.server.domain, \
|
||||||
self.server.httpPrefix, \
|
self.server.port,self.path, \
|
||||||
sharesPerPage)
|
self.server.httpPrefix, \
|
||||||
|
sharesPerPage)
|
||||||
if shares:
|
if shares:
|
||||||
if self._requestHTTP():
|
if self._requestHTTP():
|
||||||
pageNumber=1
|
pageNumber=1
|
||||||
|
|
@ -2947,10 +2954,11 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
if '?page=' not in self.path:
|
if '?page=' not in self.path:
|
||||||
searchPath=self.path
|
searchPath=self.path
|
||||||
# get a page of following, not the summary
|
# get a page of following, not the summary
|
||||||
following=getFollowingFeed(self.server.baseDir,self.server.domain, \
|
following= \
|
||||||
self.server.port,self.path+'?page=true', \
|
getFollowingFeed(self.server.baseDir,self.server.domain, \
|
||||||
self.server.httpPrefix, \
|
self.server.port,self.path+'?page=true', \
|
||||||
authorized,followsPerPage)
|
self.server.httpPrefix, \
|
||||||
|
authorized,followsPerPage)
|
||||||
else:
|
else:
|
||||||
pageNumberStr=self.path.split('?page=')[1]
|
pageNumberStr=self.path.split('?page=')[1]
|
||||||
if pageNumberStr.isdigit():
|
if pageNumberStr.isdigit():
|
||||||
|
|
@ -2993,10 +3001,11 @@ class PubServer(BaseHTTPRequestHandler):
|
||||||
|
|
||||||
self._benchmarkGETtimings(GETstartTime,GETtimings,51)
|
self._benchmarkGETtimings(GETstartTime,GETtimings,51)
|
||||||
|
|
||||||
followers=getFollowingFeed(self.server.baseDir,self.server.domain, \
|
followers= \
|
||||||
self.server.port,self.path, \
|
getFollowingFeed(self.server.baseDir,self.server.domain, \
|
||||||
self.server.httpPrefix, \
|
self.server.port,self.path, \
|
||||||
authorized,followsPerPage,'followers')
|
self.server.httpPrefix, \
|
||||||
|
authorized,followsPerPage,'followers')
|
||||||
if followers:
|
if followers:
|
||||||
if self._requestHTTP():
|
if self._requestHTTP():
|
||||||
pageNumber=1
|
pageNumber=1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue