From 3c10840fa90fc88fc98e8169faf4745ff6c80893 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 29 Oct 2021 10:54:27 +0200 Subject: Add video file size info in admin videos list --- server/controllers/feeds.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'server/controllers/feeds.ts') 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' import Feed from 'pfeed' import { getServerActor } from '@server/models/application/application' import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils' +import { VideoInclude } from '@shared/models' import { buildNSFWFilter } from '../helpers/express-utils' import { CONFIG } from '../initializers/config' import { FEEDS, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants' @@ -171,8 +172,8 @@ async function generateVideoFeed (req: express.Request, res: express.Response) { }, nsfw, isLocal: req.query.isLocal, - include: req.query.include, - withFiles: true, + include: req.query.include | VideoInclude.FILES, + hasFiles: true, countVideos: false, ...options }) @@ -204,9 +205,10 @@ async function generateVideoFeedForSubscriptions (req: express.Request, res: exp nsfw, isLocal: req.query.isLocal, - include: req.query.include, - withFiles: true, + hasFiles: true, + include: req.query.include | VideoInclude.FILES, + countVideos: false, displayOnlyForFollower: { -- cgit v1.2.3