Hide schedule privacy if private does not exist

[github/Chocobozzz/PeerTube.git] / server / middlewares / validators / activitypub / activity.ts

diff --git a/server/middlewares/validators/activitypub/activity.ts b/server/middlewares/validators/activitypub/activity.ts
index 255d8eb17933c9e798ef75036c0564c5a4c8e823..cc6acd4b1aa401a60b9d518b5aef798c0a4a9829 100644 (file)
--- a/server/middlewares/validators/activitypub/activity.ts
+++ b/server/middlewares/validators/activitypub/activity.ts
@@ -9,16 +9,14 @@ async function activityPubValidator (req: express.Request, res: express.Response
 
   if (!isRootActivityValid(req.body)) {
     logger.warn('Incorrect activity parameters.', { activity: req.body })
-    return res.status(HttpStatusCode.BAD_REQUEST_400)
-              .json({ error: 'Incorrect activity.' })
+    return res.fail({ message: 'Incorrect activity' })
   }
 
   const serverActor = await getServerActor()
   const remoteActor = res.locals.signature.actor
-  if (serverActor.id === remoteActor.id) {
+  if (serverActor.id === remoteActor.id || remoteActor.serverId === null) {
     logger.error('Receiving request in INBOX by ourselves!', req.body)
-    return res.status(HttpStatusCode.CONFLICT_409)
-              .end()
+    return res.status(HttpStatusCode.CONFLICT_409).end()
   }
 
   return next()