1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-05 02:39:33 +02:00

Fix migration and test

This commit is contained in:
Chocobozzz 2020-11-25 11:04:18 +01:00 committed by Chocobozzz
parent 5beb89f223
commit 18490b0765
11 changed files with 162 additions and 80 deletions

View file

@ -12,7 +12,7 @@ import {
videoCommentsFeedsValidator,
videoFeedsValidator,
videosSortValidator,
videoSubscriptonFeedsValidator
videoSubscriptionFeedsValidator
} from '../middlewares'
import { cacheRoute } from '../middlewares/cache'
import { VideoModel } from '../models/video/video'
@ -60,7 +60,7 @@ feedsRouter.get('/feeds/subscriptions.:format',
]
})(ROUTE_CACHE_LIFETIME.FEEDS)),
commonVideosFiltersValidator,
asyncMiddleware(videoSubscriptonFeedsValidator),
asyncMiddleware(videoSubscriptionFeedsValidator),
asyncMiddleware(generateVideoFeedForSubscriptions)
)
@ -198,20 +198,17 @@ async function generateVideoFeedForSubscriptions (req: express.Request, res: exp
queryString: new URL(WEBSERVER.URL + req.url).search
})
const options = {
followerActorId: res.locals.user.Account.Actor.id,
user: res.locals.user
}
const resultList = await VideoModel.listForApi({
start,
count: FEEDS.COUNT,
sort: req.query.sort,
includeLocalVideos: true,
includeLocalVideos: false,
nsfw,
filter: req.query.filter as VideoFilter,
withFiles: true,
...options
followerActorId: res.locals.user.Account.Actor.id,
user: res.locals.user
})
addVideosToFeed(feed, resultList.data)