X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fwebfinger.ts;h=688bf2bab8106ed1f2983e4f511799e5d062d2d3;hb=276d03ed1a469fd4e3579f92392b6f9a1567d1ca;hp=9586fa5624b568c1eb2052ef8eec54028bf3f978;hpb=e4f97babf701481b55cc10fb3448feab5f97c867;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts
index 9586fa562..688bf2bab 100644
--- a/server/helpers/webfinger.ts
+++ b/server/helpers/webfinger.ts
@@ -1,9 +1,8 @@
 import * as WebFinger from 'webfinger.js'
-
-import { isTestInstance } from './core-utils'
-import { isActivityPubUrlValid } from './custom-validators'
 import { WebFingerData } from '../../shared'
-import { fetchRemoteAccountAndCreatePod } from './activitypub'
+import { ActorModel } from '../models/activitypub/actor'
+import { isTestInstance } from './core-utils'
+import { isActivityPubUrlValid } from './custom-validators/activitypub/misc'
 
 const webfinger = new WebFinger({
   webfist_fallback: false,
@@ -12,33 +11,44 @@ const webfinger = new WebFinger({
   request_timeout: 3000
 })
 
-async function getAccountFromWebfinger (url: string) {
-  const webfingerData: WebFingerData = await webfingerLookup(url)
-
-  if (Array.isArray(webfingerData.links) === false) return undefined
-
-  const selfLink = webfingerData.links.find(l => l.rel === 'self')
-  if (selfLink === undefined || isActivityPubUrlValid(selfLink.href) === false) return undefined
+async function loadActorUrlOrGetFromWebfinger (name: string, host: string) {
+  const actor = await ActorModel.loadByNameAndHost(name, host)
+  if (actor) return actor.url
 
-  const { account } = await fetchRemoteAccountAndCreatePod(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 webfingerLookup (url: string) {
+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('nick@silverbucket.net', (err, p) => {
+    webfinger.lookup(nameWithHost, (err, p) => {
       if (err) return rej(err)
 
-      return p
+      return res(p.object)
     })
   })
 }