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

Fix sending of follow rejects

merge-requests/30/head
Bob Mottram 2019-12-16 10:01:57 +00:00
parent daa2000b8d
commit decafa082d
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
follow.py
View File

@ -565,8 +565,7 @@ def followedAccountAccepts(session,baseDir: str,httpPrefix: str, \
def followedAccountRejects(session,baseDir: str,httpPrefix: str, \ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
nicknameToFollow: str,domainToFollow: str,port: int, \ nicknameToFollow: str,domainToFollow: str,port: int, \
nickname: str,domain: str,fromPort: int, \ nickname: str,domain: str,fromPort: int, \
personUrl: str,federationList: [], \ federationList: [], \
followJson: {}, \
sendThreads: [],postLog: [], \ sendThreads: [],postLog: [], \
cachedWebfingers: {},personCache: {}, \ cachedWebfingers: {},personCache: {}, \
debug: bool,projectVersion: str): debug: bool,projectVersion: str):
@ -577,9 +576,22 @@ def followedAccountRejects(session,baseDir: str,httpPrefix: str, \
if debug: if debug:
print('DEBUG: sending Reject activity for follow request which arrived at '+ \ print('DEBUG: sending Reject activity for follow request which arrived at '+ \
nicknameToFollow+'@'+domainToFollow+' back to '+nickname+'@'+domain) nicknameToFollow+'@'+domainToFollow+' back to '+nickname+'@'+domain)
rejectJson=createReject(baseDir,federationList, \
nicknameToFollow,domainToFollow,port, \ followRequestJsonFilename= \
personUrl,'',httpPrefix,followJson) baseDir+'/accounts/'+ \
nicknameToFollow+'@'+domainToFollow+'/requests/'+ \
nickname+'@'+domain+'.follow'
followJson=loadJson(followRequestJsonFilename)
if not followJson:
print('No follow request json was found for '+ \
followRequestJsonFilename)
return None
personUrl=followJson['actor']
rejectJson= \
createReject(baseDir,federationList, \
nicknameToFollow,domainToFollow,port, \
personUrl,'',httpPrefix,followJson)
if debug: if debug:
pprint(rejectJson) pprint(rejectJson)
print('DEBUG: sending follow Reject from '+ \ print('DEBUG: sending follow Reject from '+ \

17
manualapprove.py
View File

@ -50,16 +50,13 @@ def manualDenyFollowRequest(session,baseDir: str, \
if ':' in denyDomain: if ':' in denyDomain:
denyPort=denyDomain.split(':')[1] denyPort=denyDomain.split(':')[1]
denyDomain=denyDomain.split(':')[0] denyDomain=denyDomain.split(':')[0]
# TODO followedAccountRejects(session,baseDir,httpPrefix, \
#followJson= nickname,domain,port, \
#followedAccountRejects(session,baseDir,httpPrefix, \ denyNickname,denyDomain,denyPort, \
# nickname,domain,port, \ federationList, \
# denyNickname,denyDomain,denyPort, \ sendThreads,postLog, \
# followJson['actor'],federationList, \ cachedWebfingers,personCache, \
# followJson, \ debug,projectVersion)
# sendThreads,postLog, \
# cachedWebfingers,personCache, \
# debug,projectVersion)
print('Follow request from '+denyHandle+' was denied.') print('Follow request from '+denyHandle+' was denied.')