From f2d5e1e05f6e4867c9600548be73e659d098e871 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 20 Jul 2019 14:31:20 +0100
Subject: [PATCH] Store follow requests if manual approval is needed

---
 follow.py | 78 ++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 27 deletions(-)

diff --git a/follow.py b/follow.py
index 681abb76..f9f2dcc2 100644
--- a/follow.py
+++ b/follow.py
@@ -261,7 +261,46 @@ def followApprovalRequired(baseDir: str,nicknameToFollow: str, \
         if debug:
             print('DEBUG: Actor file not found: '+actorFilename)
     return manuallyApproveFollows
+
+def storeFollowRequest(baseDir: str, \
+                       nicknameToFollow: str,domainToFollow: str,port: int, \
+                       followJson: {}, \
+                       debug: bool) -> bool:
+    """Stores the follow request for later use
+    """
+    accountsDir=baseDir+'/accounts/'+nicknameToFollow+'@'+domainToFollow
+    if not os.path.isdir(accountDir):
+        return False
     
+    if port!=80 and port!=443:
+        approveHandle=nicknameToFollow+'@'+domainToFollow+':'+str(port)
+    else:
+        approveHandle=nicknameToFollow+'@'+domainToFollow
+
+    # add to a file which contains a list of requests
+    approveFollowsFilename=accountDir+'/followrequests.txt'
+    if os.path.isfile(approveFollowsFilename):
+        if approveHandle not in open(approveFollowsFilename).read():
+            with open(approveFollowsFilename, "a") as fp:
+                fp.write(approveHandle+'\n')
+        else:
+            if debug:
+                print('DEBUG: '+approveHandle+' is already awaiting approval')
+    else:
+        with open(approveFollowsFilename, "w") as fp:
+            fp.write(approveHandle+'\n')
+
+    # store the follow request in its own directory
+    # We don't rely upon the inbox because items in there could expire
+    requestsDir=accountsDir+'/requests'
+    if not os.path.isdir(requestsDir):
+        os.mkdir(requestsDir)
+    followActivityfilename=requestsDir+'/'+approveHandle+'.follow'
+    with open(followActivityfilename, 'w') as fp:
+        commentjson.dump(followJson, fp, indent=4, sort_keys=False)
+        return True
+    return False
+
 def receiveFollowRequest(session,baseDir: str,httpPrefix: str, \
                          port: int,sendThreads: [],postLog: [], \
                          cachedWebfingers: {},personCache: {}, \
@@ -334,33 +373,18 @@ def receiveFollowRequest(session,baseDir: str,httpPrefix: str, \
     # what is the followers policy?
     if followApprovalRequired(baseDir,nicknameToFollow, \
                               domainToFollow,debug):
-        accountsDir=baseDir+'/accounts/'+nicknameToFollow+'@'+domainToFollow
-        if os.path.isdir(accountDir):
-            if port!=80 and port!=443:
-                approveHandle=nicknameToFollow+'@'+domainToFollow+':'+str(port)
-            else:
-                approveHandle=nicknameToFollow+'@'+domainToFollow
-            approveFollowsFilename=accountDir+'/followrequests.txt'
-            if os.path.isfile(approveFollowsFilename):
-                if approveHandle not in open(approveFollowsFilename).read():
-                    with open(approveFollowsFilename, "a") as fp:
-                        fp.write(approveHandle+'\n')
-                else:
-                    if debug:
-                        print('DEBUG: '+approveHandle+' is already awaiting approval')
-            else:
-                with open(approveFollowsFilename, "w") as fp:
-                    fp.write(approveHandle+'\n')
-            return True
-        return False
-    followedAccountAccepts(session,baseDir,httpPrefix, \
-                           nicknameToFollow,domainToFollow,port, \
-                           nickname,domain,fromPort, \
-                           messageJson['actor'],federationList,
-                           messageJson,acceptedCaps, \
-                           sendThreads,postLog, \
-                           cachedWebfingers,personCache, \
-                           debug)
+        return storeFollowRequest(baseDir, \
+                                  nicknameToFollow,domainToFollow,port, \
+                                  messageJson,debug)
+        
+    return followedAccountAccepts(session,baseDir,httpPrefix, \
+                                  nicknameToFollow,domainToFollow,port, \
+                                  nickname,domain,fromPort, \
+                                  messageJson['actor'],federationList,
+                                  messageJson,acceptedCaps, \
+                                  sendThreads,postLog, \
+                                  cachedWebfingers,personCache, \
+                                  debug)
 
 def followedAccountAccepts(session,baseDir: str,httpPrefix: str, \
                            nicknameToFollow: str,domainToFollow: str,port: int, \