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

Return from key shortcuts to default timeline

merge-requests/30/head
Bob Mottram 2021-04-23 16:57:29 +01:00
parent 556885b8ba
commit 5a28cd303b
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
daemon.py
View File

@ -1807,11 +1807,13 @@ class PubServer(BaseHTTPRequestHandler):
baseDir: str, httpPrefix: str, nickname: str, baseDir: str, httpPrefix: str, nickname: str,
domain: str, domainFull: str, port: int, domain: str, domainFull: str, port: int,
onionDomain: str, i2pDomain: str, onionDomain: str, i2pDomain: str,
debug: bool, accessKeys: {}) -> None: debug: bool, accessKeys: {},
defaultTimeline: str) -> None:
"""Receive POST from webapp_accesskeys """Receive POST from webapp_accesskeys
""" """
usersPath = path.split('/changeAccessKeys')[0] usersPath = '/users/' + nickname
originPathStr = httpPrefix + '://' + domainFull + usersPath originPathStr = \
httpPrefix + '://' + domainFull + usersPath + '/' + defaultTimeline
length = int(self.headers['Content-length']) length = int(self.headers['Content-length'])
try: try:
@ -1835,15 +1837,17 @@ class PubServer(BaseHTTPRequestHandler):
return return
accessKeysParams = \ accessKeysParams = \
urllib.parse.unquote_plus(accessKeysParams) urllib.parse.unquote_plus(accessKeysParams)
print('accessKeysParams: ' + str(accessKeysParams))
# key shortcuts screen, back button # key shortcuts screen, back button
# See htmlAccessKeys # See htmlAccessKeys
if '&submitAccessKeysCancel=' in accessKeysParams or \ if 'submitAccessKeysCancel=' in accessKeysParams or \
'&submitAccessKeys=' not in accessKeysParams: 'submitAccessKeys=' not in accessKeysParams:
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
originPathStr = 'http://' + onionDomain + usersPath originPathStr = \
'http://' + onionDomain + usersPath + '/' + defaultTimeline
elif callingDomain.endswith('.i2p') and i2pDomain: elif callingDomain.endswith('.i2p') and i2pDomain:
originPathStr = 'http://' + i2pDomain + usersPath originPathStr = \
'http://' + i2pDomain + usersPath + '/' + defaultTimeline
self._redirect_headers(originPathStr, cookie, callingDomain) self._redirect_headers(originPathStr, cookie, callingDomain)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
@ -1860,7 +1864,6 @@ class PubServer(BaseHTTPRequestHandler):
if '&' in newKey: if '&' in newKey:
newKey = newKey.split('&')[0] newKey = newKey.split('&')[0]
if newKey: if newKey:
print('accessKeysParams newKey: ' + str(newKey))
if len(newKey) > 1: if len(newKey) > 1:
newKey = newKey[0] newKey = newKey[0]
if newKey != accessKeys[variableName]: if newKey != accessKeys[variableName]:
@ -1877,9 +1880,11 @@ class PubServer(BaseHTTPRequestHandler):
# redirect back from key shortcuts screen # redirect back from key shortcuts screen
if callingDomain.endswith('.onion') and onionDomain: if callingDomain.endswith('.onion') and onionDomain:
originPathStr = 'http://' + onionDomain + usersPath originPathStr = \
'http://' + onionDomain + usersPath + '/' + defaultTimeline
elif callingDomain.endswith('.i2p') and i2pDomain: elif callingDomain.endswith('.i2p') and i2pDomain:
originPathStr = 'http://' + i2pDomain + usersPath originPathStr = \
'http://' + i2pDomain + usersPath + '/' + defaultTimeline
self._redirect_headers(originPathStr, cookie, callingDomain) self._redirect_headers(originPathStr, cookie, callingDomain)
self.server.POSTbusy = False self.server.POSTbusy = False
return return
@ -14297,7 +14302,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.onionDomain, self.server.onionDomain,
self.server.i2pDomain, self.server.i2pDomain,
self.server.debug, self.server.debug,
accessKeys) accessKeys,
self.server.defaultTimeline)
return return
self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 14) self._benchmarkPOSTtimings(POSTstartTime, POSTtimings, 14)