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

Instance actor url

master
Bob Mottram 2019-08-26 16:20:14 +01:00
parent 641c1fabe5
commit 3a993e5d49
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epicyon.py
View File

@ -833,6 +833,7 @@ if args.actor:
session=createSession(domain,port,useTor) session=createSession(domain,port,useTor)
if nickname=='inbox': if nickname=='inbox':
nickname=domain nickname=domain
wfRequest=webfingerHandle(session,nickname+'@'+domain,httpPrefix,wfCache, \ wfRequest=webfingerHandle(session,nickname+'@'+domain,httpPrefix,wfCache, \
None,__version__) None,__version__)
if not wfRequest: if not wfRequest:

4
person.py
View File

@ -149,10 +149,12 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
personName=nickname personName=nickname
personId=httpPrefix+'://'+domain+'/users/'+nickname personId=httpPrefix+'://'+domain+'/users/'+nickname
inboxStr=personId+'/inbox' inboxStr=personId+'/inbox'
personUrl=httpPrefix+'://'+domain+'/@'+personName
if nickname=='inbox': if nickname=='inbox':
# shared inbox # shared inbox
inboxStr=httpPrefix+'://'+domain+'/actor/inbox' inboxStr=httpPrefix+'://'+domain+'/actor/inbox'
personId=httpPrefix+'://'+domain+'/actor' personId=httpPrefix+'://'+domain+'/actor'
personUrl=httpPrefix+'://'+domain+'/about/more?instance_actor=true'
personName=originalDomain personName=originalDomain
approveFollowers=True approveFollowers=True
personType='Application' personType='Application'
@ -202,7 +204,7 @@ def createPersonBase(baseDir: str,nickname: str,domain: str,port: int, \
}, },
'tag': [], 'tag': [],
'type': personType, 'type': personType,
'url': httpPrefix+'://'+domain+'/@'+personName 'url': personUrl
} }
if nickname=='inbox': if nickname=='inbox':

6
webfinger.py
View File

@ -111,11 +111,13 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
personName=nickname personName=nickname
personId=httpPrefix+"://"+domain+"/users/"+personName personId=httpPrefix+"://"+domain+"/users/"+personName
subjectStr="acct:"+personName+"@"+originalDomain subjectStr="acct:"+personName+"@"+originalDomain
profilePageHref=httpPrefix+"://"+domain+"/@"+nickname
if nickname=='inbox' or nickname==originalDomain: if nickname=='inbox' or nickname==originalDomain:
personName='actor' personName='actor'
personId=httpPrefix+"://"+domain+"/"+personName personId=httpPrefix+"://"+domain+"/"+personName
subjectStr="acct:"+originalDomain+"@"+originalDomain subjectStr="acct:"+originalDomain+"@"+originalDomain
profilePageHref=httpPrefix+'://'+domain+'/about/more?instance_actor=true'
account = { account = {
"aliases": [ "aliases": [
httpPrefix+"://"+domain+"/@"+personName, httpPrefix+"://"+domain+"/@"+personName,
@ -123,7 +125,7 @@ def createWebfingerEndpoint(nickname: str,domain: str,port: int, \
], ],
"links": [ "links": [
{ {
"href": httpPrefix+"://"+domain+"/@"+nickname, "href": profilePageHref,
"rel": "http://webfinger.net/rel/profile-page", "rel": "http://webfinger.net/rel/profile-page",
"type": "text/html" "type": "text/html"
}, },