import 'multer'
import * as express from 'express'
-import { VideoFilter } from '../../../../shared/models/videos/video-query.type'
+import { sendUndoFollow } from '@server/lib/activitypub/send'
+import { VideoChannelModel } from '@server/models/video/video-channel'
+import { VideosCommonQuery } from '@shared/models'
+import { HttpStatusCode } from '../../../../shared/core-utils/miscs/http-error-codes'
import { buildNSFWFilter, getCountVideos } from '../../../helpers/express-utils'
import { getFormattedObjects } from '../../../helpers/utils'
import { WEBSERVER } from '../../../initializers/constants'
userSubscriptionsSortValidator,
videosSortValidator
} from '../../../middlewares/validators'
-import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { ActorFollowModel } from '../../../models/actor/actor-follow'
import { VideoModel } from '../../../models/video/video'
-import { sendUndoFollow } from '@server/lib/activitypub/send'
const mySubscriptionsRouter = express.Router()
mySubscriptionsRouter.get('/me/subscriptions/:uri',
authenticate,
userSubscriptionGetValidator,
- getUserSubscription
+ asyncMiddleware(getUserSubscription)
)
mySubscriptionsRouter.delete('/me/subscriptions/:uri',
JobQueue.Instance.createJob({ type: 'activitypub-follow', payload })
- return res.status(204).end()
+ return res.status(HttpStatusCode.NO_CONTENT_204).end()
}
-function getUserSubscription (req: express.Request, res: express.Response) {
+async function getUserSubscription (req: express.Request, res: express.Response) {
const subscription = res.locals.subscription
+ const videoChannel = await VideoChannelModel.loadAndPopulateAccount(subscription.ActorFollowing.VideoChannel.id)
- return res.json(subscription.ActorFollowing.VideoChannel.toFormattedJSON())
+ return res.json(videoChannel.toFormattedJSON())
}
async function deleteUserSubscription (req: express.Request, res: express.Response) {
return subscription.destroy({ transaction: t })
})
- return res.type('json').status(204).end()
+ return res.type('json')
+ .status(HttpStatusCode.NO_CONTENT_204)
+ .end()
}
async function getUserSubscriptions (req: express.Request, res: express.Response) {
async function getUserSubscriptionVideos (req: express.Request, res: express.Response) {
const user = res.locals.oauth.token.User
const countVideos = getCountVideos(req)
+ const query = req.query as VideosCommonQuery
const resultList = await VideoModel.listForApi({
- start: req.query.start,
- count: req.query.count,
- sort: req.query.sort,
+ start: query.start,
+ count: query.count,
+ sort: query.sort,
includeLocalVideos: false,
- categoryOneOf: req.query.categoryOneOf,
- licenceOneOf: req.query.licenceOneOf,
- languageOneOf: req.query.languageOneOf,
- tagsOneOf: req.query.tagsOneOf,
- tagsAllOf: req.query.tagsAllOf,
- nsfw: buildNSFWFilter(res, req.query.nsfw),
- filter: req.query.filter as VideoFilter,
+ categoryOneOf: query.categoryOneOf,
+ licenceOneOf: query.licenceOneOf,
+ languageOneOf: query.languageOneOf,
+ tagsOneOf: query.tagsOneOf,
+ tagsAllOf: query.tagsAllOf,
+ nsfw: buildNSFWFilter(res, query.nsfw),
+ filter: query.filter,
withFiles: false,
followerActorId: user.Account.Actor.id,
user,