Don't federate anything from the random magazine (#1236)

Co-authored-by: Melroy van den Berg <[email protected]>
MbinOrg · Nov 24, 2024 · af60baa · af60baa
1 parent acf1f81
commit af60baa
Show file tree

Hide file tree

Showing 11 changed files with 65 additions and 7 deletions.
diff --git a/src/EventSubscriber/ActivityPub/GroupWebFingerProfileSubscriber.php b/src/EventSubscriber/ActivityPub/GroupWebFingerProfileSubscriber.php
@@ -55,6 +55,10 @@ public function buildResponse(WebfingerResponseEvent $event): void
 
     protected function getActor($name): ?Magazine
     {
+        if ('random' === $name) {
+            return null;
+        }
+
         return $this->magazineRepository->findOneByName($name);
     }
 }
diff --git a/src/EventSubscriber/ActivityPub/GroupWebFingerSubscriber.php b/src/EventSubscriber/ActivityPub/GroupWebFingerSubscriber.php
@@ -62,6 +62,10 @@ public function buildResponse(WebfingerResponseEvent $event): void
 
     protected function getActor($name): ?Magazine
     {
+        if ('random' === $name) {
+            return null;
+        }
+
         return $this->magazineRepository->findOneByName($name);
     }
 }
diff --git a/src/MessageHandler/ActivityPub/Outbox/AddHandler.php b/src/MessageHandler/ActivityPub/Outbox/AddHandler.php
@@ -49,6 +49,10 @@ public function doWork(MessageInterface $message): void
         if ($magazine->apId) {
             $audience = [$magazine->apInboxUrl];
         } else {
+            if ('random' === $magazine->name) {
+                // do not federate the random magazine
+                return;
+            }
             $audience = $this->magazineRepository->findAudience($magazine);
         }
 

diff --git a/src/MessageHandler/ActivityPub/Outbox/AnnounceHandler.php b/src/MessageHandler/ActivityPub/Outbox/AnnounceHandler.php
@@ -96,6 +96,10 @@ public function doWork(MessageInterface $message): void
                 $this->activityPubManager->createInboxesFromCC($activity, $actor),
             );
         } elseif ($actor instanceof Magazine) {
+            if ('random' === $actor->name) {
+                // do not federate the random magazine
+                return;
+            }
             $createHost = parse_url($object->apId, PHP_URL_HOST);
             $inboxes = array_filter(array_merge(
                 $inboxes,

diff --git a/src/MessageHandler/ActivityPub/Outbox/CreateHandler.php b/src/MessageHandler/ActivityPub/Outbox/CreateHandler.php
@@ -61,8 +61,11 @@ public function doWork(MessageInterface $message): void
             $receivers = [
                 ...$this->userRepository->findAudience($entity->user),
                 ...$this->activityPubManager->createInboxesFromCC($activity, $entity->user),
-                ...$this->magazineRepository->findAudience($entity->magazine),
             ];
+            if ('random' !== $entity->magazine->name) {
+                // only add the magazine subscribers if it is not the random magazine
+                $receivers = array_merge($receivers, $this->magazineRepository->findAudience($entity->magazine));
+            }
             $this->logger->debug('sending create activity to {p}', ['p' => $receivers]);
         }
         $this->deliverManager->deliver(array_filter(array_unique($receivers)), $activity);

diff --git a/src/MessageHandler/ActivityPub/Outbox/DeleteHandler.php b/src/MessageHandler/ActivityPub/Outbox/DeleteHandler.php
@@ -49,8 +49,16 @@ public function doWork(MessageInterface $message): void
         $inboxes = array_filter(array_unique(array_merge(
             $this->userRepository->findAudience($user),
             $this->activityPubManager->createInboxesFromCC($message->payload, $user),
-            $this->magazineRepository->findAudience($magazine)
         )));
+
+        if ('random' !== $magazine->name) {
+            // only add the magazine subscribers if it is not the random magazine
+            $inboxes = array_filter(array_unique(array_merge(
+                $inboxes,
+                $this->magazineRepository->findAudience($magazine),
+            )));
+        }
+
         $this->deliverManager->deliver($inboxes, $message->payload);
     }
 }
diff --git a/src/MessageHandler/ActivityPub/Outbox/EntryPinMessageHandler.php b/src/MessageHandler/ActivityPub/Outbox/EntryPinMessageHandler.php
@@ -55,6 +55,11 @@ public function doWork(MessageInterface $message): void
             return;
         }
 
+        if ('random' === $entry->magazine->name) {
+            // do not federate the random magazine
+            return;
+        }
+
         if ($message->sticky) {
             $activity = $this->addRemoveFactory->buildAddPinnedPost($user, $entry);
         } else {

diff --git a/src/MessageHandler/ActivityPub/Outbox/GenericAnnounceHandler.php b/src/MessageHandler/ActivityPub/Outbox/GenericAnnounceHandler.php
@@ -46,6 +46,11 @@ public function doWork(MessageInterface $message): void
         if (null !== $magazine->apId) {
             return;
         }
+
+        if ('random' === $magazine->name) {
+            // do not federate the random magazine
+            return;
+        }
         $magazineUrl = $this->urlGenerator->generate('ap_magazine', ['name' => $magazine->name], UrlGeneratorInterface::ABSOLUTE_URL);
         $announce = $this->announceWrapper->build($magazineUrl, $message->payloadToAnnounce);
         $inboxes = array_filter($this->magazineRepository->findAudience($magazine), fn ($item) => null !== $item && $item !== $message->sourceInstance);

diff --git a/src/MessageHandler/ActivityPub/Outbox/LikeHandler.php b/src/MessageHandler/ActivityPub/Outbox/LikeHandler.php
@@ -66,11 +66,16 @@ public function doWork(MessageInterface $message): void
             $activity = $this->undoWrapper->build($activity);
         }
 
-        $inboxes = array_filter(array_unique(array_merge(
+        $inboxes = array_merge(
             $this->userRepository->findAudience($user),
-            $this->magazineRepository->findAudience($object->magazine),
-            [$object->user->apInboxUrl, $object->magazine->apId ? $object->magazine->apInboxUrl : null]
-        )));
-        $this->deliverManager->deliver($inboxes, $activity);
+            [$object->user->apInboxUrl],
+        );
+
+        if ('random' !== $object->magazine->name) {
+            // only add the magazine subscribers if it is not the random magazine
+            $inboxes = array_merge($inboxes, $this->magazineRepository->findAudience($object->magazine));
+        }
+
+        $this->deliverManager->deliver(array_filter(array_unique($inboxes)), $activity);
     }
 }
diff --git a/src/MessageHandler/ActivityPub/Outbox/RemoveHandler.php b/src/MessageHandler/ActivityPub/Outbox/RemoveHandler.php
@@ -46,6 +46,12 @@ public function doWork(MessageInterface $message): void
         $actor = $this->userRepository->find($message->userActorId);
         $removed = $this->userRepository->find($message->removedUserId);
         $magazine = $this->magazineRepository->find($message->magazineId);
+
+        if ('random' === $magazine->name) {
+            // do not federate the random magazine
+            return;
+        }
+
         if ($magazine->apId) {
             $audience = [$magazine->apInboxUrl];
         } else {

diff --git a/src/MessageHandler/ActivityPub/Outbox/UpdateHandler.php b/src/MessageHandler/ActivityPub/Outbox/UpdateHandler.php
@@ -64,6 +64,11 @@ public function doWork(MessageInterface $message): void
             $activity = $this->updateWrapper->buildForActivity($entity, $editedByUser);
 
             if ($entity instanceof Entry || $entity instanceof EntryComment || $entity instanceof Post || $entity instanceof PostComment) {
+                if ('random' === $entity->magazine->name) {
+                    // do not federate the random magazine
+                    return;
+                }
+
                 $inboxes = array_filter(array_unique(array_merge(
                     $this->userRepository->findAudience($entity->user),
                     $this->activityPubManager->createInboxesFromCC($activity, $entity->user),
@@ -82,6 +87,11 @@ public function doWork(MessageInterface $message): void
             if ($entity instanceof User) {
                 $inboxes = $this->userRepository->findAudience($entity);
             } elseif ($entity instanceof Magazine) {
+                if ('random' === $entity->name) {
+                    // do not federate the random magazine
+                    return;
+                }
+
                 if (null === $entity->apId) {
                     $inboxes = $this->magazineRepository->findAudience($entity);
                     if (null !== $editedByUser) {