interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Optimize videos feed endpoint

This commit is contained in:
Chocobozzz 2021-05-10 10:52:52 +02:00
parent fd5586b337
commit 649e812947
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/controllers/feeds.ts
View File

@ -167,7 +167,7 @@ async function generateVideoFeed (req: express.Request, res: express.Response) {
videoChannelId: videoChannel ? videoChannel.id : null videoChannelId: videoChannel ? videoChannel.id : null
} }
const resultList = await VideoModel.listForApi({ const { data } = await VideoModel.listForApi({
start, start,
count: FEEDS.COUNT, count: FEEDS.COUNT,
sort: req.query.sort, sort: req.query.sort,
@ -175,10 +175,11 @@ async function generateVideoFeed (req: express.Request, res: express.Response) {
nsfw, nsfw,
filter: req.query.filter as VideoFilter, filter: req.query.filter as VideoFilter,
withFiles: true, withFiles: true,
countVideos: false,
...options ...options
}) })
addVideosToFeed(feed, resultList.data) addVideosToFeed(feed, data)
// Now the feed generation is done, let's send it! // Now the feed generation is done, let's send it!
return sendFeed(feed, req, res) return sendFeed(feed, req, res)
@ -198,20 +199,22 @@ async function generateVideoFeedForSubscriptions (req: express.Request, res: exp
queryString: new URL(WEBSERVER.URL + req.url).search queryString: new URL(WEBSERVER.URL + req.url).search
}) })
const resultList = await VideoModel.listForApi({ const { data } = await VideoModel.listForApi({
start, start,
count: FEEDS.COUNT, count: FEEDS.COUNT,
sort: req.query.sort, sort: req.query.sort,
includeLocalVideos: false, includeLocalVideos: false,
nsfw, nsfw,
filter: req.query.filter as VideoFilter, filter: req.query.filter as VideoFilter,
withFiles: true, withFiles: true,
countVideos: false,
followerActorId: res.locals.user.Account.Actor.id, followerActorId: res.locals.user.Account.Actor.id,
user: res.locals.user user: res.locals.user
}) })
addVideosToFeed(feed, resultList.data) addVideosToFeed(feed, data)
// Now the feed generation is done, let's send it! // Now the feed generation is done, let's send it!
return sendFeed(feed, req, res) return sendFeed(feed, req, res)