import * as express from 'express'
import 'express-validator'
-import { body, param } from 'express-validator/check'
+import { body, param, query } from 'express-validator/check'
import { logger } from '../../helpers/logger'
import { areValidationErrors } from './utils'
import { ActorFollowModel } from '../../models/activitypub/actor-follow'
-import { isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
+import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
import { UserModel } from '../../models/account/user'
import { CONFIG } from '../../initializers'
+import { toArray } from '../../helpers/custom-validators/misc'
const userSubscriptionAddValidator = [
body('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'),
}
]
-const userSubscriptionRemoveValidator = [
+const areSubscriptionsExistValidator = [
+ query('uris')
+ .customSanitizer(toArray)
+ .custom(areValidActorHandles).withMessage('Should have a valid uri array'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ logger.debug('Checking areSubscriptionsExistValidator parameters', { parameters: req.query })
+
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
+
+const userSubscriptionGetValidator = [
param('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to unfollow'),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking unfollow parameters', { parameters: req.params })
+ logger.debug('Checking userSubscriptionGetValidator parameters', { parameters: req.params })
if (areValidationErrors(req, res)) return
if (host === CONFIG.WEBSERVER.HOST) host = null
const user: UserModel = res.locals.oauth.token.User
- const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHost(user.Account.Actor.id, name, host)
+ const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI(user.Account.Actor.id, name, host)
- if (!subscription) {
+ if (!subscription || !subscription.ActorFollowing.VideoChannel) {
return res
.status(404)
.json({
// ---------------------------------------------------------------------------
export {
+ areSubscriptionsExistValidator,
userSubscriptionAddValidator,
- userSubscriptionRemoveValidator
+ userSubscriptionGetValidator
}
-
-// ---------------------------------------------------------------------------