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

Also replace undo

master
Bob Mottram 2019-08-16 20:48:32 +01:00
parent 7e43a00c4d
commit 55ce8de22b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon.py
View File

@ -283,7 +283,7 @@ class PubServer(BaseHTTPRequestHandler):
' is not a permitted activity type') ' is not a permitted activity type')
return False return False
if messageJson.get('id'): if messageJson.get('id'):
postId=messageJson['id'].replace('/activity','') postId=messageJson['id'].replace('/activity','').replace('/undo','')
if self.server.debug: if self.server.debug:
print('DEBUG: id attribute exists within POST to outbox') print('DEBUG: id attribute exists within POST to outbox')
else: else:
@ -2690,7 +2690,7 @@ class PubServer(BaseHTTPRequestHandler):
if self._postToOutbox(messageJson): if self._postToOutbox(messageJson):
if messageJson.get('id'): if messageJson.get('id'):
self.headers['Location']= \ self.headers['Location']= \
messageJson['id'].replace('/activity','') messageJson['id'].replace('/activity','').replace('/undo','')
self.send_response(201) self.send_response(201)
self.end_headers() self.end_headers()
self.server.POSTbusy=False self.server.POSTbusy=False

8
inbox.py
View File

@ -197,14 +197,14 @@ def savePostToInboxQueue(baseDir: str,httpPrefix: str,nickname: str, domain: str
return None return None
originalPostId=None originalPostId=None
if postJsonObject.get('id'): if postJsonObject.get('id'):
originalPostId=postJsonObject['id'].replace('/activity','') originalPostId=postJsonObject['id'].replace('/activity','').replace('/undo','')
currTime=datetime.datetime.utcnow() currTime=datetime.datetime.utcnow()
postId=None postId=None
if postJsonObject.get('id'): if postJsonObject.get('id'):
#if '/statuses/' not in postJsonObject['id']: #if '/statuses/' not in postJsonObject['id']:
postId=postJsonObject['id'].replace('/activity','') postId=postJsonObject['id'].replace('/activity','').replace('/undo','')
published=currTime.strftime("%Y-%m-%dT%H:%M:%SZ") published=currTime.strftime("%Y-%m-%dT%H:%M:%SZ")
if not postId: if not postId:
statusNumber,published = getStatusNumber() statusNumber,published = getStatusNumber()
@ -745,7 +745,7 @@ def receiveDelete(session,handle: str,baseDir: str, \
if not os.path.isdir(baseDir+'/accounts/'+handle): if not os.path.isdir(baseDir+'/accounts/'+handle):
print('DEBUG: unknown recipient of like - '+handle) print('DEBUG: unknown recipient of like - '+handle)
# if this post in the outbox of the person? # if this post in the outbox of the person?
messageId=messageJson['object'].replace('/activity','') messageId=messageJson['object'].replace('/activity','').replace('/undo','')
removeModerationPostFromIndex(baseDir,messageId,debug) removeModerationPostFromIndex(baseDir,messageId,debug)
postFilename=locatePost(baseDir,handle.split('@')[0],handle.split('@')[1],messageId) postFilename=locatePost(baseDir,handle.split('@')[0],handle.split('@')[1],messageId)
if not postFilename: if not postFilename:
@ -900,7 +900,7 @@ def populateReplies(baseDir :str,httpPrefix :str,domain :str, \
return False return False
# populate a text file containing the ids of replies # populate a text file containing the ids of replies
postRepliesFilename=postFilename.replace('.json','.replies') postRepliesFilename=postFilename.replace('.json','.replies')
messageId=messageJson['id'].replace('/activity','') messageId=messageJson['id'].replace('/activity','').replace('/undo','')
if os.path.isfile(postRepliesFilename): if os.path.isfile(postRepliesFilename):
numLines = sum(1 for line in open(postRepliesFilename)) numLines = sum(1 for line in open(postRepliesFilename))
if numLines>maxReplies: if numLines>maxReplies: