Set domain for webfinger

merge-requests/30/head
Bob Mottram 2021-09-08 13:34:13 +01:00
parent 674b75b29e
commit aa7edaa2c4
3 changed files with 6 additions and 3 deletions

View File

@ -2040,13 +2040,16 @@ if args.followers:
if nickname == 'inbox': if nickname == 'inbox':
nickname = domain nickname = domain
hostDomain = None
if args.domain:
hostDomain = args.domain
handle = nickname + '@' + domain handle = nickname + '@' + domain
signingPrivateKeyPem = None signingPrivateKeyPem = None
if args.secureMode: if args.secureMode:
signingPrivateKeyPem = getInstanceActorKey(baseDir, domain) signingPrivateKeyPem = getInstanceActorKey(baseDir, domain)
wfRequest = webfingerHandle(session, handle, wfRequest = webfingerHandle(session, handle,
httpPrefix, cachedWebfingers, httpPrefix, cachedWebfingers,
None, __version__, debug, False, hostDomain, __version__, debug, False,
signingPrivateKeyPem) signingPrivateKeyPem)
if not wfRequest: if not wfRequest:
print('Unable to webfinger ' + handle) print('Unable to webfinger ' + handle)

View File

@ -60,7 +60,7 @@ def _updateMovedHandle(baseDir: str, nickname: str, domain: str,
handle = handle[1:] handle = handle[1:]
wfRequest = webfingerHandle(session, handle, wfRequest = webfingerHandle(session, handle,
httpPrefix, cachedWebfingers, httpPrefix, cachedWebfingers,
None, __version__, debug, False, domain, __version__, debug, False,
signingPrivateKeyPem) signingPrivateKeyPem)
if not wfRequest: if not wfRequest:
print('updateMovedHandle unable to webfinger ' + handle) print('updateMovedHandle unable to webfinger ' + handle)

View File

@ -2810,7 +2810,7 @@ def _hasSharedInbox(session, httpPrefix: str, domain: str,
tryHandles.append('inbox@' + domain) tryHandles.append('inbox@' + domain)
for handle in tryHandles: for handle in tryHandles:
wfRequest = webfingerHandle(session, handle, httpPrefix, {}, wfRequest = webfingerHandle(session, handle, httpPrefix, {},
None, __version__, debug, False, domain, __version__, debug, False,
signingPrivateKeyPem) signingPrivateKeyPem)
if wfRequest: if wfRequest:
if isinstance(wfRequest, dict): if isinstance(wfRequest, dict):