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

Changing properties of the shared inbox

master
Bob Mottram 2019-08-23 20:37:40 +01:00
parent f008af1776
commit fc925e7705
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epicyon.py
View File

@ -826,6 +826,9 @@ if args.actor:
asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'} asHeader = {'Accept': 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"'}
personUrl = getUserUrl(wfRequest) personUrl = getUserUrl(wfRequest)
if nickname==domain:
personUrl=personUrl.replace('/users/','/actor/')
#print('personUrl: '+personUrl)
personJson = getJson(session,personUrl,asHeader,None,__version__,httpPrefix,domain) personJson = getJson(session,personUrl,asHeader,None,__version__,httpPrefix,domain)
if personJson: if personJson:
pprint(personJson) pprint(personJson)

28
person.py
View File

@ -137,11 +137,25 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
storeWebfingerEndpoint(nickname,domain,port,baseDir,webfingerEndpoint) storeWebfingerEndpoint(nickname,domain,port,baseDir,webfingerEndpoint)
handle=nickname.lower()+'@'+domain.lower() handle=nickname.lower()+'@'+domain.lower()
originalDomain=domain
if port: if port:
if port!=80 and port!=443: if port!=80 and port!=443:
if ':' not in domain: if ':' not in domain:
domain=domain+':'+str(port) domain=domain+':'+str(port)
personType='Person'
approveFollowers=False
personName=nickname
inboxStr=httpPrefix+'://'+domain+'/users/'+nickname+'/inbox'
personId=httpPrefix+'://'+domain+'/users/'+nickname
if nickname=='inbox':
# shared inbox
inboxStr=httpPrefix+'://'+domain+'/actor/inbox'
personId=httpPrefix+'://'+domain+'/actor'
personName=originalDomain
approveFollowers=True
personType='Application'
newPerson = {'@context': ['https://www.w3.org/ns/activitystreams', newPerson = {'@context': ['https://www.w3.org/ns/activitystreams',
'https://w3id.org/security/v1', 'https://w3id.org/security/v1',
{'Emoji': 'toot:Emoji', {'Emoji': 'toot:Emoji',
@ -171,15 +185,15 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
'icon': {'mediaType': 'image/png', 'icon': {'mediaType': 'image/png',
'type': 'Image', 'type': 'Image',
'url': httpPrefix+'://'+domain+'/users/'+nickname+'/avatar.png'}, 'url': httpPrefix+'://'+domain+'/users/'+nickname+'/avatar.png'},
'id': httpPrefix+'://'+domain+'/users/'+nickname, 'id': personId,
'image': {'mediaType': 'image/png', 'image': {'mediaType': 'image/png',
'type': 'Image', 'type': 'Image',
'url': httpPrefix+'://'+domain+'/users/'+nickname+'/image.png'}, 'url': httpPrefix+'://'+domain+'/users/'+nickname+'/image.png'},
'inbox': httpPrefix+'://'+domain+'/users/'+nickname+'/inbox', 'inbox': inboxStr,
'manuallyApprovesFollowers': False, 'manuallyApprovesFollowers': approveFollowers,
'name': nickname, 'name': personName,
'outbox': httpPrefix+'://'+domain+'/users/'+nickname+'/outbox', 'outbox': httpPrefix+'://'+domain+'/users/'+nickname+'/outbox',
'preferredUsername': nickname, 'preferredUsername': personName,
'summary': '', 'summary': '',
'publicKey': { 'publicKey': {
'id': httpPrefix+'://'+domain+'/users/'+nickname+'#main-key', 'id': httpPrefix+'://'+domain+'/users/'+nickname+'#main-key',
@ -187,8 +201,8 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
'publicKeyPem': publicKeyPem 'publicKeyPem': publicKeyPem
}, },
'tag': [], 'tag': [],
'type': 'Person', 'type': personType,
'url': httpPrefix+'://'+domain+'/@'+nickname 'url': httpPrefix+'://'+domain+'/@'+personName
} }
if saveToFile: if saveToFile: