mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid duplication

main2
Bob Mottram 2019-09-18 20:10:53 +01:00
parent d76c2b8b22
commit faa0b2a8b5
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
follow.py
View File

@ -361,6 +361,8 @@ def storeFollowRequest(baseDir: str, \
denyFollowsFilename=accountsDir+'/followrejects.txt' denyFollowsFilename=accountsDir+'/followrejects.txt'
if os.path.isfile(denyFollowsFilename): if os.path.isfile(denyFollowsFilename):
if approveHandle in open(denyFollowsFilename).read(): if approveHandle in open(denyFollowsFilename).read():
removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,approveHandle)
print(approveHandle+' was already denied as a follower of '+nicknameToFollow)
return True return True
# add to a file which contains a list of requests # 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? # what is the followers policy?
if followApprovalRequired(baseDir,nicknameToFollow, \ if followApprovalRequired(baseDir,nicknameToFollow, \
domainToFollow,debug): 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') print('Storing follow request for approval')
return storeFollowRequest(baseDir, \ return storeFollowRequest(baseDir, \
nicknameToFollow,domainToFollow,port, \ nicknameToFollow,domainToFollow,port, \