diff options
Diffstat (limited to 'server/controllers/api/users/my-subscriptions.ts')
-rw-r--r-- | server/controllers/api/users/my-subscriptions.ts | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/server/controllers/api/users/my-subscriptions.ts b/server/controllers/api/users/my-subscriptions.ts index e8949ee59..56b93276f 100644 --- a/server/controllers/api/users/my-subscriptions.ts +++ b/server/controllers/api/users/my-subscriptions.ts | |||
@@ -2,8 +2,8 @@ import 'multer' | |||
2 | import * as express from 'express' | 2 | import * as express from 'express' |
3 | import { sendUndoFollow } from '@server/lib/activitypub/send' | 3 | import { sendUndoFollow } from '@server/lib/activitypub/send' |
4 | import { VideoChannelModel } from '@server/models/video/video-channel' | 4 | import { VideoChannelModel } from '@server/models/video/video-channel' |
5 | import { VideosCommonQuery } from '@shared/models' | ||
5 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' | 6 | import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes' |
6 | import { VideoFilter } from '../../../../shared/models/videos/video-query.type' | ||
7 | import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils' | 7 | import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils' |
8 | import { getFormattedObjects } from '../../../helpers/utils' | 8 | import { getFormattedObjects } from '../../../helpers/utils' |
9 | import { WEBSERVER } from '../../../initializers/constants' | 9 | import { WEBSERVER } from '../../../initializers/constants' |
@@ -170,19 +170,20 @@ async function getUserSubscriptions (req: express.Request, res: express.Response | |||
170 | async function getUserSubscriptionVideos (req: express.Request, res: express.Response) { | 170 | async function getUserSubscriptionVideos (req: express.Request, res: express.Response) { |
171 | const user = res.locals.oauth.token.User | 171 | const user = res.locals.oauth.token.User |
172 | const countVideos = getCountVideos(req) | 172 | const countVideos = getCountVideos(req) |
173 | const query = req.query as VideosCommonQuery | ||
173 | 174 | ||
174 | const resultList = await VideoModel.listForApi({ | 175 | const resultList = await VideoModel.listForApi({ |
175 | start: req.query.start, | 176 | start: query.start, |
176 | count: req.query.count, | 177 | count: query.count, |
177 | sort: req.query.sort, | 178 | sort: query.sort, |
178 | includeLocalVideos: false, | 179 | includeLocalVideos: false, |
179 | categoryOneOf: req.query.categoryOneOf, | 180 | categoryOneOf: query.categoryOneOf, |
180 | licenceOneOf: req.query.licenceOneOf, | 181 | licenceOneOf: query.licenceOneOf, |
181 | languageOneOf: req.query.languageOneOf, | 182 | languageOneOf: query.languageOneOf, |
182 | tagsOneOf: req.query.tagsOneOf, | 183 | tagsOneOf: query.tagsOneOf, |
183 | tagsAllOf: req.query.tagsAllOf, | 184 | tagsAllOf: query.tagsAllOf, |
184 | nsfw: buildNSFWFilter(res, req.query.nsfw), | 185 | nsfw: buildNSFWFilter(res, query.nsfw), |
185 | filter: req.query.filter as VideoFilter, | 186 | filter: query.filter, |
186 | withFiles: false, | 187 | withFiles: false, |
187 | followerActorId: user.Account.Actor.id, | 188 | followerActorId: user.Account.Actor.id, |
188 | user, | 189 | user, |