diff options
Diffstat (limited to 'server/controllers/api/videos')
-rw-r--r-- | server/controllers/api/videos/abuse.ts | 2 | ||||
-rw-r--r-- | server/controllers/api/videos/blacklist.ts | 4 | ||||
-rw-r--r-- | server/controllers/api/videos/channel.ts | 12 | ||||
-rw-r--r-- | server/controllers/api/videos/index.ts | 8 | ||||
-rw-r--r-- | server/controllers/api/videos/rate.ts | 2 |
5 files changed, 14 insertions, 14 deletions
diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 88b3d538d..29e1175c5 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts | |||
@@ -33,7 +33,7 @@ abuseVideoRouter.get('/abuse', | |||
33 | ) | 33 | ) |
34 | abuseVideoRouter.post('/:id/abuse', | 34 | abuseVideoRouter.post('/:id/abuse', |
35 | authenticate, | 35 | authenticate, |
36 | videoAbuseReportValidator, | 36 | asyncMiddleware(videoAbuseReportValidator), |
37 | asyncMiddleware(reportVideoAbuseRetryWrapper) | 37 | asyncMiddleware(reportVideoAbuseRetryWrapper) |
38 | ) | 38 | ) |
39 | 39 | ||
diff --git a/server/controllers/api/videos/blacklist.ts b/server/controllers/api/videos/blacklist.ts index be7cf6ea4..06333c271 100644 --- a/server/controllers/api/videos/blacklist.ts +++ b/server/controllers/api/videos/blacklist.ts | |||
@@ -21,7 +21,7 @@ const blacklistRouter = express.Router() | |||
21 | blacklistRouter.post('/:videoId/blacklist', | 21 | blacklistRouter.post('/:videoId/blacklist', |
22 | authenticate, | 22 | authenticate, |
23 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 23 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), |
24 | videosBlacklistAddValidator, | 24 | asyncMiddleware(videosBlacklistAddValidator), |
25 | asyncMiddleware(addVideoToBlacklist) | 25 | asyncMiddleware(addVideoToBlacklist) |
26 | ) | 26 | ) |
27 | 27 | ||
@@ -38,7 +38,7 @@ blacklistRouter.get('/blacklist', | |||
38 | blacklistRouter.delete('/:videoId/blacklist', | 38 | blacklistRouter.delete('/:videoId/blacklist', |
39 | authenticate, | 39 | authenticate, |
40 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), | 40 | ensureUserHasRight(UserRight.MANAGE_VIDEO_BLACKLIST), |
41 | videosBlacklistRemoveValidator, | 41 | asyncMiddleware(videosBlacklistRemoveValidator), |
42 | asyncMiddleware(removeVideoFromBlacklistController) | 42 | asyncMiddleware(removeVideoFromBlacklistController) |
43 | ) | 43 | ) |
44 | 44 | ||
diff --git a/server/controllers/api/videos/channel.ts b/server/controllers/api/videos/channel.ts index ce2656e71..d99f47c32 100644 --- a/server/controllers/api/videos/channel.ts +++ b/server/controllers/api/videos/channel.ts | |||
@@ -3,6 +3,7 @@ import { VideoChannelCreate, VideoChannelUpdate } from '../../../../shared' | |||
3 | import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers' | 3 | import { getFormattedObjects, logger, resetSequelizeInstance, retryTransactionWrapper } from '../../../helpers' |
4 | import { database as db } from '../../../initializers' | 4 | import { database as db } from '../../../initializers' |
5 | import { createVideoChannel } from '../../../lib' | 5 | import { createVideoChannel } from '../../../lib' |
6 | import { sendUpdateVideoChannel } from '../../../lib/activitypub/send/send-update' | ||
6 | import { | 7 | import { |
7 | asyncMiddleware, | 8 | asyncMiddleware, |
8 | authenticate, | 9 | authenticate, |
@@ -10,14 +11,13 @@ import { | |||
10 | paginationValidator, | 11 | paginationValidator, |
11 | setPagination, | 12 | setPagination, |
12 | setVideoChannelsSort, | 13 | setVideoChannelsSort, |
13 | videoChannelsGetValidator, | ||
14 | videoChannelsAddValidator, | 14 | videoChannelsAddValidator, |
15 | videoChannelsGetValidator, | ||
15 | videoChannelsRemoveValidator, | 16 | videoChannelsRemoveValidator, |
16 | videoChannelsSortValidator, | 17 | videoChannelsSortValidator, |
17 | videoChannelsUpdateValidator | 18 | videoChannelsUpdateValidator |
18 | } from '../../../middlewares' | 19 | } from '../../../middlewares' |
19 | import { AccountInstance, VideoChannelInstance } from '../../../models' | 20 | import { AccountInstance, VideoChannelInstance } from '../../../models' |
20 | import { sendUpdateVideoChannel } from '../../../lib/activitypub/send/send-update' | ||
21 | 21 | ||
22 | const videoChannelRouter = express.Router() | 22 | const videoChannelRouter = express.Router() |
23 | 23 | ||
@@ -30,7 +30,7 @@ videoChannelRouter.get('/channels', | |||
30 | ) | 30 | ) |
31 | 31 | ||
32 | videoChannelRouter.get('/accounts/:accountId/channels', | 32 | videoChannelRouter.get('/accounts/:accountId/channels', |
33 | listVideoAccountChannelsValidator, | 33 | asyncMiddleware(listVideoAccountChannelsValidator), |
34 | asyncMiddleware(listVideoAccountChannels) | 34 | asyncMiddleware(listVideoAccountChannels) |
35 | ) | 35 | ) |
36 | 36 | ||
@@ -42,18 +42,18 @@ videoChannelRouter.post('/channels', | |||
42 | 42 | ||
43 | videoChannelRouter.put('/channels/:id', | 43 | videoChannelRouter.put('/channels/:id', |
44 | authenticate, | 44 | authenticate, |
45 | videoChannelsUpdateValidator, | 45 | asyncMiddleware(videoChannelsUpdateValidator), |
46 | updateVideoChannelRetryWrapper | 46 | updateVideoChannelRetryWrapper |
47 | ) | 47 | ) |
48 | 48 | ||
49 | videoChannelRouter.delete('/channels/:id', | 49 | videoChannelRouter.delete('/channels/:id', |
50 | authenticate, | 50 | authenticate, |
51 | videoChannelsRemoveValidator, | 51 | asyncMiddleware(videoChannelsRemoveValidator), |
52 | asyncMiddleware(removeVideoChannelRetryWrapper) | 52 | asyncMiddleware(removeVideoChannelRetryWrapper) |
53 | ) | 53 | ) |
54 | 54 | ||
55 | videoChannelRouter.get('/channels/:id', | 55 | videoChannelRouter.get('/channels/:id', |
56 | videoChannelsGetValidator, | 56 | asyncMiddleware(videoChannelsGetValidator), |
57 | asyncMiddleware(getVideoChannel) | 57 | asyncMiddleware(getVideoChannel) |
58 | ) | 58 | ) |
59 | 59 | ||
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 2b5afd632..244d91914 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts | |||
@@ -86,7 +86,7 @@ videosRouter.get('/', | |||
86 | ) | 86 | ) |
87 | videosRouter.put('/:id', | 87 | videosRouter.put('/:id', |
88 | authenticate, | 88 | authenticate, |
89 | videosUpdateValidator, | 89 | asyncMiddleware(videosUpdateValidator), |
90 | asyncMiddleware(updateVideoRetryWrapper) | 90 | asyncMiddleware(updateVideoRetryWrapper) |
91 | ) | 91 | ) |
92 | videosRouter.post('/upload', | 92 | videosRouter.post('/upload', |
@@ -97,17 +97,17 @@ videosRouter.post('/upload', | |||
97 | ) | 97 | ) |
98 | 98 | ||
99 | videosRouter.get('/:id/description', | 99 | videosRouter.get('/:id/description', |
100 | videosGetValidator, | 100 | asyncMiddleware(videosGetValidator), |
101 | asyncMiddleware(getVideoDescription) | 101 | asyncMiddleware(getVideoDescription) |
102 | ) | 102 | ) |
103 | videosRouter.get('/:id', | 103 | videosRouter.get('/:id', |
104 | videosGetValidator, | 104 | asyncMiddleware(videosGetValidator), |
105 | getVideo | 105 | getVideo |
106 | ) | 106 | ) |
107 | 107 | ||
108 | videosRouter.delete('/:id', | 108 | videosRouter.delete('/:id', |
109 | authenticate, | 109 | authenticate, |
110 | videosRemoveValidator, | 110 | asyncMiddleware(videosRemoveValidator), |
111 | asyncMiddleware(removeVideoRetryWrapper) | 111 | asyncMiddleware(removeVideoRetryWrapper) |
112 | ) | 112 | ) |
113 | 113 | ||
diff --git a/server/controllers/api/videos/rate.ts b/server/controllers/api/videos/rate.ts index 134284df7..0c6a988cf 100644 --- a/server/controllers/api/videos/rate.ts +++ b/server/controllers/api/videos/rate.ts | |||
@@ -12,7 +12,7 @@ const rateVideoRouter = express.Router() | |||
12 | 12 | ||
13 | rateVideoRouter.put('/:id/rate', | 13 | rateVideoRouter.put('/:id/rate', |
14 | authenticate, | 14 | authenticate, |
15 | videoRateValidator, | 15 | asyncMiddleware(videoRateValidator), |
16 | asyncMiddleware(rateVideoRetryWrapper) | 16 | asyncMiddleware(rateVideoRetryWrapper) |
17 | ) | 17 | ) |
18 | 18 | ||