From 00c8d960997a78d624d3e9f7f82f7cfb4a09ec57 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Fri, 4 Oct 2019 10:58:02 +0100
Subject: [PATCH] Tidying

---
 inbox.py | 56 +++++++++++++++++++++-----------------------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/inbox.py b/inbox.py
index 89d0c8864..59f9b8be9 100644
--- a/inbox.py
+++ b/inbox.py
@@ -1330,43 +1330,29 @@ def inboxAfterCapabilities(session,keyId: str,handle: str,messageJson: {}, \
 
     if os.path.isfile(destinationFilename):
         return True
-    
+
     if messageJson.get('postNickname'):
-        if validPostContent(messageJson['post'],maxMentions):
-            if isDM(messageJson['post']):
-                dmNotify(baseDir,handle)
-            domainFull=domain
-            if port:
-                if ':' not in domain:
-                    if port!=80 and port!=443:
-                        domainFull=domainFull+':'+str(port)
-            actor=httpPrefix+'://'+domainFull+'/users/'+handle.split('@')[0]
-            if isReply(messageJson['post'],actor):
-                replyNotify(baseDir,handle)
-            obtainAvatarForReplyPost(session,baseDir,httpPrefix,domain,personCache,messageJson['post'],debug)
-            try:
-                with open(destinationFilename, 'w+') as fp:
-                    commentjson.dump(messageJson['post'], fp, indent=4, sort_keys=False)
-            except Exception as e:
-                print(e)
+        postJson=messageJson['post']
     else:
-        if validPostContent(messageJson,maxMentions):
-            if isDM(messageJson):
-                dmNotify(baseDir,handle)
-            domainFull=domain
-            if port:
-                if ':' not in domain:
-                    if port!=80 and port!=443:
-                        domainFull=domainFull+':'+str(port)
-            actor=httpPrefix+'://'+domainFull+'/users/'+handle.split('@')[0]
-            if isReply(messageJson,actor):
-                replyNotify(baseDir,handle)
-            obtainAvatarForReplyPost(session,baseDir,httpPrefix,domain,personCache,messageJson,debug)
-            try:
-                with open(destinationFilename, 'w+') as fp:
-                    commentjson.dump(messageJson, fp, indent=4, sort_keys=False)
-            except Exception as e:
-                print(e)
+        postJson=messageJson
+
+    if validPostContent(postJson,maxMentions):
+        if isDM(postJson):
+            dmNotify(baseDir,handle)
+        domainFull=domain
+        if port:
+            if ':' not in domain:
+                if port!=80 and port!=443:
+                    domainFull=domainFull+':'+str(port)
+        actor=httpPrefix+'://'+domainFull+'/users/'+handle.split('@')[0]
+        if isReply(postJson,actor):
+            replyNotify(baseDir,handle)
+        obtainAvatarForReplyPost(session,baseDir,httpPrefix,domain,personCache,postJson,debug)
+        try:
+            with open(destinationFilename, 'w+') as fp:
+                commentjson.dump(postJson, fp, indent=4, sort_keys=False)
+        except Exception as e:
+            print(e)
 
     if not os.path.isfile(destinationFilename):
         return False