diff options
author | Chocobozzz <me@florianbigard.com> | 2021-10-29 10:54:27 +0200 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2021-10-29 11:48:21 +0200 |
commit | 3c10840fa90fc88fc98e8169faf4745ff6c80893 (patch) | |
tree | 9a60c4de766700fbc33804b06ec46279b20c855e /server/controllers/feeds.ts | |
parent | 2760b454a761f6af3138b2fb5f34340772ab0d1e (diff) | |
download | PeerTube-3c10840fa90fc88fc98e8169faf4745ff6c80893.tar.gz PeerTube-3c10840fa90fc88fc98e8169faf4745ff6c80893.tar.zst PeerTube-3c10840fa90fc88fc98e8169faf4745ff6c80893.zip |
Add video file size info in admin videos list
Diffstat (limited to 'server/controllers/feeds.ts')
-rw-r--r-- | server/controllers/feeds.ts | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server/controllers/feeds.ts b/server/controllers/feeds.ts index 1f6aebac3..29502a154 100644 --- a/server/controllers/feeds.ts +++ b/server/controllers/feeds.ts | |||
@@ -2,6 +2,7 @@ import express from 'express' | |||
2 | import Feed from 'pfeed' | 2 | import Feed from 'pfeed' |
3 | import { getServerActor } from '@server/models/application/application' | 3 | import { getServerActor } from '@server/models/application/application' |
4 | import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils' | 4 | import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils' |
5 | import { VideoInclude } from '@shared/models' | ||
5 | import { buildNSFWFilter } from '../helpers/express-utils' | 6 | import { buildNSFWFilter } from '../helpers/express-utils' |
6 | import { CONFIG } from '../initializers/config' | 7 | import { CONFIG } from '../initializers/config' |
7 | import { FEEDS, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants' | 8 | import { FEEDS, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants' |
@@ -171,8 +172,8 @@ async function generateVideoFeed (req: express.Request, res: express.Response) { | |||
171 | }, | 172 | }, |
172 | nsfw, | 173 | nsfw, |
173 | isLocal: req.query.isLocal, | 174 | isLocal: req.query.isLocal, |
174 | include: req.query.include, | 175 | include: req.query.include | VideoInclude.FILES, |
175 | withFiles: true, | 176 | hasFiles: true, |
176 | countVideos: false, | 177 | countVideos: false, |
177 | ...options | 178 | ...options |
178 | }) | 179 | }) |
@@ -204,9 +205,10 @@ async function generateVideoFeedForSubscriptions (req: express.Request, res: exp | |||
204 | nsfw, | 205 | nsfw, |
205 | 206 | ||
206 | isLocal: req.query.isLocal, | 207 | isLocal: req.query.isLocal, |
207 | include: req.query.include, | ||
208 | 208 | ||
209 | withFiles: true, | 209 | hasFiles: true, |
210 | include: req.query.include | VideoInclude.FILES, | ||
211 | |||
210 | countVideos: false, | 212 | countVideos: false, |
211 | 213 | ||
212 | displayOnlyForFollower: { | 214 | displayOnlyForFollower: { |