X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fwebfinger.ts;h=33367f651793fd3b053390e929d5f5f411162c9a;hb=1f256e7d3cf056c2d999260155cdba58ae1b878b;hp=d1229e28f4b8b6507acefa93c67291b1138a1260;hpb=cce1b3dfd386c77a02f2b4f18f60bd916a60a2d3;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts index d1229e28f..33367f651 100644 --- a/server/helpers/webfinger.ts +++ b/server/helpers/webfinger.ts @@ -1,9 +1,10 @@ import * as WebFinger from 'webfinger.js' import { WebFingerData } from '../../shared' -import { ActorModel } from '../models/activitypub/actor' +import { WEBSERVER } from '../initializers/constants' +import { ActorModel } from '../models/actor/actor' +import { MActorFull } from '../types/models' import { isTestInstance } from './core-utils' import { isActivityPubUrlValid } from './custom-validators/activitypub/misc' -import { WEBSERVER } from '../initializers/constants' const webfinger = new WebFinger({ webfist_fallback: false, @@ -17,7 +18,7 @@ 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 || host === WEBSERVER.HOST) { actor = await ActorModel.loadLocalByName(name)