8 files changed, 9 insertions, 16 deletions

diff --git a/server/middlewares/activitypub.ts b/server/middlewares/activitypub.ts
index bed2bfeab..0ea522e5c 100644
--- a/server/middlewares/activitypub.ts
+++ b/server/middlewares/activitypub.ts
@@ -1,7 +1,7 @@
 import { NextFunction, Request, Response, RequestHandler } from 'express'
 import { ActivityPubSignature } from '../../shared'
 import { isSignatureVerified, logger } from '../helpers'
-import { fetchRemoteAccountAndCreatePod } from '../helpers/activitypub'
+import { fetchRemoteAccountAndCreateServer } from '../helpers/activitypub'
 import { database as db, ACTIVITY_PUB_ACCEPT_HEADER } from '../initializers'
 import { each, eachSeries, waterfall } from 'async'
 
@@ -14,7 +14,7 @@ async function checkSignature (req: Request, res: Response, next: NextFunction)
 
   // We don't have this account in our database, fetch it on remote
   if (!account) {
-    const accountResult = await fetchRemoteAccountAndCreatePod(signatureObject.creator)
+    const accountResult = await fetchRemoteAccountAndCreateServer(signatureObject.creator)
 
     if (!accountResult) {
       return res.sendStatus(403)
diff --git a/server/middlewares/index.ts b/server/middlewares/index.ts
index 40480450b..aafcad2d9 100644
--- a/server/middlewares/index.ts
+++ b/server/middlewares/index.ts
@@ -3,7 +3,7 @@ export * from './activitypub'
 export * from './async'
 export * from './oauth'
 export * from './pagination'
-export * from './pods'
+export * from './servers'
 export * from './search'
 export * from './sort'
 export * from './user-right'
diff --git a/server/middlewares/pods.ts b/server/middlewares/servers.ts
index eaf9aa144..eaf9aa144 100644
--- a/server/middlewares/pods.ts
+++ b/server/middlewares/servers.ts
diff --git a/server/middlewares/sort.ts b/server/middlewares/sort.ts
index 20ae341f0..279b29e65 100644
--- a/server/middlewares/sort.ts
+++ b/server/middlewares/sort.ts
@@ -4,12 +4,6 @@ import * as express from 'express'
 import { SortType } from '../helpers'
 import { database } from '../initializers'
 
-function setPodsSort (req: express.Request, res: express.Response, next: express.NextFunction) {
-  if (!req.query.sort) req.query.sort = '-createdAt'
-
-  return next()
-}
-
 function setUsersSort (req: express.Request, res: express.Response, next: express.NextFunction) {
   if (!req.query.sort) req.query.sort = '-createdAt'
 
@@ -70,7 +64,6 @@ function setBlacklistSort (req: express.Request, res: express.Response, next: ex
 // ---------------------------------------------------------------------------
 
 export {
-  setPodsSort,
   setUsersSort,
   setVideoAbusesSort,
   setVideoChannelsSort,
diff --git a/server/middlewares/validators/index.ts b/server/middlewares/validators/index.ts
index 92a4bad28..3f5afe5b3 100644
--- a/server/middlewares/validators/index.ts
+++ b/server/middlewares/validators/index.ts
@@ -2,7 +2,7 @@ export * from './account'
 export * from './oembed'
 export * from './activitypub'
 export * from './pagination'
-export * from './pods'
+export * from './servers'
 export * from './sort'
 export * from './users'
 export * from './videos'
diff --git a/server/middlewares/validators/pods.ts b/server/middlewares/validators/servers.ts
index e17369a6f..95b69b789 100644
--- a/server/middlewares/validators/pods.ts
+++ b/server/middlewares/validators/servers.ts
@@ -1,6 +1,6 @@
 import * as express from 'express'
 import { body } from 'express-validator/check'
-import { isEachUniqueHostValid } from '../../helpers/custom-validators/pods'
+import { isEachUniqueHostValid } from '../../helpers/custom-validators/servers'
 import { isTestInstance } from '../../helpers/core-utils'
 import { CONFIG } from '../../initializers/constants'
 import { logger } from '../../helpers/logger'
diff --git a/server/middlewares/validators/video-channels.ts b/server/middlewares/validators/video-channels.ts
index 53416a857..f0ead24e3 100644
--- a/server/middlewares/validators/video-channels.ts
+++ b/server/middlewares/validators/video-channels.ts
@@ -50,7 +50,7 @@ const videoChannelsUpdateValidator = [
         // We need to make additional checks
         if (res.locals.videoChannel.isOwned() === false) {
           return res.status(403)
-            .json({ error: 'Cannot update video channel of another pod' })
+            .json({ error: 'Cannot update video channel of another server' })
             .end()
         }
 
@@ -113,7 +113,7 @@ function checkUserCanDeleteVideoChannel (res: express.Response, callback: () =>
   // Retrieve the user who did the request
   if (res.locals.videoChannel.isOwned() === false) {
     return res.status(403)
-              .json({ error: 'Cannot remove video channel of another pod.' })
+              .json({ error: 'Cannot remove video channel of another server.' })
               .end()
   }
 
diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts
index 10b426df3..158b475e3 100644
--- a/server/middlewares/validators/videos.ts
+++ b/server/middlewares/validators/videos.ts
@@ -127,7 +127,7 @@ const videosUpdateValidator = [
         // We need to make additional checks
         if (video.isOwned() === false) {
           return res.status(403)
-                    .json({ error: 'Cannot update video of another pod' })
+                    .json({ error: 'Cannot update video of another server' })
                     .end()
         }
 
@@ -250,7 +250,7 @@ function checkUserCanDeleteVideo (userId: number, res: express.Response, callbac
   // Retrieve the user who did the request
   if (res.locals.video.isOwned() === false) {
     return res.status(403)
-              .json({ error: 'Cannot remove video of another pod, blacklist it' })
+              .json({ error: 'Cannot remove video of another server, blacklist it' })
               .end()
   }