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

More debug

merge-requests/30/head
Bob Mottram 2020-09-28 14:35:10 +01:00
parent 5c350d1671
commit f20c7a841d
1 changed files with 107 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
daemon.py
View File

@ -9116,7 +9116,7 @@ class PubServer(BaseHTTPRequestHandler):
self._set_headers_head(mediaFileType, fileLength, self._set_headers_head(mediaFileType, fileLength,
etag, callingDomain) etag, callingDomain)
def _redirectToBox(self, boxName: str, path: str, def _redirectAfterPost(self, boxName: str, path: str,
callingDomain: str, cookie: str) -> None: callingDomain: str, cookie: str) -> None:
"""Redirects to the given box """Redirects to the given box
""" """
@ -9132,6 +9132,7 @@ class PubServer(BaseHTTPRequestHandler):
actorStr = 'http://' + self.server.onionDomain + usersPath actorStr = 'http://' + self.server.onionDomain + usersPath
elif (callingDomain.endswith('.i2p') and self.server.i2pDomain): elif (callingDomain.endswith('.i2p') and self.server.i2pDomain):
actorStr = 'http://' + self.server.i2pDomain + usersPath actorStr = 'http://' + self.server.i2pDomain + usersPath
print('Redirecting to: ' + actorStr + '/' + boxName)
self._redirect_headers(actorStr + '/' + boxName, self._redirect_headers(actorStr + '/' + boxName,
cookie, callingDomain) cookie, callingDomain)
@ -9311,8 +9312,9 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
@ -9322,12 +9324,14 @@ class PubServer(BaseHTTPRequestHandler):
messageJson, messageJson,
self.server.maxReplies, self.server.maxReplies,
self.server.debug) self.server.debug)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newblog': elif postType == 'newblog':
messageJson = \ messageJson = \
@ -9345,8 +9349,9 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
populateReplies(self.server.baseDir, populateReplies(self.server.baseDir,
@ -9355,12 +9360,14 @@ class PubServer(BaseHTTPRequestHandler):
messageJson, messageJson,
self.server.maxReplies, self.server.maxReplies,
self.server.debug) self.server.debug)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'editblogpost': elif postType == 'editblogpost':
print('Edited blog post received') print('Edited blog post received')
@ -9429,8 +9436,9 @@ class PubServer(BaseHTTPRequestHandler):
self.server.YTReplacementDomain) self.server.YTReplacementDomain)
saveJson(postJsonObject, postFilename) saveJson(postJsonObject, postFilename)
print('Edited blog post, resaved ' + postFilename) print('Edited blog post, resaved ' + postFilename)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
print('Edited blog post, unable to load json for ' + print('Edited blog post, unable to load json for ' +
@ -9438,7 +9446,7 @@ class PubServer(BaseHTTPRequestHandler):
else: else:
print('Edited blog post not found ' + print('Edited blog post not found ' +
str(fields['postUrl'])) str(fields['postUrl']))
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
elif postType == 'newunlisted': elif postType == 'newunlisted':
@ -9461,8 +9469,9 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
populateReplies(self.server.baseDir, populateReplies(self.server.baseDir,
@ -9471,12 +9480,14 @@ class PubServer(BaseHTTPRequestHandler):
messageJson, messageJson,
self.server.maxReplies, self.server.maxReplies,
self.server.debug) self.server.debug)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newfollowers': elif postType == 'newfollowers':
messageJson = \ messageJson = \
@ -9500,8 +9511,9 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
populateReplies(self.server.baseDir, populateReplies(self.server.baseDir,
@ -9510,12 +9522,14 @@ class PubServer(BaseHTTPRequestHandler):
messageJson, messageJson,
self.server.maxReplies, self.server.maxReplies,
self.server.debug) self.server.debug)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newevent': elif postType == 'newevent':
# A Mobilizon-type event is posted # A Mobilizon-type event is posted
@ -9566,16 +9580,19 @@ class PubServer(BaseHTTPRequestHandler):
fields['ticketUrl']) fields['ticketUrl'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newdm': elif postType == 'newdm':
messageJson = None messageJson = None
@ -9603,8 +9620,9 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
print('Sending new DM to ' + print('Sending new DM to ' +
str(messageJson['object']['to'])) str(messageJson['object']['to']))
@ -9615,12 +9633,14 @@ class PubServer(BaseHTTPRequestHandler):
messageJson, messageJson,
self.server.maxReplies, self.server.maxReplies,
self.server.debug) self.server.debug)
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newreminder': elif postType == 'newreminder':
messageJson = None messageJson = None
@ -9647,24 +9667,28 @@ class PubServer(BaseHTTPRequestHandler):
fields['location']) fields['location'])
if messageJson: if messageJson:
if fields['schedulePost']: if fields['schedulePost']:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
print('DEBUG: new reminder to ' + print('DEBUG: new reminder to ' +
str(messageJson['object']['to'])) str(messageJson['object']['to']))
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newreport': elif postType == 'newreport':
if attachmentMediaType: if attachmentMediaType:
if attachmentMediaType != 'image': if attachmentMediaType != 'image':
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
# So as to be sure that this only goes to moderators # So as to be sure that this only goes to moderators
# and not accounts being reported we disable any # and not accounts being reported we disable any
@ -9683,20 +9707,23 @@ class PubServer(BaseHTTPRequestHandler):
self.server.debug, fields['subject']) self.server.debug, fields['subject'])
if messageJson: if messageJson:
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
else: else:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
elif postType == 'newquestion': elif postType == 'newquestion':
if not fields.get('duration'): if not fields.get('duration'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
if not fields.get('message'): if not fields.get('message'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
# questionStr = fields['message'] # questionStr = fields['message']
@ -9706,7 +9733,7 @@ class PubServer(BaseHTTPRequestHandler):
qOptions.append(fields['questionOption' + qOptions.append(fields['questionOption' +
str(questionCtr)]) str(questionCtr)])
if not qOptions: if not qOptions:
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
messageJson = \ messageJson = \
@ -9727,33 +9754,35 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.debug: if self.server.debug:
print('DEBUG: new Question') print('DEBUG: new Question')
if self._postToOutbox(messageJson, __version__, nickname): if self._postToOutbox(messageJson, __version__, nickname):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return 1 return 1
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
elif postType == 'newshare': elif postType == 'newshare':
if not fields.get('itemType'): if not fields.get('itemType'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
if not fields.get('category'): if not fields.get('category'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
if not fields.get('location'): if not fields.get('location'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
if not fields.get('duration'): if not fields.get('duration'):
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1
if attachmentMediaType: if attachmentMediaType:
if attachmentMediaType != 'image': if attachmentMediaType != 'image':
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain,
cookie)
return -1 return -1
durationStr = fields['duration'] durationStr = fields['duration']
if durationStr: if durationStr:
@ -9775,10 +9804,10 @@ class PubServer(BaseHTTPRequestHandler):
if os.path.isfile(filename): if os.path.isfile(filename):
os.remove(filename) os.remove(filename)
self.postToNickname = nickname self.postToNickname = nickname
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return 1 return 1
self._redirectToBox(self.server.defaultTimeline, self._redirectAfterPost(self.server.defaultTimeline,
self.path, callingDomain, cookie) self.path, callingDomain, cookie)
return -1 return -1