Rename Pod -> Server

10 files changed, 13 insertions, 360 deletions

diff --git a/server/controllers/activitypub/pods.ts b/server/controllers/activitypub/pods.ts
deleted file mode 100644
index 6cce57c1c..000000000
--- a/server/controllers/activitypub/pods.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// import * as express from 'express'
-//
-// import { database as db } from '../../../initializers/database'
-// import {
-//   checkSignature,
-//   signatureValidator,
-//   setBodyHostPort,
-//   remotePodsAddValidator,
-//   asyncMiddleware
-// } from '../../../middlewares'
-// import { sendOwnedDataToPod } from '../../../lib'
-// import { getMyPublicCert, getFormattedObjects } from '../../../helpers'
-// import { CONFIG } from '../../../initializers'
-// import { PodInstance } from '../../../models'
-// import { PodSignature, Pod as FormattedPod } from '../../../../shared'
-//
-// const remotePodsRouter = express.Router()
-//
-// remotePodsRouter.post('/remove',
-//   signatureValidator,
-//   checkSignature,
-//   asyncMiddleware(removePods)
-// )
-//
-// remotePodsRouter.post('/list',
-//   asyncMiddleware(remotePodsList)
-// )
-//
-// remotePodsRouter.post('/add',
-//   setBodyHostPort, // We need to modify the host before running the validator!
-//   remotePodsAddValidator,
-//   asyncMiddleware(addPods)
-// )
-//
-// // ---------------------------------------------------------------------------
-//
-// export {
-//   remotePodsRouter
-// }
-//
-// // ---------------------------------------------------------------------------
-//
-// async function addPods (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const information = req.body
-//
-//   const pod = db.Pod.build(information)
-//   const podCreated = await pod.save()
-//
-//   await sendOwnedDataToPod(podCreated.id)
-//
-//   const cert = await getMyPublicCert()
-//   return res.json({ cert, email: CONFIG.ADMIN.EMAIL })
-// }
-//
-// async function remotePodsList (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const pods = await db.Pod.list()
-//
-//   return res.json(getFormattedObjects<FormattedPod, PodInstance>(pods, pods.length))
-// }
-//
-// async function removePods (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const signature: PodSignature = req.body.signature
-//   const host = signature.host
-//
-//   const pod = await db.Pod.loadByHost(host)
-//   await pod.destroy()
-//
-//   return res.type('json').status(204).end()
-// }
diff --git a/server/controllers/activitypub/videos.ts b/server/controllers/activitypub/videos.ts
deleted file mode 100644
index 98894379f..000000000
--- a/server/controllers/activitypub/videos.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-// import * as express from 'express'
-// import * as Bluebird from 'bluebird'
-// import * as Sequelize from 'sequelize'
-//
-// import { database as db } from '../../../initializers/database'
-// import {
-//   REQUEST_ENDPOINT_ACTIONS,
-//   REQUEST_ENDPOINTS,
-//   REQUEST_VIDEO_EVENT_TYPES,
-//   REQUEST_VIDEO_QADU_TYPES
-// } from '../../../initializers'
-// import {
-//   checkSignature,
-//   signatureValidator,
-//   remoteVideosValidator,
-//   remoteQaduVideosValidator,
-//   remoteEventsVideosValidator
-// } from '../../../middlewares'
-// import { logger, retryTransactionWrapper, resetSequelizeInstance } from '../../../helpers'
-// import { quickAndDirtyUpdatesVideoToFriends, fetchVideoChannelByHostAndUUID } from '../../../lib'
-// import { PodInstance, VideoFileInstance } from '../../../models'
-// import {
-//   RemoteVideoRequest,
-//   RemoteVideoCreateData,
-//   RemoteVideoUpdateData,
-//   RemoteVideoRemoveData,
-//   RemoteVideoReportAbuseData,
-//   RemoteQaduVideoRequest,
-//   RemoteQaduVideoData,
-//   RemoteVideoEventRequest,
-//   RemoteVideoEventData,
-//   RemoteVideoChannelCreateData,
-//   RemoteVideoChannelUpdateData,
-//   RemoteVideoChannelRemoveData,
-//   RemoteVideoAccountRemoveData,
-//   RemoteVideoAccountCreateData
-// } from '../../../../shared'
-// import { VideoInstance } from '../../../models/video/video-interface'
-//
-// const ENDPOINT_ACTIONS = REQUEST_ENDPOINT_ACTIONS[REQUEST_ENDPOINTS.VIDEOS]
-//
-// // Functions to call when processing a remote request
-// // FIXME: use RemoteVideoRequestType as id type
-// const functionsHash: { [ id: string ]: (...args) => Promise<any> } = {}
-// functionsHash[ENDPOINT_ACTIONS.ADD_VIDEO] = addRemoteVideoRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.UPDATE_VIDEO] = updateRemoteVideoRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.REMOVE_VIDEO] = removeRemoteVideoRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.ADD_CHANNEL] = addRemoteVideoChannelRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.UPDATE_CHANNEL] = updateRemoteVideoChannelRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.REMOVE_CHANNEL] = removeRemoteVideoChannelRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.REPORT_ABUSE] = reportAbuseRemoteVideoRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.ADD_ACCOUNT] = addRemoteVideoAccountRetryWrapper
-// functionsHash[ENDPOINT_ACTIONS.REMOVE_ACCOUNT] = removeRemoteVideoAccountRetryWrapper
-//
-// const remoteVideosRouter = express.Router()
-//
-// remoteVideosRouter.post('/',
-//   signatureValidator,
-//   checkSignature,
-//   remoteVideosValidator,
-//   remoteVideos
-// )
-//
-// remoteVideosRouter.post('/qadu',
-//   signatureValidator,
-//   checkSignature,
-//   remoteQaduVideosValidator,
-//   remoteVideosQadu
-// )
-//
-// remoteVideosRouter.post('/events',
-//   signatureValidator,
-//   checkSignature,
-//   remoteEventsVideosValidator,
-//   remoteVideosEvents
-// )
-//
-// // ---------------------------------------------------------------------------
-//
-// export {
-//   remoteVideosRouter
-// }
-//
-// // ---------------------------------------------------------------------------
-//
-// function remoteVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const requests: RemoteVideoRequest[] = req.body.data
-//   const fromPod = res.locals.secure.pod
-//
-//   // We need to process in the same order to keep consistency
-//   Bluebird.each(requests, request => {
-//     const data = request.data
-//
-//     // Get the function we need to call in order to process the request
-//     const fun = functionsHash[request.type]
-//     if (fun === undefined) {
-//       logger.error('Unknown remote request type %s.', request.type)
-//       return
-//     }
-//
-//     return fun.call(this, data, fromPod)
-//   })
-//   .catch(err => logger.error('Error managing remote videos.', err))
-//
-//   // Don't block the other pod
-//   return res.type('json').status(204).end()
-// }
-//
-// function remoteVideosQadu (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const requests: RemoteQaduVideoRequest[] = req.body.data
-//   const fromPod = res.locals.secure.pod
-//
-//   Bluebird.each(requests, request => {
-//     const videoData = request.data
-//
-//     return quickAndDirtyUpdateVideoRetryWrapper(videoData, fromPod)
-//   })
-//   .catch(err => logger.error('Error managing remote videos.', err))
-//
-//   return res.type('json').status(204).end()
-// }
-//
-// function remoteVideosEvents (req: express.Request, res: express.Response, next: express.NextFunction) {
-//   const requests: RemoteVideoEventRequest[] = req.body.data
-//   const fromPod = res.locals.secure.pod
-//
-//   Bluebird.each(requests, request => {
-//     const eventData = request.data
-//
-//     return processVideosEventsRetryWrapper(eventData, fromPod)
-//   })
-//   .catch(err => logger.error('Error managing remote videos.', err))
-//
-//   return res.type('json').status(204).end()
-// }
-//
-// async function processVideosEventsRetryWrapper (eventData: RemoteVideoEventData, fromPod: PodInstance) {
-//   const options = {
-//     arguments: [ eventData, fromPod ],
-//     errorMessage: 'Cannot process videos events with many retries.'
-//   }
-//
-//   await retryTransactionWrapper(processVideosEvents, options)
-// }
-//
-// async function processVideosEvents (eventData: RemoteVideoEventData, fromPod: PodInstance) {
-//   await db.sequelize.transaction(async t => {
-//     const sequelizeOptions = { transaction: t }
-//     const videoInstance = await fetchLocalVideoByUUID(eventData.uuid, t)
-//
-//     let columnToUpdate
-//     let qaduType
-//
-//     switch (eventData.eventType) {
-//     case REQUEST_VIDEO_EVENT_TYPES.VIEWS:
-//       columnToUpdate = 'views'
-//       qaduType = REQUEST_VIDEO_QADU_TYPES.VIEWS
-//       break
-//
-//     case REQUEST_VIDEO_EVENT_TYPES.LIKES:
-//       columnToUpdate = 'likes'
-//       qaduType = REQUEST_VIDEO_QADU_TYPES.LIKES
-//       break
-//
-//     case REQUEST_VIDEO_EVENT_TYPES.DISLIKES:
-//       columnToUpdate = 'dislikes'
-//       qaduType = REQUEST_VIDEO_QADU_TYPES.DISLIKES
-//       break
-//
-//     default:
-//       throw new Error('Unknown video event type.')
-//     }
-//
-//     const query = {}
-//     query[columnToUpdate] = eventData.count
-//
-//     await videoInstance.increment(query, sequelizeOptions)
-//
-//     const qadusParams = [
-//       {
-//         videoId: videoInstance.id,
-//         type: qaduType
-//       }
-//     ]
-//     await quickAndDirtyUpdatesVideoToFriends(qadusParams, t)
-//   })
-//
-//   logger.info('Remote video event processed for video with uuid %s.', eventData.uuid)
-// }
-//
-// async function quickAndDirtyUpdateVideoRetryWrapper (videoData: RemoteQaduVideoData, fromPod: PodInstance) {
-//   const options = {
-//     arguments: [ videoData, fromPod ],
-//     errorMessage: 'Cannot update quick and dirty the remote video with many retries.'
-//   }
-//
-//   await retryTransactionWrapper(quickAndDirtyUpdateVideo, options)
-// }
-//
-// async function quickAndDirtyUpdateVideo (videoData: RemoteQaduVideoData, fromPod: PodInstance) {
-//   let videoUUID = ''
-//
-//   await db.sequelize.transaction(async t => {
-//     const videoInstance = await fetchVideoByHostAndUUID(fromPod.host, videoData.uuid, t)
-//     const sequelizeOptions = { transaction: t }
-//
-//     videoUUID = videoInstance.uuid
-//
-//     if (videoData.views) {
-//       videoInstance.set('views', videoData.views)
-//     }
-//
-//     if (videoData.likes) {
-//       videoInstance.set('likes', videoData.likes)
-//     }
-//
-//     if (videoData.dislikes) {
-//       videoInstance.set('dislikes', videoData.dislikes)
-//     }
-//
-//     await videoInstance.save(sequelizeOptions)
-//   })
-//
-//   logger.info('Remote video with uuid %s quick and dirty updated', videoUUID)
-// }
-//
-// async function reportAbuseRemoteVideoRetryWrapper (reportData: RemoteVideoReportAbuseData, fromPod: PodInstance) {
-//   const options = {
-//     arguments: [ reportData, fromPod ],
-//     errorMessage: 'Cannot create remote abuse video with many retries.'
-//   }
-//
-//   await retryTransactionWrapper(reportAbuseRemoteVideo, options)
-// }
-//
-// async function reportAbuseRemoteVideo (reportData: RemoteVideoReportAbuseData, fromPod: PodInstance) {
-//   logger.debug('Reporting remote abuse for video %s.', reportData.videoUUID)
-//
-//   await db.sequelize.transaction(async t => {
-//     const videoInstance = await fetchLocalVideoByUUID(reportData.videoUUID, t)
-//     const videoAbuseData = {
-//       reporterUsername: reportData.reporterUsername,
-//       reason: reportData.reportReason,
-//       reporterPodId: fromPod.id,
-//       videoId: videoInstance.id
-//     }
-//
-//     await db.VideoAbuse.create(videoAbuseData)
-//
-//   })
-//
-//   logger.info('Remote abuse for video uuid %s created', reportData.videoUUID)
-// }
-//
-// async function fetchLocalVideoByUUID (id: string, t: Sequelize.Transaction) {
-//   try {
-//     const video = await db.Video.loadLocalVideoByUUID(id, t)
-//
-//     if (!video) throw new Error('Video ' + id + ' not found')
-//
-//     return video
-//   } catch (err) {
-//     logger.error('Cannot load owned video from id.', { error: err.stack, id })
-//     throw err
-//   }
-// }
-//
-// async function fetchVideoByHostAndUUID (podHost: string, uuid: string, t: Sequelize.Transaction) {
-//   try {
-//     const video = await db.Video.loadByHostAndUUID(podHost, uuid, t)
-//     if (!video) throw new Error('Video not found')
-//
-//     return video
-//   } catch (err) {
-//     logger.error('Cannot load video from host and uuid.', { error: err.stack, podHost, uuid })
-//     throw err
-//   }
-// }
diff --git a/server/controllers/api/index.ts b/server/controllers/api/index.ts
index a22c78cce..876c911c7 100644
--- a/server/controllers/api/index.ts
+++ b/server/controllers/api/index.ts
@@ -4,7 +4,7 @@ import { badRequest } from '../../helpers'
 
 import { oauthClientsRouter } from './oauth-clients'
 import { configRouter } from './config'
-import { applicationRouter } from './application'
+import { applicationRouter } from './server'
 import { usersRouter } from './users'
 import { videosRouter } from './videos'
 
diff --git a/server/controllers/api/application/follows.ts b/server/controllers/api/server/follows.ts
index 000bbd23e..c9775ad21 100644
--- a/server/controllers/api/application/follows.ts
+++ b/server/controllers/api/server/follows.ts
@@ -9,10 +9,10 @@ import { database as db } from '../../../initializers/database'
 import { sendFollow } from '../../../lib/activitypub/send-request'
 import { asyncMiddleware, paginationValidator, setFollowersSort, setPagination } from '../../../middlewares'
 import { authenticate } from '../../../middlewares/oauth'
-import { setBodyHostsPort } from '../../../middlewares/pods'
+import { setBodyHostsPort } from '../../../middlewares/servers'
 import { setFollowingSort } from '../../../middlewares/sort'
 import { ensureUserHasRight } from '../../../middlewares/user-right'
-import { followValidator } from '../../../middlewares/validators/pods'
+import { followValidator } from '../../../middlewares/validators/servers'
 import { followersSortValidator, followingSortValidator } from '../../../middlewares/validators/sort'
 
 const applicationFollowsRouter = express.Router()
diff --git a/server/controllers/api/application/index.ts b/server/controllers/api/server/index.ts
index 011b971ed..011b971ed 100644
--- a/server/controllers/api/application/index.ts
+++ b/server/controllers/api/server/index.ts
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts
index 7a3471116..29f901f60 100644
--- a/server/controllers/api/videos/abuse.ts
+++ b/server/controllers/api/videos/abuse.ts
@@ -70,12 +70,12 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) {
     reporterUsername,
     reason: body.reason,
     videoId: videoInstance.id,
-    reporterPodId: null // This is our pod that reported this abuse
+    reporterServerId: null // This is our server that reported this abuse
   }
 
   await db.sequelize.transaction(async t => {
     const abuse = await db.VideoAbuse.create(abuseToCreate, { transaction: t })
-    // We send the information to the destination pod
+    // We send the information to the destination server
     if (videoInstance.isOwned() === false) {
       const reportData = {
         reporterUsername,
@@ -84,7 +84,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) {
       }
 
       // await friends.reportAbuseVideoToFriend(reportData, videoInstance, t)
-      // TODO: send abuse to origin pod
+      // TODO: send abuse to origin server
     }
   })
 
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 063839223..ebc07e179 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -233,7 +233,7 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
 
     // Let transcoding job send the video to friends because the video file extension might change
     if (CONFIG.TRANSCODING.ENABLED === true) return undefined
-    // Don't send video to remote pods, it is private
+    // Don't send video to remote servers, it is private
     if (video.privacy === VideoPrivacy.PRIVATE) return undefined
 
     await sendAddVideo(video, t)
@@ -287,7 +287,7 @@ async function updateVideo (req: express.Request, res: express.Response) {
         await sendUpdateVideoChannel(videoInstance, t)
       }
 
-      // Video is not private anymore, send a create action to remote pods
+      // Video is not private anymore, send a create action to remote servers
       if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) {
         await sendAddVideo(videoInstance, t)
       }
@@ -365,7 +365,7 @@ async function removeVideo (req: express.Request, res: express.Response) {
 }
 
 async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) {
-  const resultList = await db.Video.searchAndPopulateAccountAndPodAndTags(
+  const resultList = await db.Video.searchAndPopulateAccountAndServerAndTags(
     req.params.value,
     req.query.field,
     req.query.start,
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts
index 955277d25..8216dffd2 100644
--- a/server/controllers/api/videos/rate.ts
+++ b/server/controllers/api/videos/rate.ts
@@ -83,7 +83,7 @@ async function rateVideo (req: express.Request, res: express.Response) {
     await videoInstance.increment(incrementQuery, sequelizeOptions)
 
     if (videoInstance.isOwned() === false) {
-      // TODO: Send a event to original pod
+      // TODO: Send a event to original server
     } else {
       // TODO: Send update to followers
     }
diff --git a/server/controllers/client.ts b/server/controllers/client.ts
index 40dda7584..045a50ef0 100644
--- a/server/controllers/client.ts
+++ b/server/controllers/client.ts
@@ -110,9 +110,9 @@ async function generateWatchHtmlPage (req: express.Request, res: express.Respons
 
   // Let Angular application handle errors
   if (validator.isUUID(videoId, 4)) {
-    videoPromise = db.Video.loadByUUIDAndPopulateAccountAndPodAndTags(videoId)
+    videoPromise = db.Video.loadByUUIDAndPopulateAccountAndServerAndTags(videoId)
   } else if (validator.isInt(videoId)) {
-    videoPromise = db.Video.loadAndPopulateAccountAndPodAndTags(+videoId)
+    videoPromise = db.Video.loadAndPopulateAccountAndServerAndTags(+videoId)
   } else {
     return res.sendFile(indexPath)
   }
diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index c7c952d6f..7425fd097 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -12,7 +12,7 @@ import { asyncMiddleware } from '../middlewares'
 const staticRouter = express.Router()
 
 /*
-  Cors is very important to let other pods access torrent and video files
+  Cors is very important to let other servers access torrent and video files
 */
 
 const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR