From 527c4c2a247cb44fb3a36f6ec82df2b9d111c533 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Wed, 7 Aug 2019 14:31:11 +0100
Subject: [PATCH] follow accept logic

---
 daemon.py        |  7 +++++++
 manualapprove.py | 30 ++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/daemon.py b/daemon.py
index f571cb946..c258663a9 100644
--- a/daemon.py
+++ b/daemon.py
@@ -82,6 +82,7 @@ from utils import getNicknameFromActor
 from utils import getDomainFromActor
 from manualapprove import manualDenyFollowRequest
 from manualapprove import manualApproveFollowRequest
+from manualapprove import addHandleToApproveFile
 from announce import createAnnounce
 from announce import outboxAnnounce
 from content import addMentions
@@ -759,6 +760,9 @@ class PubServer(BaseHTTPRequestHandler):
                 if not self.server.session:
                     self.server.session= \
                         createSession(self.server.domain,self.server.port,self.server.useTor)
+                addHandleToApproveFile(self.server.baseDir, \
+                                       followerNickname,followerDomain, \
+                                       followingHandle)
                 manualApproveFollowRequest(self.server.session, \
                                            self.server.baseDir, \
                                            self.server.httpPrefix, \
@@ -782,6 +786,9 @@ class PubServer(BaseHTTPRequestHandler):
             followerDomain,FollowerPort=getDomainFromActor(originPathStr)
             followingHandle=self.path.split('/followdeny=')[1]
             if '@' in followingHandle:
+                addHandleToApproveFile(self.server.baseDir, \
+                                       followerNickname,followerDomain, \
+                                       followingHandle)
                 manualDenyFollowRequest(self.server.baseDir, \
                                         followerNickname,followerDomain, \
                                         followingHandle)
diff --git a/manualapprove.py b/manualapprove.py
index dfbdcb55a..ea4dee22d 100644
--- a/manualapprove.py
+++ b/manualapprove.py
@@ -18,7 +18,11 @@ def manualDenyFollowRequest(baseDir: str,nickname: str,domain: str,denyHandle: s
     handle=args.nickname+'@'+domain
     accountsDir=baseDir+'/accounts/'+handle
     approveFollowsFilename=accountsDir+'/followrequests.txt'
-    if handle not in open(approveFollowsFilename).read():
+    if not os.path.isfile(approveFollowsFilename):
+        if debug:
+            print('WARN: Follow requests file '+approveFollowsFilename+' not found')
+        return
+    if denyHandle not in open(approveFollowsFilename).read():
         return
     with open(approveFollowsFilename+'.new', 'w') as approvefilenew:
         with open(approveFollowsFilename, 'r') as approvefile:
@@ -27,6 +31,23 @@ def manualDenyFollowRequest(baseDir: str,nickname: str,domain: str,denyHandle: s
                     approvefilenew.write(approveHandle)
     os.rename(approveFollowsFilename+'.new',approveFollowsFilename)
     print('Follow request from '+denyHandle+' was denied.')
+
+def addHandleToApproveFile(baseDir: str,nickname: str,domain: str,addHandle: str) -> None:
+    """Adds the given handle to the follow requests for the given account
+    """
+    handle=nickname+'@'+domain
+    accountsDir=baseDir+'/accounts/'+handle
+    approveFollowsFilename=accountsDir+'/followrequests.txt'
+    appendHandle=True
+    if os.path.isfile(approveFollowsFilename):
+        if addHandle in open(approveFollowsFilename).read():
+            appendHandle=False
+    with open(approveFollowsFilename+'.add', 'w') as approvefilenew:
+        with open(approveFollowsFilename, 'r') as approvefile:
+            for handle in approvefile:
+                approvefilenew.write(handle)
+            approvefilenew.write(addHandle)
+    os.rename(approveFollowsFilename+'.add',approveFollowsFilename)
     
 def manualApproveFollowRequest(session,baseDir: str, \
                                httpPrefix: str,
@@ -46,7 +67,7 @@ def manualApproveFollowRequest(session,baseDir: str, \
         if debug:
             print('WARN: Follow requests file '+approveFollowsFilename+' not found')
         return
-    if handle not in open(approveFollowsFilename).read():
+    if approveHandle not in open(approveFollowsFilename).read():
         if debug:
             print(handle+' not in '+approveFollowsFilename)
         return
@@ -54,8 +75,9 @@ def manualApproveFollowRequest(session,baseDir: str, \
         with open(approveFollowsFilename, 'r') as approvefile:
             for handle in approvefile:
                 if handle.startswith(approveHandle):
+                    port2=port
                     if ':' in handle:
-                        port=int(handle.split(':')[1].replace('\n',''))
+                        port2=int(handle.split(':')[1].replace('\n',''))
                     requestsDir=accountsDir+'/requests'
                     followActivityfilename=requestsDir+'/'+handle+'.follow'
                     if os.path.isfile(followActivityfilename):
@@ -63,7 +85,7 @@ def manualApproveFollowRequest(session,baseDir: str, \
                             followJson=commentjson.load(fp)
                             approveNickname=approveHandle.split('@')[0]
                             approveDomain=approveHandle.split('@')[1].replace('\n','')
-                            approvePort=port
+                            approvePort=port2
                             if ':' in approveDomain:
                                 approvePort=approveDomain.split(':')[1]
                                 approveDomain=approveDomain.split(':')[0]