3 files changed, 18 insertions, 17 deletions

diff --git a/server/controllers/activitypub/inbox.ts b/server/controllers/activitypub/inbox.ts
index df041aebf..73fbd94aa 100644
--- a/server/controllers/activitypub/inbox.ts
+++ b/server/controllers/activitypub/inbox.ts
@@ -19,7 +19,7 @@ inboxRouter.post('/inbox',
 inboxRouter.post('/accounts/:name/inbox',
   signatureValidator,
   asyncMiddleware(checkSignature),
-  localAccountValidator,
+  asyncMiddleware(localAccountValidator),
   asyncMiddleware(activityPubValidator),
   asyncMiddleware(inboxController)
 )
@@ -36,6 +36,8 @@ async function inboxController (req: express.Request, res: express.Response, nex
   const rootActivity: RootActivity = req.body
   let activities: Activity[] = []
 
+  console.log(rootActivity)
+
   if ([ 'Collection', 'CollectionPage' ].indexOf(rootActivity.type) !== -1) {
     activities = (rootActivity as ActivityPubCollection).items
   } else if ([ 'OrderedCollection', 'OrderedCollectionPage' ].indexOf(rootActivity.type) !== -1) {
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()
+}
 
 // ---------------------------------------------------------------------------
 
diff --git a/server/models/video/video.ts b/server/models/video/video.ts
index 8b58b393b..54fe54535 100644
--- a/server/models/video/video.ts
+++ b/server/models/video/video.ts
@@ -1000,7 +1000,7 @@ export class VideoModel extends Model<VideoModel> {
       descriptionPath: this.getDescriptionPath(),
       channel: this.VideoChannel.toFormattedJSON(),
       account: this.VideoChannel.Account.toFormattedJSON(),
-      tags: map<TagModel, string>(this.Tags, 'name'),
+      tags: map(this.Tags, 'name'),
       commentsEnabled: this.commentsEnabled,
       files: []
     }