diff options
author | Chocobozzz <me@florianbigard.com> | 2023-07-26 10:08:24 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2023-07-26 10:08:24 +0200 |
commit | d7c36709452280a8fe2a0354dac7073e1cded9a5 (patch) | |
tree | 0d726729bf4f15f2e1ff1f159ef200331584f368 /server | |
parent | 053ed7f5e638621ea474c77e0e244df0b3682889 (diff) | |
download | PeerTube-d7c36709452280a8fe2a0354dac7073e1cded9a5.tar.gz PeerTube-d7c36709452280a8fe2a0354dac7073e1cded9a5.tar.zst PeerTube-d7c36709452280a8fe2a0354dac7073e1cded9a5.zip |
Fix lint
Diffstat (limited to 'server')
-rw-r--r-- | server/controllers/feeds/comment-feeds.ts | 4 | ||||
-rw-r--r-- | server/controllers/feeds/video-feeds.ts | 4 | ||||
-rw-r--r-- | server/lib/job-queue/handlers/generate-storyboard.ts | 3 | ||||
-rw-r--r-- | server/middlewares/validators/feeds.ts | 4 |
4 files changed, 6 insertions, 9 deletions
diff --git a/server/controllers/feeds/comment-feeds.ts b/server/controllers/feeds/comment-feeds.ts index 68dc9ef90..c013662ea 100644 --- a/server/controllers/feeds/comment-feeds.ts +++ b/server/controllers/feeds/comment-feeds.ts | |||
@@ -8,7 +8,7 @@ import { | |||
8 | feedsFormatValidator, | 8 | feedsFormatValidator, |
9 | setFeedFormatContentType, | 9 | setFeedFormatContentType, |
10 | videoCommentsFeedsValidator, | 10 | videoCommentsFeedsValidator, |
11 | videoFeedsValidator | 11 | feedsAccountOrChannelFiltersValidator |
12 | } from '../../middlewares' | 12 | } from '../../middlewares' |
13 | import { VideoCommentModel } from '../../models/video/video-comment' | 13 | import { VideoCommentModel } from '../../models/video/video-comment' |
14 | import { buildFeedMetadata, initFeed, sendFeed } from './shared' | 14 | import { buildFeedMetadata, initFeed, sendFeed } from './shared' |
@@ -27,7 +27,7 @@ commentFeedsRouter.get('/video-comments.:format', | |||
27 | feedsFormatValidator, | 27 | feedsFormatValidator, |
28 | setFeedFormatContentType, | 28 | setFeedFormatContentType, |
29 | cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), | 29 | cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), |
30 | asyncMiddleware(videoFeedsValidator), | 30 | asyncMiddleware(feedsAccountOrChannelFiltersValidator), |
31 | asyncMiddleware(videoCommentsFeedsValidator), | 31 | asyncMiddleware(videoCommentsFeedsValidator), |
32 | asyncMiddleware(generateVideoCommentsFeed) | 32 | asyncMiddleware(generateVideoCommentsFeed) |
33 | ) | 33 | ) |
diff --git a/server/controllers/feeds/video-feeds.ts b/server/controllers/feeds/video-feeds.ts index 97ac594ec..e5941be40 100644 --- a/server/controllers/feeds/video-feeds.ts +++ b/server/controllers/feeds/video-feeds.ts | |||
@@ -12,7 +12,7 @@ import { | |||
12 | feedsFormatValidator, | 12 | feedsFormatValidator, |
13 | setDefaultVideosSort, | 13 | setDefaultVideosSort, |
14 | setFeedFormatContentType, | 14 | setFeedFormatContentType, |
15 | videoFeedsValidator, | 15 | feedsAccountOrChannelFiltersValidator, |
16 | videosSortValidator, | 16 | videosSortValidator, |
17 | videoSubscriptionFeedsValidator | 17 | videoSubscriptionFeedsValidator |
18 | } from '../../middlewares' | 18 | } from '../../middlewares' |
@@ -33,7 +33,7 @@ videoFeedsRouter.get('/videos.:format', | |||
33 | setFeedFormatContentType, | 33 | setFeedFormatContentType, |
34 | cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), | 34 | cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), |
35 | commonVideosFiltersValidator, | 35 | commonVideosFiltersValidator, |
36 | asyncMiddleware(videoFeedsValidator), | 36 | asyncMiddleware(feedsAccountOrChannelFiltersValidator), |
37 | asyncMiddleware(generateVideoFeed) | 37 | asyncMiddleware(generateVideoFeed) |
38 | ) | 38 | ) |
39 | 39 | ||
diff --git a/server/lib/job-queue/handlers/generate-storyboard.ts b/server/lib/job-queue/handlers/generate-storyboard.ts index 169b5ef2d..eea20274a 100644 --- a/server/lib/job-queue/handlers/generate-storyboard.ts +++ b/server/lib/job-queue/handlers/generate-storyboard.ts | |||
@@ -107,10 +107,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> { | |||
107 | } | 107 | } |
108 | }) | 108 | }) |
109 | }) | 109 | }) |
110 | |||
111 | }) | 110 | }) |
112 | |||
113 | |||
114 | } finally { | 111 | } finally { |
115 | inputFileMutexReleaser() | 112 | inputFileMutexReleaser() |
116 | } | 113 | } |
diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts index 9673a6613..72804a259 100644 --- a/server/middlewares/validators/feeds.ts +++ b/server/middlewares/validators/feeds.ts | |||
@@ -73,7 +73,7 @@ function feedContentTypeResponse ( | |||
73 | 73 | ||
74 | // --------------------------------------------------------------------------- | 74 | // --------------------------------------------------------------------------- |
75 | 75 | ||
76 | const videoFeedsValidator = [ | 76 | const feedsAccountOrChannelFiltersValidator = [ |
77 | query('accountId') | 77 | query('accountId') |
78 | .optional() | 78 | .optional() |
79 | .custom(isIdValid), | 79 | .custom(isIdValid), |
@@ -170,7 +170,7 @@ export { | |||
170 | feedsFormatValidator, | 170 | feedsFormatValidator, |
171 | setFeedFormatContentType, | 171 | setFeedFormatContentType, |
172 | setFeedPodcastContentType, | 172 | setFeedPodcastContentType, |
173 | videoFeedsValidator, | 173 | feedsAccountOrChannelFiltersValidator, |
174 | videoFeedsPodcastValidator, | 174 | videoFeedsPodcastValidator, |
175 | videoSubscriptionFeedsValidator, | 175 | videoSubscriptionFeedsValidator, |
176 | videoFeedsPodcastSetCacheKey, | 176 | videoFeedsPodcastSetCacheKey, |