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

Formatting

merge-requests/30/head
Bob Mottram 2020-09-03 10:58:32 +01:00
parent ed2aafc8cf
commit 89f410a904
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
acceptreject.py
View File

@ -40,7 +40,7 @@ def createAcceptReject(baseDir: str, federationList: [],
newAccept = { newAccept = {
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
'type': acceptType, 'type': acceptType,
'actor': httpPrefix+'://'+domain+'/users/'+nickname, 'actor': httpPrefix+'://' + domain + '/users/' + nickname,
'to': [toUrl], 'to': [toUrl],
'cc': [], 'cc': [],
'object': objectJson 'object': objectJson
@ -107,33 +107,33 @@ def acceptFollow(baseDir: str, domain: str, messageJson: {},
thisActor = messageJson['object']['actor'] thisActor = messageJson['object']['actor']
nickname = getNicknameFromActor(thisActor) nickname = getNicknameFromActor(thisActor)
if not nickname: if not nickname:
print('WARN: no nickname found in '+thisActor) print('WARN: no nickname found in ' + thisActor)
return return
acceptedDomain, acceptedPort = getDomainFromActor(thisActor) acceptedDomain, acceptedPort = getDomainFromActor(thisActor)
if not acceptedDomain: if not acceptedDomain:
if debug: if debug:
print('DEBUG: domain not found in '+thisActor) print('DEBUG: domain not found in ' + thisActor)
return return
if not nickname: if not nickname:
if debug: if debug:
print('DEBUG: nickname not found in '+thisActor) print('DEBUG: nickname not found in ' + thisActor)
return return
if acceptedPort: if acceptedPort:
if '/' + acceptedDomain + ':' + str(acceptedPort) + \ if '/' + acceptedDomain + ':' + str(acceptedPort) + \
'/users/' + nickname not in thisActor: '/users/' + nickname not in thisActor:
if debug: if debug:
print('Port: '+str(acceptedPort)) print('Port: ' + str(acceptedPort))
print('Expected: /' + acceptedDomain + ':' + print('Expected: /' + acceptedDomain + ':' +
str(acceptedPort) + '/users/'+nickname) str(acceptedPort) + '/users/' + nickname)
print('Actual: '+thisActor) print('Actual: ' + thisActor)
print('DEBUG: unrecognized actor '+thisActor) print('DEBUG: unrecognized actor ' + thisActor)
return return
else: else:
if not '/' + acceptedDomain+'/users/' + nickname in thisActor: if not '/' + acceptedDomain+'/users/' + nickname in thisActor:
if debug: if debug:
print('Expected: /'+acceptedDomain+'/users/'+nickname) print('Expected: /' + acceptedDomain+'/users/' + nickname)
print('Actual: '+thisActor) print('Actual: ' + thisActor)
print('DEBUG: unrecognized actor '+thisActor) print('DEBUG: unrecognized actor ' + thisActor)
return return
followedActor = messageJson['object']['object'] followedActor = messageJson['object']['object']
followedDomain, port = getDomainFromActor(followedActor) followedDomain, port = getDomainFromActor(followedActor)