forked from indymedia/epicyon
Redirect to the inbox
parent
f20c7a841d
commit
963aeb41a9
205
daemon.py
205
daemon.py
|
|
@ -5594,6 +5594,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
maxPostsInFeed, 'inbox',
|
||||
authorized)
|
||||
if inboxFeed:
|
||||
if GETstartTime:
|
||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||
'show status done',
|
||||
'show inbox json')
|
||||
|
|
@ -5620,6 +5621,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
httpPrefix,
|
||||
maxPostsInFeed, 'inbox',
|
||||
authorized)
|
||||
if GETstartTime:
|
||||
self._benchmarkGETtimings(GETstartTime,
|
||||
GETtimings,
|
||||
'show status done',
|
||||
|
|
@ -5642,6 +5644,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
projectVersion,
|
||||
self._isMinimal(nickname),
|
||||
YTReplacementDomain)
|
||||
if GETstartTime:
|
||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||
'show status done',
|
||||
'show inbox html')
|
||||
|
|
@ -5649,6 +5652,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self._set_headers('text/html', len(msg),
|
||||
cookie, callingDomain)
|
||||
self._write(msg)
|
||||
if GETstartTime:
|
||||
self._benchmarkGETtimings(GETstartTime, GETtimings,
|
||||
'show status done',
|
||||
'show inbox')
|
||||
|
|
@ -9116,29 +9120,61 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self._set_headers_head(mediaFileType, fileLength,
|
||||
etag, callingDomain)
|
||||
|
||||
def _redirectAfterPost(self, boxName: str, path: str,
|
||||
def _showSendingScreen(self, authorized: bool, callingDomain: str) -> None:
|
||||
"""Shows a 'sending post' wait screen
|
||||
"""
|
||||
if self.server.defaultTimeline != 'inbox':
|
||||
return
|
||||
# make a copy of the headers
|
||||
currHeaders = self.headers.items()
|
||||
|
||||
# show a sending post screen
|
||||
msg = \
|
||||
htmlSendingPost(self.server.baseDir,
|
||||
self.server.translate).encode('utf-8')
|
||||
self._login_headers('text/html', len(msg), callingDomain)
|
||||
self._write(msg)
|
||||
|
||||
# restore headers
|
||||
for headerField in currHeaders:
|
||||
fieldName = headerField[0]
|
||||
fieldValue = headerField[1]
|
||||
self.headers[fieldName] = fieldValue
|
||||
|
||||
def _clearSendingScreen(self, authorized: bool,
|
||||
boxName: str, path: str,
|
||||
callingDomain: str, cookie: str) -> None:
|
||||
"""Redirects to the given box
|
||||
"""
|
||||
if '/users/' not in path:
|
||||
if boxName != 'inbox':
|
||||
return
|
||||
nickname = path.split('/users/')[1]
|
||||
if '/' in nickname:
|
||||
nickname = nickname.split('/')[0]
|
||||
usersPath = '/users/' + nickname
|
||||
actorStr = self.server.httpPrefix + '://' + self.server.domainFull + \
|
||||
path.split('/users/')[0] + usersPath
|
||||
if callingDomain.endswith('.onion') and self.server.onionDomain:
|
||||
actorStr = 'http://' + self.server.onionDomain + usersPath
|
||||
elif (callingDomain.endswith('.i2p') and self.server.i2pDomain):
|
||||
actorStr = 'http://' + self.server.i2pDomain + usersPath
|
||||
print('Redirecting to: ' + actorStr + '/' + boxName)
|
||||
self._redirect_headers(actorStr + '/' + boxName,
|
||||
cookie, callingDomain)
|
||||
self._showInbox(authorized,
|
||||
callingDomain, self.path,
|
||||
self.server.baseDir,
|
||||
self.server.httpPrefix,
|
||||
self.server.domain,
|
||||
self.server.domainFull,
|
||||
self.server.port,
|
||||
self.server.onionDomain,
|
||||
self.server.i2pDomain,
|
||||
None, None,
|
||||
self.server.proxyType,
|
||||
cookie, self.server.debug,
|
||||
self.server.recentPostsCache,
|
||||
self.server.session,
|
||||
self.server.defaultTimeline,
|
||||
self.server.maxRecentPosts,
|
||||
self.server.translate,
|
||||
self.server.cachedWebfingers,
|
||||
self.server.personCache,
|
||||
self.server.allowDeletion,
|
||||
self.server.projectVersion,
|
||||
self.server.YTReplacementDomain)
|
||||
|
||||
def _receiveNewPostProcess(self, postType: str, path: str, headers: {},
|
||||
length: int, postBytes, boundary: str,
|
||||
callingDomain: str, cookie: str) -> int:
|
||||
callingDomain: str, cookie: str,
|
||||
authorized: bool) -> int:
|
||||
# Note: this needs to happen synchronously
|
||||
# 0=this is not a new post
|
||||
# 1=new post success
|
||||
|
|
@ -9280,19 +9316,7 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
else:
|
||||
privateEvent = True
|
||||
|
||||
# make a copy of the headers
|
||||
currHeaders = self.headers.items()
|
||||
# show a sending post screen
|
||||
msg = \
|
||||
htmlSendingPost(self.server.baseDir,
|
||||
self.server.translate).encode('utf-8')
|
||||
self._login_headers('text/html', len(msg), callingDomain)
|
||||
self._write(msg)
|
||||
# restore headers
|
||||
for headerField in currHeaders:
|
||||
fieldName = headerField[0]
|
||||
fieldValue = headerField[1]
|
||||
self.headers[fieldName] = fieldValue
|
||||
self._showSendingScreen(authorized, callingDomain)
|
||||
|
||||
if postType == 'newpost':
|
||||
messageJson = \
|
||||
|
|
@ -9312,7 +9336,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9324,12 +9349,14 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
messageJson,
|
||||
self.server.maxReplies,
|
||||
self.server.debug)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9349,7 +9376,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9360,12 +9388,14 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
messageJson,
|
||||
self.server.maxReplies,
|
||||
self.server.debug)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9436,7 +9466,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.server.YTReplacementDomain)
|
||||
saveJson(postJsonObject, postFilename)
|
||||
print('Edited blog post, resaved ' + postFilename)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9446,7 +9477,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
else:
|
||||
print('Edited blog post not found ' +
|
||||
str(fields['postUrl']))
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
elif postType == 'newunlisted':
|
||||
|
|
@ -9469,7 +9501,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9480,12 +9513,14 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
messageJson,
|
||||
self.server.maxReplies,
|
||||
self.server.debug)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9511,7 +9546,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9522,12 +9558,14 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
messageJson,
|
||||
self.server.maxReplies,
|
||||
self.server.debug)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9580,17 +9618,20 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['ticketUrl'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
if self._postToOutbox(messageJson, __version__, nickname):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9620,7 +9661,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
|
|
@ -9633,12 +9675,14 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
messageJson,
|
||||
self.server.maxReplies,
|
||||
self.server.debug)
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9667,26 +9711,30 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
fields['location'])
|
||||
if messageJson:
|
||||
if fields['schedulePost']:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
print('DEBUG: new reminder to ' +
|
||||
str(messageJson['object']['to']))
|
||||
if self._postToOutbox(messageJson, __version__, nickname):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
elif postType == 'newreport':
|
||||
if attachmentMediaType:
|
||||
if attachmentMediaType != 'image':
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9707,23 +9755,27 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self.server.debug, fields['subject'])
|
||||
if messageJson:
|
||||
if self._postToOutbox(messageJson, __version__, nickname):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
else:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
elif postType == 'newquestion':
|
||||
if not fields.get('duration'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
if not fields.get('message'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
# questionStr = fields['message']
|
||||
|
|
@ -9733,7 +9785,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
qOptions.append(fields['questionOption' +
|
||||
str(questionCtr)])
|
||||
if not qOptions:
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
messageJson = \
|
||||
|
|
@ -9754,33 +9807,40 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
if self.server.debug:
|
||||
print('DEBUG: new Question')
|
||||
if self._postToOutbox(messageJson, __version__, nickname):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return 1
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
elif postType == 'newshare':
|
||||
if not fields.get('itemType'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
if not fields.get('category'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
if not fields.get('location'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
if not fields.get('duration'):
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
if attachmentMediaType:
|
||||
if attachmentMediaType != 'image':
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain,
|
||||
cookie)
|
||||
return -1
|
||||
|
|
@ -9804,15 +9864,18 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
if os.path.isfile(filename):
|
||||
os.remove(filename)
|
||||
self.postToNickname = nickname
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return 1
|
||||
self._redirectAfterPost(self.server.defaultTimeline,
|
||||
self._clearSendingScreen(authorized,
|
||||
self.server.defaultTimeline,
|
||||
self.path, callingDomain, cookie)
|
||||
return -1
|
||||
|
||||
def _receiveNewPost(self, postType: str, path: str,
|
||||
callingDomain: str, cookie: str) -> int:
|
||||
callingDomain: str, cookie: str,
|
||||
authorized: bool) -> int:
|
||||
"""A new post has been created
|
||||
This creates a thread to send the new post
|
||||
"""
|
||||
|
|
@ -9914,7 +9977,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
self._receiveNewPostProcess(postType,
|
||||
path, headers, length,
|
||||
postBytes, boundary,
|
||||
callingDomain, cookie)
|
||||
callingDomain, cookie,
|
||||
authorized)
|
||||
return pageNumber
|
||||
|
||||
def _cryptoAPIreadHandle(self):
|
||||
|
|
@ -10376,7 +10440,8 @@ class PubServer(BaseHTTPRequestHandler):
|
|||
|
||||
pageNumber = \
|
||||
self._receiveNewPost(currPostType, self.path,
|
||||
callingDomain, cookie)
|
||||
callingDomain, cookie,
|
||||
authorized)
|
||||
if pageNumber:
|
||||
nickname = self.path.split('/users/')[1]
|
||||
if '/' in nickname:
|
||||
|
|
|
|||
Loading…
Reference in New Issue