Receiving likes on announces

daemon.py

@@ -7402,6 +7402,8 @@ class PubServer(BaseHTTPRequestHandler):
                                                       domain, debug)
                                 likeUrl = announceLikeUrl
                                 likedPostFilename = announceLikedFilename
+                                likedPostJson = \
+                                    loadJson(likedPostFilename, 0, 1)
             if debug:
                 print('Updating likes for ' + likedPostFilename)
             updateLikesCollection(recentPostsCache,
@@ -7573,6 +7575,8 @@ class PubServer(BaseHTTPRequestHandler):
                                                          debug)
                                 likeUrl = announceLikeUrl
                                 likedPostFilename = announceLikedFilename
+                                likedPostJson = \
+                                    loadJson(likedPostFilename, 0, 1)
             if debug:
                 print('Removing likes for ' + likedPostFilename)
             undoLikesCollectionEntry(recentPostsCache,

inbox.py

@@ -929,19 +929,41 @@ def _receiveLike(recentPostsCache: {},
     if debug:
         print('DEBUG: liked post found in inbox')
 
+    likeActor = messageJson['actor']
     handleName = handle.split('@')[0]
     handleDom = handle.split('@')[1]
     if not _alreadyLiked(baseDir,
                          handleName, handleDom,
                          postLikedId,
-                         messageJson['actor']):
+                         likeActor):
         _likeNotify(baseDir, domain, onionDomain, handle,
-                    messageJson['actor'], postLikedId)
+                    likeActor, postLikedId)
     updateLikesCollection(recentPostsCache, baseDir, postFilename,
-                          postLikedId, messageJson['actor'],
+                          postLikedId, likeActor,
                           handleName, domain, debug)
     # regenerate the html
     likedPostJson = loadJson(postFilename, 0, 1)
+    if likedPostJson:
+        if likedPostJson.get('type'):
+            if likedPostJson['type'] == 'Announce' and \
+               likedPostJson.get('object'):
+                if isinstance(likedPostJson['object'], str):
+                    announceLikeUrl = likedPostJson['object']
+                    announceLikedFilename = \
+                        locatePost(baseDir, handleName,
+                                   domain, announceLikeUrl)
+                    if announceLikedFilename:
+                        postLikedId = announceLikeUrl
+                        postFilename = announceLikedFilename
+                        updateLikesCollection(recentPostsCache,
+                                              baseDir,
+                                              postFilename,
+                                              postLikedId,
+                                              likeActor,
+                                              handleName,
+                                              domain, debug)
+                        likedPostJson = \
+                            loadJson(postFilename, 0, 1)
         if likedPostJson:
             if debug:
                 cachedPostFilename = \
@@ -974,7 +996,6 @@ def _receiveLike(recentPostsCache: {},
                                  showIndividualPostIcons,
                                  manuallyApproveFollowers,
                                  False, True, False)
-
     return True
 
 
@@ -1030,11 +1051,29 @@ def _receiveUndoLike(recentPostsCache: {},
         return True
     if debug:
         print('DEBUG: liked post found in inbox. Now undoing.')
+    likeActor = messageJson['actor']
+    postLikedId = messageJson['object']
     undoLikesCollectionEntry(recentPostsCache, baseDir, postFilename,
-                             messageJson['object'],
+                             postLikedId, likeActor, domain, debug)
-                             messageJson['actor'], domain, debug)
     # regenerate the html
     likedPostJson = loadJson(postFilename, 0, 1)
+    if likedPostJson:
+        if likedPostJson.get('type'):
+            if likedPostJson['type'] == 'Announce' and \
+               likedPostJson.get('object'):
+                if isinstance(likedPostJson['object'], str):
+                    announceLikeUrl = likedPostJson['object']
+                    announceLikedFilename = \
+                        locatePost(baseDir, handleName,
+                                   domain, announceLikeUrl)
+                    if announceLikedFilename:
+                        postLikedId = announceLikeUrl
+                        postFilename = announceLikedFilename
+                        undoLikesCollectionEntry(recentPostsCache, baseDir,
+                                                 postFilename, postLikedId,
+                                                 likeActor, domain, debug)
+                        likedPostJson = \
+                            loadJson(postFilename, 0, 1)
         if likedPostJson:
             if debug:
                 cachedPostFilename = \