From faa0b2a8b59b70dd44bf0ffbd4a94750d8cb96da Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 18 Sep 2019 20:10:53 +0100 Subject: [PATCH] Avoid duplication --- follow.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/follow.py b/follow.py index f0327cdd6..c04b3fb64 100644 --- a/follow.py +++ b/follow.py @@ -361,6 +361,8 @@ def storeFollowRequest(baseDir: str, \ denyFollowsFilename=accountsDir+'/followrejects.txt' if os.path.isfile(denyFollowsFilename): if approveHandle in open(denyFollowsFilename).read(): + removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,approveHandle) + print(approveHandle+' was already denied as a follower of '+nicknameToFollow) return True # add to a file which contains a list of requests @@ -465,14 +467,6 @@ def receiveFollowRequest(session,baseDir: str,httpPrefix: str, \ # what is the followers policy? if followApprovalRequired(baseDir,nicknameToFollow, \ domainToFollow,debug): - rejectedFollowsFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/followrejects.txt' - if os.path.isfile(rejectedFollowsFilename): - denyHandle=nicknameToFollow+'@'+domainToFollowFull - if denyHandle in open(rejectedFollowsFilename).read(): - print(denyHandle+' was already denied as a follower of '+nickname) - removeFromFollowRequests(baseDir,nickname,domain,denyHandle) - return True - print('Storing follow request for approval') return storeFollowRequest(baseDir, \ nicknameToFollow,domainToFollow,port, \