Move middleware utils in middlewares

helpers modules should not import models

1 files changed, 0 insertions, 67 deletions

diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts
deleted file mode 100644
index 33367f651..000000000
--- a/server/helpers/webfinger.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import * as WebFinger from 'webfinger.js'
-import { WebFingerData } from '../../shared'
-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'
-
-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)
-    })
-  })
-}