From 3fc0a69e3fd1ceeec2be8e2135a621309d1c64f6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 16 Nov 2019 12:30:59 +0000
Subject: [PATCH] Tidying

---
 inbox.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/inbox.py b/inbox.py
index d4c3a542..6e23a1c3 100644
--- a/inbox.py
+++ b/inbox.py
@@ -166,10 +166,9 @@ def inboxMessageHasParams(messageJson: {}) -> bool:
 def inboxPermittedMessage(domain: str,messageJson: {},federationList: []) -> bool:
     """ check that we are receiving from a permitted domain
     """
-    testParam='actor'
-    if not messageJson.get(testParam):
+    if not messageJson.get('actor'):
         return False
-    actor=messageJson[testParam]
+    actor=messageJson['actor']
     # always allow the local domain
     if domain in actor:
         return True
@@ -177,10 +176,8 @@ def inboxPermittedMessage(domain: str,messageJson: {},federationList: []) -> boo
     if not urlPermitted(actor,federationList,"inbox:write"):
         return False
 
-    if messageJson['type']!='Follow' and \
-       messageJson['type']!='Like' and \
-       messageJson['type']!='Delete' and \
-       messageJson['type']!='Announce':
+    alwaysAllowedTypes=('Follow','Like','Delete','Announce')
+    if messageJson['type'] not in alwaysAllowedTypes:
         if messageJson.get('object'):
             if not isinstance(messageJson['object'], dict):
                 return False