indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Remove handle from follow requests

main2
Bob Mottram 2019-09-18 18:04:19 +01:00
parent 4de04e7362
commit 58579f48a2
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
follow.py
View File

@ -26,6 +26,28 @@ from auth import createBasicAuthHeader
from auth import createPassword from auth import createPassword
from session import postJson from session import postJson
def removeFromFollowRequests(baseDir: str, \
nickname: str,domain: str, \
denyHandle: str):
"""Removes a handle from follow requests
"""
handle=nickname+'@'+domain
accountsDir=baseDir+'/accounts/'+handle
approveFollowsFilename=accountsDir+'/followrequests.txt'
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
approvefilenew = open(approveFollowsFilename+'.new', 'w+')
with open(approveFollowsFilename, 'r') as approvefile:
for approveHandle in approvefile:
if not approveHandle.startswith(denyHandle):
approvefilenew.write(approveHandle)
approvefilenew.close()
os.rename(approveFollowsFilename+'.new',approveFollowsFilename)
def isFollowingActor(baseDir: str,nickname: str,domain: str,actor: str) -> bool: def isFollowingActor(baseDir: str,nickname: str,domain: str,actor: str) -> bool:
"""Is the given actor a follower of the given nickname? """Is the given actor a follower of the given nickname?
""" """
@ -442,6 +464,7 @@ def receiveFollowRequest(session,baseDir: str,httpPrefix: str, \
denyHandle=nicknameToFollow+'@'+domainToFollowFull denyHandle=nicknameToFollow+'@'+domainToFollowFull
if denyHandle in open(rejectedFollowsFilename).read(): if denyHandle in open(rejectedFollowsFilename).read():
print(denyHandle+' was already denied as a follower of '+nickname) print(denyHandle+' was already denied as a follower of '+nickname)
removeFromFollowRequests(baseDir,nickname,domain,denyHandle)
return True return True
print('Storing follow request for approval') print('Storing follow request for approval')

16
manualapprove.py
View File

@ -12,6 +12,7 @@ import commentjson
from follow import followedAccountAccepts from follow import followedAccountAccepts
from follow import followedAccountRejects from follow import followedAccountRejects
from follow import removeFromFollowRequests
def manualDenyFollowRequest(session,baseDir: str, \ def manualDenyFollowRequest(session,baseDir: str, \
httpPrefix: str, httpPrefix: str,
@ -34,20 +35,7 @@ def manualDenyFollowRequest(session,baseDir: str, \
print(denyHandle+' has already been rejected as a follower of '+nickname) print(denyHandle+' has already been rejected as a follower of '+nickname)
return return
approveFollowsFilename=accountsDir+'/followrequests.txt' removeFromFollowRequests(baseDir,nickname,domain,denyHandle)
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
approvefilenew = open(approveFollowsFilename+'.new', 'w+')
with open(approveFollowsFilename, 'r') as approvefile:
for approveHandle in approvefile:
if not approveHandle.startswith(denyHandle):
approvefilenew.write(approveHandle)
approvefilenew.close()
os.rename(approveFollowsFilename+'.new',approveFollowsFilename)
# Store rejected follows # Store rejected follows
rejectsFile=open(rejectedFollowsFilename, "a+") rejectsFile=open(rejectedFollowsFilename, "a+")