From cd14cc277579f0d3faace1c71b99d1ad46a18663 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 5 Jul 2021 11:22:23 +0100
Subject: [PATCH] Less indentation

---
 utils.py | 93 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/utils.py b/utils.py
index 7a3281132..8e0a76df4 100644
--- a/utils.py
+++ b/utils.py
@@ -1800,6 +1800,7 @@ def searchBoxPosts(baseDir: str, nickname: str, domain: str,
     containing matching strings
     """
     path = baseDir + '/accounts/' + nickname + '@' + domain + '/' + boxName
+    # is this a virtual box, such as direct messages?
     if not os.path.isdir(path):
         if os.path.isfile(path + '.index'):
             return _searchVirtualBoxPosts(baseDir, nickname, domain,
@@ -1854,54 +1855,56 @@ def undoLikesCollectionEntry(recentPostsCache: {},
     """Undoes a like for a particular actor
     """
     postJsonObject = loadJson(postFilename)
-    if postJsonObject:
-        # remove any cached version of this post so that the
-        # like icon is changed
-        nickname = getNicknameFromActor(actor)
-        cachedPostFilename = getCachedPostFilename(baseDir, nickname,
-                                                   domain, postJsonObject)
-        if cachedPostFilename:
-            if os.path.isfile(cachedPostFilename):
-                os.remove(cachedPostFilename)
-        removePostFromCache(postJsonObject, recentPostsCache)
+    if not postJsonObject:
+        return
+    # remove any cached version of this post so that the
+    # like icon is changed
+    nickname = getNicknameFromActor(actor)
+    cachedPostFilename = getCachedPostFilename(baseDir, nickname,
+                                               domain, postJsonObject)
+    if cachedPostFilename:
+        if os.path.isfile(cachedPostFilename):
+            os.remove(cachedPostFilename)
+    removePostFromCache(postJsonObject, recentPostsCache)
 
-        if not postJsonObject.get('type'):
-            return
-        if postJsonObject['type'] != 'Create':
-            return
-        if not hasObjectDict(postJsonObject):
-            if debug:
-                pprint(postJsonObject)
-                print('DEBUG: post ' + objectUrl + ' has no object')
-            return
-        if not postJsonObject['object'].get('likes'):
-            return
-        if not isinstance(postJsonObject['object']['likes'], dict):
-            return
-        if not postJsonObject['object']['likes'].get('items'):
-            return
-        totalItems = 0
-        if postJsonObject['object']['likes'].get('totalItems'):
-            totalItems = postJsonObject['object']['likes']['totalItems']
-        itemFound = False
-        for likeItem in postJsonObject['object']['likes']['items']:
-            if likeItem.get('actor'):
-                if likeItem['actor'] == actor:
-                    if debug:
-                        print('DEBUG: like was removed for ' + actor)
-                    postJsonObject['object']['likes']['items'].remove(likeItem)
-                    itemFound = True
-                    break
-        if itemFound:
-            if totalItems == 1:
+    if not postJsonObject.get('type'):
+        return
+    if postJsonObject['type'] != 'Create':
+        return
+    if not hasObjectDict(postJsonObject):
+        if debug:
+            pprint(postJsonObject)
+            print('DEBUG: post ' + objectUrl + ' has no object')
+        return
+    if not postJsonObject['object'].get('likes'):
+        return
+    if not isinstance(postJsonObject['object']['likes'], dict):
+        return
+    if not postJsonObject['object']['likes'].get('items'):
+        return
+    totalItems = 0
+    if postJsonObject['object']['likes'].get('totalItems'):
+        totalItems = postJsonObject['object']['likes']['totalItems']
+    itemFound = False
+    for likeItem in postJsonObject['object']['likes']['items']:
+        if likeItem.get('actor'):
+            if likeItem['actor'] == actor:
                 if debug:
-                    print('DEBUG: likes was removed from post')
-                del postJsonObject['object']['likes']
-            else:
-                itlen = len(postJsonObject['object']['likes']['items'])
-                postJsonObject['object']['likes']['totalItems'] = itlen
+                    print('DEBUG: like was removed for ' + actor)
+                postJsonObject['object']['likes']['items'].remove(likeItem)
+                itemFound = True
+                break
+    if not itemFound:
+        return
+    if totalItems == 1:
+        if debug:
+            print('DEBUG: likes was removed from post')
+        del postJsonObject['object']['likes']
+    else:
+        itlen = len(postJsonObject['object']['likes']['items'])
+        postJsonObject['object']['likes']['totalItems'] = itlen
 
-            saveJson(postJsonObject, postFilename)
+    saveJson(postJsonObject, postFilename)
 
 
 def updateLikesCollection(recentPostsCache: {},