From 15e2805d69038a6b5d8871d87fe929492429c508 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 21 Oct 2019 13:49:16 +0100 Subject: [PATCH] Tidying --- inbox.py | 47 ++++++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/inbox.py b/inbox.py index 15d861bb2..9bf94c451 100644 --- a/inbox.py +++ b/inbox.py @@ -1287,28 +1287,33 @@ def obtainAvatarForReplyPost(session,baseDir: str,httpPrefix: str,domain: str,pe return lookupActor=postJsonObject['object']['inReplyTo'] - if lookupActor: - if '/users/' in lookupActor or \ - '/channel/' in lookupActor or \ - '/profile/' in lookupActor: - if '/statuses/' in lookupActor: - lookupActor=lookupActor.split('/statuses/')[0] - - if debug: - print('DEBUG: Obtaining actor for reply post '+lookupActor) - for tries in range(6): - pubKey= \ - getPersonPubKey(baseDir,session,lookupActor, \ - personCache,debug, \ - __version__,httpPrefix,domain) - if pubKey: - print('DEBUG: public key obtained for reply: '+lookupActor) - break + if not lookupActor: + return - if debug: - print('DEBUG: Retry '+str(tries+1)+ \ - ' obtaining actor for '+lookupActor) - time.sleep(5) + if not ('/users/' in lookupActor or \ + '/channel/' in lookupActor or \ + '/profile/' in lookupActor): + return + + if '/statuses/' in lookupActor: + lookupActor=lookupActor.split('/statuses/')[0] + + if debug: + print('DEBUG: Obtaining actor for reply post '+lookupActor) + + for tries in range(6): + pubKey= \ + getPersonPubKey(baseDir,session,lookupActor, \ + personCache,debug, \ + __version__,httpPrefix,domain) + if pubKey: + print('DEBUG: public key obtained for reply: '+lookupActor) + break + + if debug: + print('DEBUG: Retry '+str(tries+1)+ \ + ' obtaining actor for '+lookupActor) + time.sleep(5) def dmNotify(baseDir: str,handle: str,url: str) -> None: """Creates a notification that a new DM has arrived