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

Handle search path for following

master
Bob Mottram 2019-09-05 16:07:58 +01:00
parent 08314c0f76
commit 02ff3012c7
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
daemon.py
View File

@ -1841,13 +1841,16 @@ class PubServer(BaseHTTPRequestHandler):
authorized,followsPerPage) authorized,followsPerPage)
if following: if following:
if self._requestHTTP(): if self._requestHTTP():
if 'page=' not in self.path: if '?page=' not in 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)
getPerson = personLookup(self.server.domain,self.path.replace('/following',''), \ else:
searchPath=self.path.split('?page=')[0]
getPerson = personLookup(self.server.domain,searchPath.replace('/following',''), \
self.server.baseDir) self.server.baseDir)
if getPerson: if getPerson:
if not self.server.session: if not self.server.session:
@ -1882,13 +1885,16 @@ class PubServer(BaseHTTPRequestHandler):
authorized,followsPerPage,'followers') authorized,followsPerPage,'followers')
if followers: if followers:
if self._requestHTTP(): if self._requestHTTP():
if 'page=' not in self.path: if '?page=' not in self.path:
searchPath=self.path
# get a page of followers, not the summary # get a page of followers, not the summary
followers=getFollowingFeed(self.server.baseDir,self.server.domain, \ followers=getFollowingFeed(self.server.baseDir,self.server.domain, \
self.server.port,self.path+'?page=1', \ self.server.port,self.path+'?page=1', \
self.server.httpPrefix, \ self.server.httpPrefix, \
authorized,followsPerPage,'followers') authorized,followsPerPage,'followers')
getPerson = personLookup(self.server.domain,self.path.replace('/followers',''), \ else:
searchPath=self.path.split('?page=')[0]
getPerson = personLookup(self.server.domain,searchPath.replace('/followers',''), \
self.server.baseDir) self.server.baseDir)
if getPerson: if getPerson:
if not self.server.session: if not self.server.session: