From fbdad05971141de884a40ca0504a796f843744b4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 16 Dec 2019 10:19:21 +0000
Subject: [PATCH] Consistent variable name

---
 follow.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/follow.py b/follow.py
index 21401c8b6..aede7471d 100644
--- a/follow.py
+++ b/follow.py
@@ -554,6 +554,18 @@ def followedAccountAccepts(session,baseDir: str,httpPrefix: str, \
               ' port '+str(port)+' to '+ \
               acceptHandle+' port '+ str(fromPort))
     clientToServer=False
+
+    # remove the follow request json
+    followActivityfilename= \
+        baseDir+'/accounts/'+ \
+        nicknameToFollow+'@'+domainToFollow+'/requests/'+ \
+        nickname+'@'+domain+'.follow'
+    if os.path.isfile(followActivityfilename):
+        try:
+            os.remove(followActivityfilename)
+        except:
+            pass
+
     return sendSignedJson(acceptJson,session,baseDir, \
                           nicknameToFollow,domainToFollow,port, \
                           nickname,domain,fromPort, '', \
@@ -578,14 +590,14 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
               nicknameToFollow+'@'+domainToFollow+' back to '+nickname+'@'+domain)
 
     # get the json for the original follow request
-    followRequestJsonFilename= \
+    followActivityfilename= \
         baseDir+'/accounts/'+ \
         nicknameToFollow+'@'+domainToFollow+'/requests/'+ \
         nickname+'@'+domain+'.follow'
-    followJson=loadJson(followRequestJsonFilename)
+    followJson=loadJson(followActivityfilename)
     if not followJson:
         print('No follow request json was found for '+ \
-              followRequestJsonFilename)
+              followActivityfilename)
         return None
     # actor who made the follow request
     personUrl=followJson['actor']
@@ -610,7 +622,7 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
     removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,denyHandle,debug)
     # remove the follow request json
     try:
-        os.remove(followRequestJsonFilename)
+        os.remove(followActivityfilename)
     except:
         pass
     # send the reject activity