From d7c36709452280a8fe2a0354dac7073e1cded9a5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 26 Jul 2023 10:08:24 +0200 Subject: [PATCH] Fix lint --- server/controllers/feeds/comment-feeds.ts | 4 ++-- server/controllers/feeds/video-feeds.ts | 4 ++-- server/lib/job-queue/handlers/generate-storyboard.ts | 3 --- 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 { feedsFormatValidator, setFeedFormatContentType, videoCommentsFeedsValidator, - videoFeedsValidator + feedsAccountOrChannelFiltersValidator } from '../../middlewares' import { VideoCommentModel } from '../../models/video/video-comment' import { buildFeedMetadata, initFeed, sendFeed } from './shared' @@ -27,7 +27,7 @@ commentFeedsRouter.get('/video-comments.:format', feedsFormatValidator, setFeedFormatContentType, cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), - asyncMiddleware(videoFeedsValidator), + asyncMiddleware(feedsAccountOrChannelFiltersValidator), asyncMiddleware(videoCommentsFeedsValidator), asyncMiddleware(generateVideoCommentsFeed) ) 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 { feedsFormatValidator, setDefaultVideosSort, setFeedFormatContentType, - videoFeedsValidator, + feedsAccountOrChannelFiltersValidator, videosSortValidator, videoSubscriptionFeedsValidator } from '../../middlewares' @@ -33,7 +33,7 @@ videoFeedsRouter.get('/videos.:format', setFeedFormatContentType, cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), commonVideosFiltersValidator, - asyncMiddleware(videoFeedsValidator), + asyncMiddleware(feedsAccountOrChannelFiltersValidator), asyncMiddleware(generateVideoFeed) ) 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 { } }) }) - }) - - } finally { inputFileMutexReleaser() } 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 ( // --------------------------------------------------------------------------- -const videoFeedsValidator = [ +const feedsAccountOrChannelFiltersValidator = [ query('accountId') .optional() .custom(isIdValid), @@ -170,7 +170,7 @@ export { feedsFormatValidator, setFeedFormatContentType, setFeedPodcastContentType, - videoFeedsValidator, + feedsAccountOrChannelFiltersValidator, videoFeedsPodcastValidator, videoSubscriptionFeedsValidator, videoFeedsPodcastSetCacheKey,