X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fwebfinger.ts;h=da7e880778a07e03abaebe93369f1e395dcfd466;hb=d223dca0cd50010d1c4455e5eec1736b1c591aed;hp=049808846d551b2caad574bf1eeefaf613a486f8;hpb=97567dd81f508dd6295ac4d73d849aa2ce0a6549;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts index 049808846..da7e88077 100644 --- a/server/helpers/webfinger.ts +++ b/server/helpers/webfinger.ts @@ -4,6 +4,7 @@ import { ActorModel } from '../models/activitypub/actor' import { isTestInstance } from './core-utils' import { isActivityPubUrlValid } from './custom-validators/activitypub/misc' import { WEBSERVER } from '../initializers/constants' +import { MActorFull } from '../types/models' const webfinger = new WebFinger({ webfist_fallback: false, @@ -17,9 +18,9 @@ async function loadActorUrlOrGetFromWebfinger (uriArg: string) { const uri = uriArg.startsWith('@') ? uriArg.slice(1) : uriArg const [ name, host ] = uri.split('@') - let actor: ActorModel + let actor: MActorFull - if (host === WEBSERVER.HOST) { + if (!host || host === WEBSERVER.HOST) { actor = await ActorModel.loadLocalByName(name) } else { actor = await ActorModel.loadByNameAndHost(name, host)