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

Reduce indentation

main
Bob Mottram 2019-11-17 17:20:08 +00:00
parent ee5682a728
commit 5e7dc8dc50
1 changed files with 70 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
daemon.py
View File

@ -2344,7 +2344,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -2365,7 +2366,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -2416,7 +2418,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -2437,7 +2440,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -2745,7 +2749,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir,self.server.domain, \ self.server.baseDir,self.server.domain, \
self.server.port,self.path, \ self.server.port,self.path, \
self.server.httpPrefix, \ self.server.httpPrefix, \
@ -2766,7 +2771,8 @@ 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= \
personBoxJson(self.server.session, \
self.server.baseDir, \ self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port, \ self.server.port, \
@ -2876,7 +2882,8 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkGETtimings(GETstartTime,GETtimings,49) self._benchmarkGETtimings(GETstartTime,GETtimings,49)
shares=getSharesFeedForPerson(self.server.baseDir, \ shares= \
getSharesFeedForPerson(self.server.baseDir, \
self.server.domain, \ self.server.domain, \
self.server.port,self.path, \ self.server.port,self.path, \
self.server.httpPrefix, \ self.server.httpPrefix, \
@ -2947,7 +2954,8 @@ 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= \
getFollowingFeed(self.server.baseDir,self.server.domain, \
self.server.port,self.path+'?page=true', \ self.server.port,self.path+'?page=true', \
self.server.httpPrefix, \ self.server.httpPrefix, \
authorized,followsPerPage) authorized,followsPerPage)
@ -2993,7 +3001,8 @@ class PubServer(BaseHTTPRequestHandler):
self._benchmarkGETtimings(GETstartTime,GETtimings,51) self._benchmarkGETtimings(GETstartTime,GETtimings,51)
followers=getFollowingFeed(self.server.baseDir,self.server.domain, \ followers= \
getFollowingFeed(self.server.baseDir,self.server.domain, \
self.server.port,self.path, \ self.server.port,self.path, \
self.server.httpPrefix, \ self.server.httpPrefix, \
authorized,followsPerPage,'followers') authorized,followsPerPage,'followers')