5 files changed, 72 insertions, 4 deletions

diff --git a/server/lib/activitypub/actors/get.ts b/server/lib/activitypub/actors/get.ts
index 0d5bea789..e7e87a967 100644
--- a/server/lib/activitypub/actors/get.ts
+++ b/server/lib/activitypub/actors/get.ts
@@ -1,9 +1,9 @@
 
 import { checkUrlsSameHost, getAPId } from '@server/helpers/activitypub'
-import { ActorFetchByUrlType, fetchActorByUrl } from '@server/helpers/actor'
 import { retryTransactionWrapper } from '@server/helpers/database-utils'
 import { logger } from '@server/helpers/logger'
 import { JobQueue } from '@server/lib/job-queue'
+import { ActorFetchByUrlType, fetchActorByUrl } from '@server/lib/model-loaders'
 import { MActor, MActorAccountChannelId, MActorAccountChannelIdActor, MActorAccountId, MActorFullActor } from '@server/types/models'
 import { ActivityPubActor } from '@shared/models'
 import { refreshActorIfNeeded } from './refresh'
diff --git a/server/lib/activitypub/actors/index.ts b/server/lib/activitypub/actors/index.ts
index a54da6798..5ee2a6f1a 100644
--- a/server/lib/activitypub/actors/index.ts
+++ b/server/lib/activitypub/actors/index.ts
@@ -3,3 +3,4 @@ export * from './image'
 export * from './keys'
 export * from './refresh'
 export * from './updater'
+export * from './webfinger'
diff --git a/server/lib/activitypub/actors/refresh.ts b/server/lib/activitypub/actors/refresh.ts
index ff3b249d0..9f2289bfa 100644
--- a/server/lib/activitypub/actors/refresh.ts
+++ b/server/lib/activitypub/actors/refresh.ts
@@ -1,12 +1,12 @@
-import { ActorFetchByUrlType } from '@server/helpers/actor'
 import { logger } from '@server/helpers/logger'
 import { PeerTubeRequestError } from '@server/helpers/requests'
-import { getUrlFromWebfinger } from '@server/helpers/webfinger'
+import { ActorFetchByUrlType } from '@server/lib/model-loaders'
 import { ActorModel } from '@server/models/actor/actor'
 import { MActorAccountChannelId, MActorFull } from '@server/types/models'
 import { HttpStatusCode } from '@shared/core-utils'
 import { fetchRemoteActor } from './shared'
 import { APActorUpdater } from './updater'
+import { getUrlFromWebfinger } from './webfinger'
 
 async function refreshActorIfNeeded <T extends MActorFull | MActorAccountChannelId> (
   actorArg: T,
diff --git a/server/lib/activitypub/actors/shared/index.ts b/server/lib/activitypub/actors/shared/index.ts
index a2ff468cf..52af1a8e1 100644
--- a/server/lib/activitypub/actors/shared/index.ts
+++ b/server/lib/activitypub/actors/shared/index.ts
@@ -1,3 +1,3 @@
 export * from './creator'
-export * from './url-to-object'
 export * from './object-to-model-attributes'
+export * from './url-to-object'
diff --git a/server/lib/activitypub/actors/webfinger.ts b/server/lib/activitypub/actors/webfinger.ts
new file mode 100644
index 000000000..cf8eddfc7
--- /dev/null
+++ b/server/lib/activitypub/actors/webfinger.ts
@@ -0,0 +1,67 @@
+import * as WebFinger from 'webfinger.js'
+import { isTestInstance } from '@server/helpers/core-utils'
+import { isActivityPubUrlValid } from '@server/helpers/custom-validators/activitypub/misc'
+import { WEBSERVER } from '@server/initializers/constants'
+import { ActorModel } from '@server/models/actor/actor'
+import { MActorFull } from '@server/types/models'
+import { WebFingerData } from '@shared/models'
+
+const webfinger = new WebFinger({
+  webfist_fallback: false,
+  tls_only: isTestInstance(),
+  uri_fallback: false,
+  request_timeout: 3000
+})
+
+async function loadActorUrlOrGetFromWebfinger (uriArg: string) {
+  // Handle strings like @toto@example.com
+  const uri = uriArg.startsWith('@') ? uriArg.slice(1) : uriArg
+
+  const [ name, host ] = uri.split('@')
+  let actor: MActorFull
+
+  if (!host || host === WEBSERVER.HOST) {
+    actor = await ActorModel.loadLocalByName(name)
+  } else {
+    actor = await ActorModel.loadByNameAndHost(name, host)
+  }
+
+  if (actor) return actor.url
+
+  return getUrlFromWebfinger(uri)
+}
+
+async function getUrlFromWebfinger (uri: string) {
+  const webfingerData: WebFingerData = await webfingerLookup(uri)
+  return getLinkOrThrow(webfingerData)
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  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) => {
+      if (err) return rej(err)
+
+      return res(p.object)
+    })
+  })
+}