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

Return located post

merge-requests/30/head
Bob Mottram 2021-10-17 16:12:15 +01:00
parent 619663a3c8
commit e59b3c2d82
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
daemon.py
View File

@ -7389,9 +7389,10 @@ class PubServer(BaseHTTPRequestHandler):
print('Locating liked post ' + likeUrl) print('Locating liked post ' + likeUrl)
# directly like the post file # directly like the post file
likedPostJson = None likedPostJson = origFilename
likedPostFilename = \ if not likedPostJson:
locatePost(baseDir, self.postToNickname, domain, likeUrl) likedPostFilename = \
locatePost(baseDir, self.postToNickname, domain, likeUrl)
if likedPostFilename: if likedPostFilename:
recentPostsCache = self.server.recentPostsCache recentPostsCache = self.server.recentPostsCache
likedPostJson = loadJson(likedPostFilename, 0, 1) likedPostJson = loadJson(likedPostFilename, 0, 1)
@ -7557,10 +7558,10 @@ class PubServer(BaseHTTPRequestHandler):
self._postToOutbox(undoLikeJson, self.server.projectVersion, None) self._postToOutbox(undoLikeJson, self.server.projectVersion, None)
# directly undo the like within the post file # directly undo the like within the post file
likedPostJson = None likedPostJson = origFilename
likedPostFilename = locatePost(baseDir, if not likedPostJson:
self.postToNickname, likedPostFilename = locatePost(baseDir, self.postToNickname,
domain, likeUrl) domain, likeUrl)
if likedPostFilename: if likedPostFilename:
recentPostsCache = self.server.recentPostsCache recentPostsCache = self.server.recentPostsCache
likedPostJson = loadJson(likedPostFilename, 0, 1) likedPostJson = loadJson(likedPostFilename, 0, 1)

10
posts.py
View File

@ -5053,15 +5053,15 @@ def getOriginalPostFromAnnounceUrl(announceUrl: str, baseDir: str,
return None, None, None return None, None, None
announcePostJson = loadJson(postFilename, 0, 1) announcePostJson = loadJson(postFilename, 0, 1)
if not announcePostJson: if not announcePostJson:
return None, None, None return None, None, postFilename
if not announcePostJson.get('type'): if not announcePostJson.get('type'):
return None, None, None return None, None, postFilename
if announcePostJson['type'] != 'Announce': if announcePostJson['type'] != 'Announce':
return None, None, None return None, None, postFilename
if not announcePostJson.get('object'): if not announcePostJson.get('object'):
return None, None, None return None, None, postFilename
if not isinstance(announcePostJson['object'], str): if not isinstance(announcePostJson['object'], str):
return None, None, None return None, None, postFilename
actor = url = None actor = url = None
# do we have the original post? # do we have the original post?
origPostId = announcePostJson['object'] origPostId = announcePostJson['object']