indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Move shares timeline to its own method

merge-requests/8/head
Bob Mottram 2020-09-01 15:06:15 +01:00
parent c0f2d3de90
commit ae1b9c63be
1 changed files with 70 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
daemon.py
View File

@ -5858,6 +5858,63 @@ class PubServer(BaseHTTPRequestHandler):
return True return True
return False return False
def _showSharesTimeline(self, authorized: bool,
callingDomain: str, path: str,
baseDir: str, httpPrefix: str,
domain: str, domainFull: str, port: int,
onionDomain: str, i2pDomain: str,
GETstartTime, GETtimings: {},
proxyType: str, cookie: str,
debug: str) -> bool:
"""Shows the shares timeline
"""
if '/users/' in path:
if authorized:
if self._requestHTTP():
nickname = path.replace('/users/', '')
nickname = nickname.replace('/tlshares', '')
pageNumber = 1
if '?page=' in nickname:
pageNumber = nickname.split('?page=')[1]
nickname = nickname.split('?page=')[0]
if pageNumber.isdigit():
pageNumber = int(pageNumber)
else:
pageNumber = 1
msg = \
htmlShares(self.server.defaultTimeline,
self.server.recentPostsCache,
self.server.maxRecentPosts,
self.server.translate,
pageNumber, maxPostsInFeed,
self.server.session,
baseDir,
self.server.cachedWebfingers,
self.server.personCache,
nickname,
domain,
port,
self.server.allowDeletion,
httpPrefix,
self.server.projectVersion,
self.server.YTReplacementDomain)
msg = msg.encode('utf-8')
self._set_headers('text/html', len(msg),
cookie, callingDomain)
self._write(msg)
self._benchmarkGETtimings(GETstartTime, GETtimings,
'show blogs 2 done',
'show shares 2')
self.server.GETbusy = False
return True
# not the shares timeline
if debug:
print('DEBUG: GET access to shares timeline is unauthorized')
self.send_response(405)
self.end_headers()
self.server.GETbusy = False
return True
def do_GET(self): def do_GET(self):
callingDomain = self.server.domainFull callingDomain = self.server.domainFull
if self.headers.get('Host'): if self.headers.get('Host'):
@ -7737,53 +7794,19 @@ class PubServer(BaseHTTPRequestHandler):
# get the shared items timeline for a given person # get the shared items timeline for a given person
if self.path.endswith('/tlshares') or '/tlshares?page=' in self.path: if self.path.endswith('/tlshares') or '/tlshares?page=' in self.path:
if '/users/' in self.path: if self._showSharesTimeline(authorized,
if authorized: callingDomain, self.path,
if self._requestHTTP(): self.server.baseDir,
nickname = self.path.replace('/users/', '') self.server.httpPrefix,
nickname = nickname.replace('/tlshares', '') self.server.domain,
pageNumber = 1 self.server.domainFull,
if '?page=' in nickname: self.server.port,
pageNumber = nickname.split('?page=')[1] self.server.onionDomain,
nickname = nickname.split('?page=')[0] self.server.i2pDomain,
if pageNumber.isdigit(): GETstartTime, GETtimings,
pageNumber = int(pageNumber) self.server.proxyType,
else: cookie, self.server.debug):
pageNumber = 1 return
msg = \
htmlShares(self.server.defaultTimeline,
self.server.recentPostsCache,
self.server.maxRecentPosts,
self.server.translate,
pageNumber, maxPostsInFeed,
self.server.session,
self.server.baseDir,
self.server.cachedWebfingers,
self.server.personCache,
nickname,
self.server.domain,
self.server.port,
self.server.allowDeletion,
self.server.httpPrefix,
self.server.projectVersion,
self.server.YTReplacementDomain)
msg = msg.encode('utf-8')
self._set_headers('text/html',
len(msg),
cookie, callingDomain)
self._write(msg)
self._benchmarkGETtimings(GETstartTime, GETtimings,
'show blogs 2 done',
'show shares 2')
self.server.GETbusy = False
return
# not the shares timeline
if self.server.debug:
print('DEBUG: GET access to shares timeline is unauthorized')
self.send_response(405)
self.end_headers()
self.server.GETbusy = False
return
self._benchmarkGETtimings(GETstartTime, GETtimings, self._benchmarkGETtimings(GETstartTime, GETtimings,
'show blogs 2 done', 'show blogs 2 done',