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

Missing debug

main2
Bob Mottram 2019-10-15 10:12:58 +01:00
parent 884f897285
commit dfa183a69b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
follow.py
View File

@ -29,7 +29,8 @@ from session import postJson
def removeFromFollowBase(baseDir: str, \ def removeFromFollowBase(baseDir: str, \
nickname: str,domain: str, \ nickname: str,domain: str, \
acceptOrDenyHandle: str,followFile: str) -> None: acceptOrDenyHandle: str,followFile: str, \
debug: bool) -> None:
"""Removes a handle from follow requests or rejects file """Removes a handle from follow requests or rejects file
""" """
handle=nickname+'@'+domain handle=nickname+'@'+domain
@ -51,19 +52,19 @@ def removeFromFollowBase(baseDir: str, \
def removeFromFollowRequests(baseDir: str, \ def removeFromFollowRequests(baseDir: str, \
nickname: str,domain: str, \ nickname: str,domain: str, \
denyHandle: str) -> None: denyHandle: str,debug: bool) -> None:
"""Removes a handle from follow requests """Removes a handle from follow requests
""" """
removeFromFollowBase(baseDir,nickname,domain, \ removeFromFollowBase(baseDir,nickname,domain, \
denyHandle,'followrequests') denyHandle,'followrequests',debug)
def removeFromFollowRejects(baseDir: str, \ def removeFromFollowRejects(baseDir: str, \
nickname: str,domain: str, \ nickname: str,domain: str, \
acceptHandle: str) -> None: acceptHandle: str,debug: bool) -> None:
"""Removes a handle from follow rejects """Removes a handle from follow rejects
""" """
removeFromFollowBase(baseDir,nickname,domain, \ removeFromFollowBase(baseDir,nickname,domain, \
acceptHandle,'followrejects') acceptHandle,'followrejects',debug)
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?
@ -388,7 +389,7 @@ 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) removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,approveHandle,debug)
print(approveHandle+' was already denied as a follower of '+nicknameToFollow) print(approveHandle+' was already denied as a follower of '+nicknameToFollow)
return True return True
@ -599,7 +600,7 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
if fromPort: if fromPort:
if fromPort!=80 and fromPort!=443: if fromPort!=80 and fromPort!=443:
denyHandle=denyHandle+':'+str(fromPort) denyHandle=denyHandle+':'+str(fromPort)
removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,denyHandle) removeFromFollowRequests(baseDir,nicknameToFollow,domainToFollow,denyHandle,debug)
return sendSignedJson(rejectJson,session,baseDir, \ return sendSignedJson(rejectJson,session,baseDir, \
nicknameToFollow,domainToFollow,port, \ nicknameToFollow,domainToFollow,port, \
nickname,domain,fromPort, '', \ nickname,domain,fromPort, '', \
@ -653,7 +654,7 @@ def sendFollowRequest(session,baseDir: str, \
# follow request will block them again. # follow request will block them again.
removeFromFollowRejects(baseDir, \ removeFromFollowRejects(baseDir, \
nickname,domain, \ nickname,domain, \
followNickname+'@'+requestDomain) followNickname+'@'+requestDomain,debug)
sendSignedJson(newFollowJson,session,baseDir,nickname,domain,port, \ sendSignedJson(newFollowJson,session,baseDir,nickname,domain,port, \
followNickname,followDomain,followPort, \ followNickname,followDomain,followPort, \

4
manualapprove.py
View File

@ -32,11 +32,11 @@ 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) removeFromFollowRequests(baseDir,nickname,domain,denyHandle,debug)
print(denyHandle+' has already been rejected as a follower of '+nickname) print(denyHandle+' has already been rejected as a follower of '+nickname)
return return
removeFromFollowRequests(baseDir,nickname,domain,denyHandle) removeFromFollowRequests(baseDir,nickname,domain,denyHandle,debug)
# Store rejected follows # Store rejected follows
rejectsFile=open(rejectedFollowsFilename, "a+") rejectsFile=open(rejectedFollowsFilename, "a+")