aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/middlewares/validators/videos/video-playlists.ts
diff options
context:
space:
mode:
Diffstat (limited to 'server/middlewares/validators/videos/video-playlists.ts')
-rw-r--r--server/middlewares/validators/videos/video-playlists.ts17
1 files changed, 8 insertions, 9 deletions
diff --git a/server/middlewares/validators/videos/video-playlists.ts b/server/middlewares/validators/videos/video-playlists.ts
index 4bc79f433..55e09e354 100644
--- a/server/middlewares/validators/videos/video-playlists.ts
+++ b/server/middlewares/validators/videos/video-playlists.ts
@@ -103,7 +103,7 @@ const videoPlaylistsDeleteValidator = [
103 103
104 if (!await doesVideoPlaylistExist(req.params.playlistId, res)) return 104 if (!await doesVideoPlaylistExist(req.params.playlistId, res)) return
105 105
106 const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist 106 const videoPlaylist = res.locals.videoPlaylist
107 if (videoPlaylist.type === VideoPlaylistType.WATCH_LATER) { 107 if (videoPlaylist.type === VideoPlaylistType.WATCH_LATER) {
108 return res.status(400) 108 return res.status(400)
109 .json({ error: 'Cannot delete a watch later playlist.' }) 109 .json({ error: 'Cannot delete a watch later playlist.' })
@@ -128,7 +128,7 @@ const videoPlaylistsGetValidator = [
128 128
129 if (!await doesVideoPlaylistExist(req.params.playlistId, res)) return 129 if (!await doesVideoPlaylistExist(req.params.playlistId, res)) return
130 130
131 const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist 131 const videoPlaylist = res.locals.videoPlaylist
132 132
133 // Video is unlisted, check we used the uuid to fetch it 133 // Video is unlisted, check we used the uuid to fetch it
134 if (videoPlaylist.privacy === VideoPlaylistPrivacy.UNLISTED) { 134 if (videoPlaylist.privacy === VideoPlaylistPrivacy.UNLISTED) {
@@ -140,8 +140,7 @@ const videoPlaylistsGetValidator = [
140 if (videoPlaylist.privacy === VideoPlaylistPrivacy.PRIVATE) { 140 if (videoPlaylist.privacy === VideoPlaylistPrivacy.PRIVATE) {
141 await authenticatePromiseIfNeeded(req, res) 141 await authenticatePromiseIfNeeded(req, res)
142 142
143 const user: UserModel = res.locals.oauth ? res.locals.oauth.token.User : null 143 const user = res.locals.oauth ? res.locals.oauth.token.User : null
144
145 if ( 144 if (
146 !user || 145 !user ||
147 (videoPlaylist.OwnerAccount.userId !== user.id && !user.hasRight(UserRight.UPDATE_ANY_VIDEO_PLAYLIST)) 146 (videoPlaylist.OwnerAccount.userId !== user.id && !user.hasRight(UserRight.UPDATE_ANY_VIDEO_PLAYLIST))
@@ -177,8 +176,8 @@ const videoPlaylistsAddVideoValidator = [
177 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return 176 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return
178 if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return 177 if (!await doesVideoExist(req.body.videoId, res, 'only-video')) return
179 178
180 const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist 179 const videoPlaylist = res.locals.videoPlaylist
181 const video: VideoModel = res.locals.video 180 const video = res.locals.video
182 181
183 const videoPlaylistElement = await VideoPlaylistElementModel.loadByPlaylistAndVideo(videoPlaylist.id, video.id) 182 const videoPlaylistElement = await VideoPlaylistElementModel.loadByPlaylistAndVideo(videoPlaylist.id, video.id)
184 if (videoPlaylistElement) { 183 if (videoPlaylistElement) {
@@ -217,8 +216,8 @@ const videoPlaylistsUpdateOrRemoveVideoValidator = [
217 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return 216 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return
218 if (!await doesVideoExist(req.params.videoId, res, 'id')) return 217 if (!await doesVideoExist(req.params.videoId, res, 'id')) return
219 218
220 const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist 219 const videoPlaylist = res.locals.videoPlaylist
221 const video: VideoModel = res.locals.video 220 const video = res.locals.video
222 221
223 const videoPlaylistElement = await VideoPlaylistElementModel.loadByPlaylistAndVideo(videoPlaylist.id, video.id) 222 const videoPlaylistElement = await VideoPlaylistElementModel.loadByPlaylistAndVideo(videoPlaylist.id, video.id)
224 if (!videoPlaylistElement) { 223 if (!videoPlaylistElement) {
@@ -284,7 +283,7 @@ const videoPlaylistsReorderVideosValidator = [
284 283
285 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return 284 if (!await doesVideoPlaylistExist(req.params.playlistId, res, 'all')) return
286 285
287 const videoPlaylist: VideoPlaylistModel = res.locals.videoPlaylist 286 const videoPlaylist = res.locals.videoPlaylist
288 if (!checkUserCanManageVideoPlaylist(res.locals.oauth.token.User, videoPlaylist, UserRight.UPDATE_ANY_VIDEO_PLAYLIST, res)) return 287 if (!checkUserCanManageVideoPlaylist(res.locals.oauth.token.User, videoPlaylist, UserRight.UPDATE_ANY_VIDEO_PLAYLIST, res)) return
289 288
290 const nextPosition = await VideoPlaylistElementModel.getNextPositionOf(videoPlaylist.id) 289 const nextPosition = await VideoPlaylistElementModel.getNextPositionOf(videoPlaylist.id)