Upgrade server dependencies

1 files changed, 14 insertions, 15 deletions

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index 8c2920328..4aace4c8e 100644
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -6,24 +6,23 @@ import { getServerActor } from '../../../helpers/utils'
 import { ActorModel } from '../../../models/activitypub/actor'
 import { areValidationErrors } from '../utils'
 
-const activityPubValidator = [
-  body('').custom((value, { req }) => isRootActivityValid(req.body)),
+async function activityPubValidator (req: express.Request, res: express.Response, next: express.NextFunction) {
+  logger.debug('Checking activity pub parameters')
 
-  async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking activity pub parameters')
-
-    if (areValidationErrors(req, res)) return
-
-    const serverActor = await getServerActor()
-    const remoteActor = res.locals.signature.actor as ActorModel
-    if (serverActor.id === remoteActor.id) {
-      logger.error('Receiving request in INBOX by ourselves!', req.body)
-      return res.status(409).end()
-    }
+  if (!isRootActivityValid(req.body)) {
+    logger.warn('Incorrect activity parameters.', { activity: req.body })
+    return res.status(400).json({ error: 'Incorrect activity.' })
+  }
 
-    return next()
+  const serverActor = await getServerActor()
+  const remoteActor = res.locals.signature.actor as ActorModel
+  if (serverActor.id === remoteActor.id) {
+    logger.error('Receiving request in INBOX by ourselves!', req.body)
+    return res.status(409).end()
   }
-]
+
+  return next()
+}
 
 // ---------------------------------------------------------------------------