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

Create replies timeline

main2
Bob Mottram 2019-09-23 22:02:06 +01:00
parent 6f07240c3e
commit c2ce6b4064
1 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
daemon.py
View File

@ -1783,48 +1783,49 @@ class PubServer(BaseHTTPRequestHandler):
self.server.httpPrefix, \ self.server.httpPrefix, \
maxPostsInFeed, 'tlreplies', \ maxPostsInFeed, 'tlreplies', \
True,self.server.ocapAlways) True,self.server.ocapAlways)
if inboxRepliesFeed: if not inboxRepliesFeed:
if self._requestHTTP(): inboxRepliesFeed=[]
nickname=self.path.replace('/users/','').replace('/tlreplies','') if self._requestHTTP():
pageNumber=1 nickname=self.path.replace('/users/','').replace('/tlreplies','')
if '?page=' in nickname: pageNumber=1
pageNumber=nickname.split('?page=')[1] if '?page=' in nickname:
nickname=nickname.split('?page=')[0] pageNumber=nickname.split('?page=')[1]
if pageNumber.isdigit(): nickname=nickname.split('?page=')[0]
pageNumber=int(pageNumber) if pageNumber.isdigit():
else: pageNumber=int(pageNumber)
pageNumber=1 else:
if 'page=' not in self.path: pageNumber=1
# if no page was specified then show the first if 'page=' not in self.path:
inboxRepliesFeed= \ # if no page was specified then show the first
personBoxJson(self.server.baseDir, \ inboxRepliesFeed= \
self.server.domain, \ personBoxJson(self.server.baseDir, \
self.server.port, \ self.server.domain, \
self.path+'?page=1', \ self.server.port, \
self.server.httpPrefix, \ self.path+'?page=1', \
maxPostsInFeed, 'tlreplies', \ self.server.httpPrefix, \
True,self.server.ocapAlways) maxPostsInFeed, 'tlreplies', \
msg=htmlInboxReplies(self.server.translate, \ True,self.server.ocapAlways)
pageNumber,maxPostsInFeed, \ msg=htmlInboxReplies(self.server.translate, \
self.server.session, \ pageNumber,maxPostsInFeed, \
self.server.baseDir, \ self.server.session, \
self.server.cachedWebfingers, \ self.server.baseDir, \
self.server.personCache, \ self.server.cachedWebfingers, \
nickname, \ self.server.personCache, \
self.server.domain, \ nickname, \
self.server.port, \ self.server.domain, \
inboxRepliesFeed, \ self.server.port, \
self.server.allowDeletion, \ inboxRepliesFeed, \
self.server.httpPrefix, \ self.server.allowDeletion, \
self.server.projectVersion).encode('utf-8') self.server.httpPrefix, \
self._set_headers('text/html',len(msg),cookie) self.server.projectVersion).encode('utf-8')
self.wfile.write(msg) self._set_headers('text/html',len(msg),cookie)
else: self.wfile.write(msg)
msg=json.dumps(inboxDMFeed).encode('utf-8') else:
self._set_headers('application/json',len(msg),None) msg=json.dumps(inboxRepliesFeed).encode('utf-8')
self.wfile.write(msg) self._set_headers('application/json',len(msg),None)
self.server.GETbusy=False self.wfile.write(msg)
return self.server.GETbusy=False
return
else: else:
if self.server.debug: if self.server.debug:
nickname=self.path.replace('/users/','').replace('/tlreplies','') nickname=self.path.replace('/users/','').replace('/tlreplies','')