From 608624252466acf9f1d9ee1c1170bd4fe4d18d18 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 15 Nov 2017 11:00:25 +0100 Subject: Rename Pod -> Server --- server/controllers/api/videos/abuse.ts | 6 +++--- server/controllers/api/videos/index.ts | 6 +++--- server/controllers/api/videos/rate.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'server/controllers/api/videos') 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 } -- cgit v1.2.3