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

Remove from follow requests

main2
Bob Mottram 2019-09-18 18:30:19 +01:00
parent 58579f48a2
commit 5e57bf191b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
follow.py
View File

@ -559,6 +559,11 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
' port '+str(port)+' to '+ \ ' port '+str(port)+' to '+ \
nickname+'@'+domain+' port '+ str(fromPort)) nickname+'@'+domain+' port '+ str(fromPort))
clientToServer=False clientToServer=False
denyHandle=nickname+'@'+domain
if fromPort:
if fromPort!=80 and fromPort!=443:e
denyHandle=denyHandle+':'+str(fromPort)
removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,denyHandle)
return sendSignedJson(rejectJson,session,baseDir, \ return sendSignedJson(rejectJson,session,baseDir, \
nicknameToFollow,domainToFollow,port, \ nicknameToFollow,domainToFollow,port, \
nickname,domain,fromPort, '', \ nickname,domain,fromPort, '', \

1
manualapprove.py
View File

@ -32,6 +32,7 @@ def manualDenyFollowRequest(session,baseDir: str, \
rejectedFollowsFilename=accountsDir+'/followrejects.txt' rejectedFollowsFilename=accountsDir+'/followrejects.txt'
if os.path.isfile(rejectedFollowsFilename): if os.path.isfile(rejectedFollowsFilename):
if denyHandle in open(rejectedFollowsFilename).read(): if denyHandle in open(rejectedFollowsFilename).read():
removeFromFollowRequests(baseDir,nickname,domain,denyHandle)
print(denyHandle+' has already been rejected as a follower of '+nickname) print(denyHandle+' has already been rejected as a follower of '+nickname)
return return