2 files changed, 21 insertions, 61 deletions

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
new file mode 100644
index 000000000..78a6d1444
--- /dev/null
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -0,0 +1,21 @@
+import { body } from 'express-validator/check'
+import * as express from 'express'
+
+import { logger, isRootActivityValid } from '../../../helpers'
+import { checkErrors } from '../utils'
+
+const activityPubValidator = [
+  body('data').custom(isRootActivityValid),
+
+  (req: express.Request, res: express.Response, next: express.NextFunction) => {
+    logger.debug('Checking activity pub parameters', { parameters: req.body })
+
+    checkErrors(req, res, next)
+  }
+]
+
+// ---------------------------------------------------------------------------
+
+export {
+  activityPubValidator
+}
diff --git a/server/middlewares/validators/activitypub/videos.ts b/server/middlewares/validators/activitypub/videos.ts
deleted file mode 100644
index 497320cc1..000000000
--- a/server/middlewares/validators/activitypub/videos.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { body } from 'express-validator/check'
-import * as express from 'express'
-
-import {
-  logger,
-  isArray,
-  removeBadRequestVideos,
-  removeBadRequestVideosQadu,
-  removeBadRequestVideosEvents
-} from '../../../helpers'
-import { checkErrors } from '../utils'
-
-const remoteVideosValidator = [
-  body('data').custom(isArray),
-
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking remoteVideos parameters', { parameters: req.body })
-
-    checkErrors(req, res, () => {
-      removeBadRequestVideos(req.body.data)
-
-      return next()
-    })
-  }
-]
-
-const remoteQaduVideosValidator = [
-  body('data').custom(isArray),
-
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking remoteQaduVideos parameters', { parameters: req.body })
-
-    checkErrors(req, res, () => {
-      removeBadRequestVideosQadu(req.body.data)
-
-      return next()
-    })
-  }
-]
-
-const remoteEventsVideosValidator = [
-  body('data').custom(isArray),
-
-  (req: express.Request, res: express.Response, next: express.NextFunction) => {
-    logger.debug('Checking remoteEventsVideos parameters', { parameters: req.body })
-
-    checkErrors(req, res, () => {
-      removeBadRequestVideosEvents(req.body.data)
-
-      return next()
-    })
-  }
-]
-
-// ---------------------------------------------------------------------------
-
-export {
-  remoteVideosValidator,
-  remoteQaduVideosValidator,
-  remoteEventsVideosValidator
-}