diff --git a/follow.py b/follow.py index ae34efe85..ab95f0cdd 100644 --- a/follow.py +++ b/follow.py @@ -559,6 +559,11 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \ ' port '+str(port)+' to '+ \ nickname+'@'+domain+' port '+ str(fromPort)) clientToServer=False + denyHandle=nickname+'@'+domain + if fromPort: + if fromPort!=80 and fromPort!=443:e + denyHandle=denyHandle+':'+str(fromPort) + removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,denyHandle) return sendSignedJson(rejectJson,session,baseDir, \ nicknameToFollow,domainToFollow,port, \ nickname,domain,fromPort, '', \ diff --git a/manualapprove.py b/manualapprove.py index 6cf33d465..37190e9b9 100644 --- a/manualapprove.py +++ b/manualapprove.py @@ -32,6 +32,7 @@ def manualDenyFollowRequest(session,baseDir: str, \ rejectedFollowsFilename=accountsDir+'/followrejects.txt' if os.path.isfile(rejectedFollowsFilename): if denyHandle in open(rejectedFollowsFilename).read(): + removeFromFollowRequests(baseDir,nickname,domain,denyHandle) print(denyHandle+' has already been rejected as a follower of '+nickname) return