diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-15 11:00:25 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
commit | 608624252466acf9f1d9ee1c1170bd4fe4d18d18 (patch) | |
tree | 47eab55bb5421b7fe88e0b2ac743a436fd9561cf /server/controllers/api/videos | |
parent | 51548b31815c6f96f314ae96588a9adca150519d (diff) | |
download | PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.gz PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.zst PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.zip |
Rename Pod -> Server
Diffstat (limited to 'server/controllers/api/videos')
-rw-r--r-- | server/controllers/api/videos/abuse.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/videos/index.ts | 6 | ||||
-rw-r--r-- | server/controllers/api/videos/rate.ts | 2 |
3 files changed, 7 insertions, 7 deletions
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) { | |||
70 | reporterUsername, | 70 | reporterUsername, |
71 | reason: body.reason, | 71 | reason: body.reason, |
72 | videoId: videoInstance.id, | 72 | videoId: videoInstance.id, |
73 | reporterPodId: null // This is our pod that reported this abuse | 73 | reporterServerId: null // This is our server that reported this abuse |
74 | } | 74 | } |
75 | 75 | ||
76 | await db.sequelize.transaction(async t => { | 76 | await db.sequelize.transaction(async t => { |
77 | const abuse = await db.VideoAbuse.create(abuseToCreate, { transaction: t }) | 77 | const abuse = await db.VideoAbuse.create(abuseToCreate, { transaction: t }) |
78 | // We send the information to the destination pod | 78 | // We send the information to the destination server |
79 | if (videoInstance.isOwned() === false) { | 79 | if (videoInstance.isOwned() === false) { |
80 | const reportData = { | 80 | const reportData = { |
81 | reporterUsername, | 81 | reporterUsername, |
@@ -84,7 +84,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | // await friends.reportAbuseVideoToFriend(reportData, videoInstance, t) | 86 | // await friends.reportAbuseVideoToFriend(reportData, videoInstance, t) |
87 | // TODO: send abuse to origin pod | 87 | // TODO: send abuse to origin server |
88 | } | 88 | } |
89 | }) | 89 | }) |
90 | 90 | ||
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 | |||
233 | 233 | ||
234 | // Let transcoding job send the video to friends because the video file extension might change | 234 | // Let transcoding job send the video to friends because the video file extension might change |
235 | if (CONFIG.TRANSCODING.ENABLED === true) return undefined | 235 | if (CONFIG.TRANSCODING.ENABLED === true) return undefined |
236 | // Don't send video to remote pods, it is private | 236 | // Don't send video to remote servers, it is private |
237 | if (video.privacy === VideoPrivacy.PRIVATE) return undefined | 237 | if (video.privacy === VideoPrivacy.PRIVATE) return undefined |
238 | 238 | ||
239 | await sendAddVideo(video, t) | 239 | await sendAddVideo(video, t) |
@@ -287,7 +287,7 @@ async function updateVideo (req: express.Request, res: express.Response) { | |||
287 | await sendUpdateVideoChannel(videoInstance, t) | 287 | await sendUpdateVideoChannel(videoInstance, t) |
288 | } | 288 | } |
289 | 289 | ||
290 | // Video is not private anymore, send a create action to remote pods | 290 | // Video is not private anymore, send a create action to remote servers |
291 | if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) { | 291 | if (wasPrivateVideo === true && videoInstance.privacy !== VideoPrivacy.PRIVATE) { |
292 | await sendAddVideo(videoInstance, t) | 292 | await sendAddVideo(videoInstance, t) |
293 | } | 293 | } |
@@ -365,7 +365,7 @@ async function removeVideo (req: express.Request, res: express.Response) { | |||
365 | } | 365 | } |
366 | 366 | ||
367 | async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { | 367 | async function searchVideos (req: express.Request, res: express.Response, next: express.NextFunction) { |
368 | const resultList = await db.Video.searchAndPopulateAccountAndPodAndTags( | 368 | const resultList = await db.Video.searchAndPopulateAccountAndServerAndTags( |
369 | req.params.value, | 369 | req.params.value, |
370 | req.query.field, | 370 | req.query.field, |
371 | req.query.start, | 371 | 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) { | |||
83 | await videoInstance.increment(incrementQuery, sequelizeOptions) | 83 | await videoInstance.increment(incrementQuery, sequelizeOptions) |
84 | 84 | ||
85 | if (videoInstance.isOwned() === false) { | 85 | if (videoInstance.isOwned() === false) { |
86 | // TODO: Send a event to original pod | 86 | // TODO: Send a event to original server |
87 | } else { | 87 | } else { |
88 | // TODO: Send update to followers | 88 | // TODO: Send update to followers |
89 | } | 89 | } |