master
Bob Mottram 2019-08-23 17:32:44 +01:00
parent 361fbf9e0f
commit a162c1f46d
2 changed files with 5 additions and 6 deletions

View File

@ -815,12 +815,11 @@ if args.actor:
else: else:
httpPrefix='https' httpPrefix='https'
port=443 port=443
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, \
domain,__version__) domain,__version__)
if not wfRequest: if not wfRequest:
print('Unable to webfinger '+nickname+'@'+domain) print('Unable to webfinger '+nickname+'@'+domain)
sys.exit() sys.exit()

View File

@ -984,7 +984,7 @@ def sendPost(projectVersion: str, \
return 2 return 2
else: else:
if noOfFollowersOnDomain(baseDir,handle,toDomain)>1 and sharedInbox: if noOfFollowersOnDomain(baseDir,handle,toDomain)>1 and sharedInbox:
inboxUrl=sharedInbox.replace('/inbox','/'+toDomainOriginal) inboxUrl=sharedInbox.replace('/inbox','/users/'+toDomainOriginal)
if not inboxUrl: if not inboxUrl:
return 3 return 3
@ -1214,7 +1214,7 @@ def sendSignedJson(postJsonObject: {},session,baseDir: str, \
return 2 return 2
else: else:
if sharedInbox and sharedInboxUrl: if sharedInbox and sharedInboxUrl:
inboxUrl=sharedInboxUrl.replace('/inbox','/'+toDomainOriginal) inboxUrl=sharedInboxUrl.replace('/inbox','/users/'+toDomainOriginal)
if not inboxUrl: if not inboxUrl:
if debug: if debug: