From e59b3c2d82aa2376b15449be2fcaa1badde29f3f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 17 Oct 2021 16:12:15 +0100
Subject: [PATCH] Return located post

---
 daemon.py | 15 ++++++++-------
 posts.py  | 10 +++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/daemon.py b/daemon.py
index ff0fe5e54..1c3bc6ab5 100644
--- a/daemon.py
+++ b/daemon.py
@@ -7389,9 +7389,10 @@ class PubServer(BaseHTTPRequestHandler):
 
         print('Locating liked post ' + likeUrl)
         # directly like the post file
-        likedPostJson = None
-        likedPostFilename = \
-            locatePost(baseDir, self.postToNickname, domain, likeUrl)
+        likedPostJson = origFilename
+        if not likedPostJson:
+            likedPostFilename = \
+                locatePost(baseDir, self.postToNickname, domain, likeUrl)
         if likedPostFilename:
             recentPostsCache = self.server.recentPostsCache
             likedPostJson = loadJson(likedPostFilename, 0, 1)
@@ -7557,10 +7558,10 @@ class PubServer(BaseHTTPRequestHandler):
         self._postToOutbox(undoLikeJson, self.server.projectVersion, None)
 
         # directly undo the like within the post file
-        likedPostJson = None
-        likedPostFilename = locatePost(baseDir,
-                                       self.postToNickname,
-                                       domain, likeUrl)
+        likedPostJson = origFilename
+        if not likedPostJson:
+            likedPostFilename = locatePost(baseDir, self.postToNickname,
+                                           domain, likeUrl)
         if likedPostFilename:
             recentPostsCache = self.server.recentPostsCache
             likedPostJson = loadJson(likedPostFilename, 0, 1)
diff --git a/posts.py b/posts.py
index fb706643f..b23281bc0 100644
--- a/posts.py
+++ b/posts.py
@@ -5053,15 +5053,15 @@ def getOriginalPostFromAnnounceUrl(announceUrl: str, baseDir: str,
         return None, None, None
     announcePostJson = loadJson(postFilename, 0, 1)
     if not announcePostJson:
-        return None, None, None
+        return None, None, postFilename
     if not announcePostJson.get('type'):
-        return None, None, None
+        return None, None, postFilename
     if announcePostJson['type'] != 'Announce':
-        return None, None, None
+        return None, None, postFilename
     if not announcePostJson.get('object'):
-        return None, None, None
+        return None, None, postFilename
     if not isinstance(announcePostJson['object'], str):
-        return None, None, None
+        return None, None, postFilename
     actor = url = None
     # do we have the original post?
     origPostId = announcePostJson['object']