-import * as express from 'express'
-import 'express-validator'
-import { body, param } 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 { UserModel } from '../../models/account/user'
-import { CONFIG } from '../../initializers'
+import { arrayify } from '@shared/core-utils'
+import express from 'express'
+import { body, param, query } from 'express-validator'
+import { HttpStatusCode } from '../../../shared/models/http/http-error-codes'
+import { areValidActorHandles, isValidActorHandle } from '../../helpers/custom-validators/activitypub/actor'
+import { WEBSERVER } from '../../initializers/constants'
+import { ActorFollowModel } from '../../models/actor/actor-follow'
+import { areValidationErrors } from './shared'
+
+const userSubscriptionListValidator = [
+ query('search')
+ .optional()
+ .not().isEmpty(),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
+ if (areValidationErrors(req, res)) return
+
+ return next()
+ }
+]
const userSubscriptionAddValidator = [
- body('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'),
+ body('uri')
+ .custom(isValidActorHandle).withMessage('Should have a valid URI to follow (username@domain)'),
(req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking userSubscriptionAddValidator parameters', { parameters: req.body })
+ if (areValidationErrors(req, res)) return
+ return next()
+ }
+]
+
+const areSubscriptionsExistValidator = [
+ query('uris')
+ .customSanitizer(arrayify)
+ .custom(areValidActorHandles).withMessage('Should have a valid array of URIs'),
+
+ (req: express.Request, res: express.Response, next: express.NextFunction) => {
if (areValidationErrors(req, res)) return
return next()
]
const userSubscriptionGetValidator = [
- param('uri').custom(isValidActorHandle).withMessage('Should have a valid URI to unfollow'),
+ param('uri')
+ .custom(isValidActorHandle),
async (req: express.Request, res: express.Response, next: express.NextFunction) => {
- logger.debug('Checking userSubscriptionGetValidator parameters', { parameters: req.params })
-
if (areValidationErrors(req, res)) return
let [ name, host ] = req.params.uri.split('@')
- if (host === CONFIG.WEBSERVER.HOST) host = null
+ if (host === WEBSERVER.HOST) host = null
- const user: UserModel = res.locals.oauth.token.User
- const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHost(user.Account.Actor.id, name, host)
+ const user = res.locals.oauth.token.User
+ const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHostForAPI({
+ actorId: user.Account.Actor.id,
+ targetName: name,
+ targetHost: host,
+ state: 'accepted'
+ })
if (!subscription || !subscription.ActorFollowing.VideoChannel) {
- return res
- .status(404)
- .json({
- error: `Subscription ${req.params.uri} not found.`
- })
- .end()
+ return res.fail({
+ status: HttpStatusCode.NOT_FOUND_404,
+ message: `Subscription ${req.params.uri} not found.`
+ })
}
res.locals.subscription = subscription
// ---------------------------------------------------------------------------
export {
+ areSubscriptionsExistValidator,
+ userSubscriptionListValidator,
userSubscriptionAddValidator,
userSubscriptionGetValidator
}
-
-// ---------------------------------------------------------------------------