aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'server/controllers')
-rw-r--r--server/controllers/api/accounts.ts1
-rw-r--r--server/controllers/api/overviews.ts1
-rw-r--r--server/controllers/api/users/my-subscriptions.ts1
-rw-r--r--server/controllers/api/video-channel.ts1
-rw-r--r--server/controllers/api/videos/index.ts1
-rw-r--r--server/controllers/bots.ts1
-rw-r--r--server/controllers/feeds.ts10
7 files changed, 6 insertions, 10 deletions
diff --git a/server/controllers/api/accounts.ts b/server/controllers/api/accounts.ts
index 44edffe38..46d89bafa 100644
--- a/server/controllers/api/accounts.ts
+++ b/server/controllers/api/accounts.ts
@@ -189,7 +189,6 @@ async function listAccountVideos (req: express.Request, res: express.Response) {
189 189
190 displayOnlyForFollower, 190 displayOnlyForFollower,
191 nsfw: buildNSFWFilter(res, query.nsfw), 191 nsfw: buildNSFWFilter(res, query.nsfw),
192 withFiles: false,
193 accountId: account.id, 192 accountId: account.id,
194 user: res.locals.oauth ? res.locals.oauth.token.User : undefined, 193 user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
195 countVideos 194 countVideos
diff --git a/server/controllers/api/overviews.ts b/server/controllers/api/overviews.ts
index 68626a508..34585e557 100644
--- a/server/controllers/api/overviews.ts
+++ b/server/controllers/api/overviews.ts
@@ -122,7 +122,6 @@ async function getVideos (
122 }, 122 },
123 nsfw: buildNSFWFilter(res), 123 nsfw: buildNSFWFilter(res),
124 user: res.locals.oauth ? res.locals.oauth.token.User : undefined, 124 user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
125 withFiles: false,
126 countVideos: false, 125 countVideos: false,
127 126
128 ...where 127 ...where
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts
index d96378180..6799ca8c5 100644
--- a/server/controllers/api/users/my-subscriptions.ts
+++ b/server/controllers/api/users/my-subscriptions.ts
@@ -181,7 +181,6 @@ async function getUserSubscriptionVideos (req: express.Request, res: express.Res
181 orLocalVideos: false 181 orLocalVideos: false
182 }, 182 },
183 nsfw: buildNSFWFilter(res, query.nsfw), 183 nsfw: buildNSFWFilter(res, query.nsfw),
184 withFiles: false,
185 user, 184 user,
186 countVideos 185 countVideos
187 }) 186 })
diff --git a/server/controllers/api/video-channel.ts b/server/controllers/api/video-channel.ts
index f9c1a405d..d1a1e6473 100644
--- a/server/controllers/api/video-channel.ts
+++ b/server/controllers/api/video-channel.ts
@@ -347,7 +347,6 @@ async function listVideoChannelVideos (req: express.Request, res: express.Respon
347 347
348 displayOnlyForFollower, 348 displayOnlyForFollower,
349 nsfw: buildNSFWFilter(res, query.nsfw), 349 nsfw: buildNSFWFilter(res, query.nsfw),
350 withFiles: false,
351 videoChannelId: videoChannelInstance.id, 350 videoChannelId: videoChannelInstance.id,
352 user: res.locals.oauth ? res.locals.oauth.token.User : undefined, 351 user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
353 countVideos 352 countVideos
diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 821ed7ff3..821161c64 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -225,7 +225,6 @@ async function listVideos (req: express.Request, res: express.Response) {
225 orLocalVideos: true 225 orLocalVideos: true
226 }, 226 },
227 nsfw: buildNSFWFilter(res, query.nsfw), 227 nsfw: buildNSFWFilter(res, query.nsfw),
228 withFiles: false,
229 user: res.locals.oauth ? res.locals.oauth.token.User : undefined, 228 user: res.locals.oauth ? res.locals.oauth.token.User : undefined,
230 countVideos 229 countVideos
231 }, 'filter:api.videos.list.params') 230 }, 'filter:api.videos.list.params')
diff --git a/server/controllers/bots.ts b/server/controllers/bots.ts
index 9f03de7e8..2a8d6863a 100644
--- a/server/controllers/bots.ts
+++ b/server/controllers/bots.ts
@@ -76,7 +76,6 @@ async function getSitemapLocalVideoUrls () {
76 }, 76 },
77 isLocal: true, 77 isLocal: true,
78 nsfw: buildNSFWFilter(), 78 nsfw: buildNSFWFilter(),
79 withFiles: false,
80 countVideos: false 79 countVideos: false
81 }) 80 })
82 81
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'
2import Feed from 'pfeed' 2import Feed from 'pfeed'
3import { getServerActor } from '@server/models/application/application' 3import { getServerActor } from '@server/models/application/application'
4import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils' 4import { getCategoryLabel } from '@server/models/video/formatter/video-format-utils'
5import { VideoInclude } from '@shared/models'
5import { buildNSFWFilter } from '../helpers/express-utils' 6import { buildNSFWFilter } from '../helpers/express-utils'
6import { CONFIG } from '../initializers/config' 7import { CONFIG } from '../initializers/config'
7import { FEEDS, PREVIEWS_SIZE, ROUTE_CACHE_LIFETIME, WEBSERVER } from '../initializers/constants' 8import { 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: {