6 files changed, 16 insertions, 16 deletions

diff --git a/server/helpers/activitypub.ts b/server/helpers/activitypub.ts
index b91490a0b..3e77e0581 100644
--- a/server/helpers/activitypub.ts
+++ b/server/helpers/activitypub.ts
@@ -35,7 +35,7 @@ async function getOrCreateAccount (accountUrl: string) {
 
   // We don't have this account in our database, fetch it on remote
   if (!account) {
-    const res = await fetchRemoteAccountAndCreatePod(accountUrl)
+    const res = await fetchRemoteAccountAndCreateServer(accountUrl)
     if (res === undefined) throw new Error('Cannot fetch remote account.')
 
     // Save our new account in database
@@ -46,7 +46,7 @@ async function getOrCreateAccount (accountUrl: string) {
   return account
 }
 
-async function fetchRemoteAccountAndCreatePod (accountUrl: string) {
+async function fetchRemoteAccountAndCreateServer (accountUrl: string) {
   const options = {
     uri: accountUrl,
     method: 'GET',
@@ -90,7 +90,7 @@ async function fetchRemoteAccountAndCreatePod (accountUrl: string) {
   })
 
   const accountHost = url.parse(account.url).host
-  const podOptions = {
+  const serverOptions = {
     where: {
       host: accountHost
     },
@@ -98,15 +98,15 @@ async function fetchRemoteAccountAndCreatePod (accountUrl: string) {
       host: accountHost
     }
   }
-  const [ pod ] = await db.Pod.findOrCreate(podOptions)
-  account.set('podId', pod.id)
+  const [ server ] = await db.Server.findOrCreate(serverOptions)
+  account.set('serverId', server.id)
 
-  return { account, pod }
+  return { account, server }
 }
 
 function fetchRemoteVideoPreview (video: VideoInstance) {
   // FIXME: use url
-  const host = video.VideoChannel.Account.Pod.host
+  const host = video.VideoChannel.Account.Server.host
   const path = join(STATIC_PATHS.PREVIEWS, video.getPreviewName())
 
   return request.get(REMOTE_SCHEME.HTTP + '://' + host + path)
@@ -163,7 +163,7 @@ function activityPubCollectionPagination (url: string, page: number, result: Res
 // ---------------------------------------------------------------------------
 
 export {
-  fetchRemoteAccountAndCreatePod,
+  fetchRemoteAccountAndCreateServer,
   activityPubContextify,
   activityPubCollectionPagination,
   getActivityPubUrl,
diff --git a/server/helpers/custom-validators/accounts.ts b/server/helpers/custom-validators/accounts.ts
index 6d6219a95..088d5fc8f 100644
--- a/server/helpers/custom-validators/accounts.ts
+++ b/server/helpers/custom-validators/accounts.ts
@@ -8,7 +8,7 @@ import { AccountInstance } from '../../models'
 import { logger } from '../logger'
 
 import { isUserUsernameValid } from './users'
-import { isHostValid } from './pods'
+import { isHostValid } from './servers'
 
 function isAccountNameValid (value: string) {
   return isUserUsernameValid(value)
diff --git a/server/helpers/custom-validators/index.ts b/server/helpers/custom-validators/index.ts
index 1c475e301..d3b2f5393 100644
--- a/server/helpers/custom-validators/index.ts
+++ b/server/helpers/custom-validators/index.ts
@@ -1,7 +1,7 @@
 export * from './activitypub'
 export * from './misc'
-export * from './pods'
-export * from './pods'
+export * from './servers'
+export * from './servers'
 export * from './users'
 export * from './accounts'
 export * from './video-channels'
diff --git a/server/helpers/custom-validators/pods.ts b/server/helpers/custom-validators/servers.ts
index d5021bf38..d5021bf38 100644
--- a/server/helpers/custom-validators/pods.ts
+++ b/server/helpers/custom-validators/servers.ts
diff --git a/server/helpers/custom-validators/videos.ts b/server/helpers/custom-validators/videos.ts
index 715119cf6..d68de6609 100644
--- a/server/helpers/custom-validators/videos.ts
+++ b/server/helpers/custom-validators/videos.ts
@@ -171,9 +171,9 @@ function isVideoFileInfoHashValid (value: string) {
 function checkVideoExists (id: string, res: express.Response, callback: () => void) {
   let promise: Promise<VideoInstance>
   if (validator.isInt(id)) {
-    promise = db.Video.loadAndPopulateAccountAndPodAndTags(+id)
+    promise = db.Video.loadAndPopulateAccountAndServerAndTags(+id)
   } else { // UUID
-    promise = db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(id)
+    promise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(id)
   }
 
   promise.then(video => {
diff --git a/server/helpers/webfinger.ts b/server/helpers/webfinger.ts
index 0155e5f3e..31417e728 100644
--- a/server/helpers/webfinger.ts
+++ b/server/helpers/webfinger.ts
@@ -3,7 +3,7 @@ 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 { fetchRemoteAccountAndCreateServer } from './activitypub'
 
 const webfinger = new WebFinger({
   webfist_fallback: false,
@@ -22,8 +22,8 @@ async function getAccountFromWebfinger (nameWithHost: string) {
     throw new Error('Cannot find self link or href is not a valid URL.')
   }
 
-  const res = await fetchRemoteAccountAndCreatePod(selfLink.href)
-  if (res === undefined) throw new Error('Cannot fetch and create pod of remote account ' + selfLink.href)
+  const res = await fetchRemoteAccountAndCreateServer(selfLink.href)
+  if (res === undefined) throw new Error('Cannot fetch and create server of remote account ' + selfLink.href)
 
   return res.account
 }