This commit is contained in:
Chocobozzz 2023-07-26 10:08:24 +02:00
parent 053ed7f5e6
commit d7c3670945
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 6 additions and 9 deletions

View File

@ -8,7 +8,7 @@ import {
feedsFormatValidator, feedsFormatValidator,
setFeedFormatContentType, setFeedFormatContentType,
videoCommentsFeedsValidator, videoCommentsFeedsValidator,
videoFeedsValidator feedsAccountOrChannelFiltersValidator
} from '../../middlewares' } from '../../middlewares'
import { VideoCommentModel } from '../../models/video/video-comment' import { VideoCommentModel } from '../../models/video/video-comment'
import { buildFeedMetadata, initFeed, sendFeed } from './shared' import { buildFeedMetadata, initFeed, sendFeed } from './shared'
@ -27,7 +27,7 @@ commentFeedsRouter.get('/video-comments.:format',
feedsFormatValidator, feedsFormatValidator,
setFeedFormatContentType, setFeedFormatContentType,
cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS),
asyncMiddleware(videoFeedsValidator), asyncMiddleware(feedsAccountOrChannelFiltersValidator),
asyncMiddleware(videoCommentsFeedsValidator), asyncMiddleware(videoCommentsFeedsValidator),
asyncMiddleware(generateVideoCommentsFeed) asyncMiddleware(generateVideoCommentsFeed)
) )

View File

@ -12,7 +12,7 @@ import {
feedsFormatValidator, feedsFormatValidator,
setDefaultVideosSort, setDefaultVideosSort,
setFeedFormatContentType, setFeedFormatContentType,
videoFeedsValidator, feedsAccountOrChannelFiltersValidator,
videosSortValidator, videosSortValidator,
videoSubscriptionFeedsValidator videoSubscriptionFeedsValidator
} from '../../middlewares' } from '../../middlewares'
@ -33,7 +33,7 @@ videoFeedsRouter.get('/videos.:format',
setFeedFormatContentType, setFeedFormatContentType,
cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS), cacheRouteMiddleware(ROUTE_CACHE_LIFETIME.FEEDS),
commonVideosFiltersValidator, commonVideosFiltersValidator,
asyncMiddleware(videoFeedsValidator), asyncMiddleware(feedsAccountOrChannelFiltersValidator),
asyncMiddleware(generateVideoFeed) asyncMiddleware(generateVideoFeed)
) )

View File

@ -107,10 +107,7 @@ async function processGenerateStoryboard (job: Job): Promise<void> {
} }
}) })
}) })
}) })
} finally { } finally {
inputFileMutexReleaser() inputFileMutexReleaser()
} }

View File

@ -73,7 +73,7 @@ function feedContentTypeResponse (
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
const videoFeedsValidator = [ const feedsAccountOrChannelFiltersValidator = [
query('accountId') query('accountId')
.optional() .optional()
.custom(isIdValid), .custom(isIdValid),
@ -170,7 +170,7 @@ export {
feedsFormatValidator, feedsFormatValidator,
setFeedFormatContentType, setFeedFormatContentType,
setFeedPodcastContentType, setFeedPodcastContentType,
videoFeedsValidator, feedsAccountOrChannelFiltersValidator,
videoFeedsPodcastValidator, videoFeedsPodcastValidator,
videoSubscriptionFeedsValidator, videoSubscriptionFeedsValidator,
videoFeedsPodcastSetCacheKey, videoFeedsPodcastSetCacheKey,