X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=server%2Fmiddlewares%2Fvalidators%2Fuser-subscriptions.ts;h=d8c26c742d6ee9fb5809892e88aa8eed061086f7;hb=99492dbc0d87ef54d0dab7d8d44f8d0de5722bdd;hp=f331b6c34c13d1fe55a227911e89af3ee7a22677;hpb=8a19bee1a1ee39f973bb37429e4f73c3f2873cdb;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/validators/user-subscriptions.ts b/server/middlewares/validators/user-subscriptions.ts index f331b6c34..d8c26c742 100644 --- a/server/middlewares/validators/user-subscriptions.ts +++ b/server/middlewares/validators/user-subscriptions.ts @@ -20,11 +20,11 @@ const userSubscriptionAddValidator = [ } ] -const userSubscriptionRemoveValidator = [ +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 @@ -34,7 +34,7 @@ const userSubscriptionRemoveValidator = [ const user: UserModel = res.locals.oauth.token.User const subscription = await ActorFollowModel.loadByActorAndTargetNameAndHost(user.Account.Actor.id, name, host) - if (!subscription) { + if (!subscription || !subscription.ActorFollowing.VideoChannel) { return res .status(404) .json({ @@ -52,7 +52,7 @@ const userSubscriptionRemoveValidator = [ export { userSubscriptionAddValidator, - userSubscriptionRemoveValidator + userSubscriptionGetValidator } // ---------------------------------------------------------------------------