import * as WebFinger from 'webfinger.js'
import { WebFingerData } from '../../shared'
-import { fetchRemoteAccount } from '../lib/activitypub/account'
-
+import { ActorModel } from '../models/activitypub/actor'
import { isTestInstance } from './core-utils'
-import { isActivityPubUrlValid } from './custom-validators'
+import { isActivityPubUrlValid } from './custom-validators/activitypub/misc'
const webfinger = new WebFinger({
webfist_fallback: false,
request_timeout: 3000
})
-async function getAccountFromWebfinger (nameWithHost: string) {
- const webfingerData: WebFingerData = await webfingerLookup(nameWithHost)
-
- if (Array.isArray(webfingerData.links) === false) throw new Error('WebFinger links is not an array.')
+async function loadActorUrlOrGetFromWebfinger (name: string, host: string) {
+ const actor = await ActorModel.loadByNameAndHost(name, host)
+ if (actor) return actor.url
- const selfLink = webfingerData.links.find(l => l.rel === 'self')
- if (selfLink === undefined || isActivityPubUrlValid(selfLink.href) === false) {
- throw new Error('Cannot find self link or href is not a valid URL.')
- }
-
- const account = await fetchRemoteAccount(selfLink.href)
- if (account === undefined) throw new Error('Cannot fetch remote account ' + selfLink.href)
+ return getUrlFromWebfinger(name, host)
+}
- return account
+async function getUrlFromWebfinger (name: string, host: string) {
+ const webfingerData: WebFingerData = await webfingerLookup(name + '@' + host)
+ return getLinkOrThrow(webfingerData)
}
// ---------------------------------------------------------------------------
export {
- getAccountFromWebfinger
+ getUrlFromWebfinger,
+ loadActorUrlOrGetFromWebfinger
}
// ---------------------------------------------------------------------------
+function getLinkOrThrow (webfingerData: WebFingerData) {
+ if (Array.isArray(webfingerData.links) === false) throw new Error('WebFinger links is not an array.')
+
+ const selfLink = webfingerData.links.find(l => l.rel === 'self')
+ if (selfLink === undefined || isActivityPubUrlValid(selfLink.href) === false) {
+ throw new Error('Cannot find self link or href is not a valid URL.')
+ }
+
+ return selfLink.href
+}
+
function webfingerLookup (nameWithHost: string) {
return new Promise<WebFingerData>((res, rej) => {
webfinger.lookup(nameWithHost, (err, p) => {