Federate edits

src/EventSubscriber/Entry/EntryPinSubscriber.php

@@ -41,7 +41,7 @@ public function onEntryPin(EntryPinEvent $event): void
                     $activity = $this->addRemoveFactory->buildRemovePinnedPost($event->actor, $event->entry);
                 }
                 $this->logger->debug('dispatching announce for add pin post {e} by {u} in {m}', ['e' => $event->entry->title, 'u' => $event->actor->apId, 'm' => $event->entry->magazine->name]);
-                $this->bus->dispatch(new GenericAnnounceMessage($event->entry->magazine->getId(), $activity));
+                $this->bus->dispatch(new GenericAnnounceMessage($event->entry->magazine->getId(), $activity, $event->actor->apInboxUrl));
             } else {
                 $this->logger->debug('entry {e} got {p} by {u}, dispatching new EntryPinMessage', ['e' => $event->entry->title, 'p' => $event->entry->sticky ? 'pinned' : 'unpinned', 'u' => $event->actor?->username ?? 'system']);
                 $this->bus->dispatch(new EntryPinMessage($event->entry->getId(), $event->entry->sticky, $event->actor?->getId()));

src/Message/ActivityPub/Outbox/GenericAnnounceMessage.php

@@ -8,7 +8,7 @@
 
 class GenericAnnounceMessage implements ActivityPubOutboxInterface
 {
-    public function __construct(public int $announcingMagazineId, public array $payloadToAnnounce)
+    public function __construct(public int $announcingMagazineId, public array $payloadToAnnounce, public ?string $sourceInstance)
     {
     }
 }

src/MessageHandler/ActivityPub/Inbox/UpdateHandler.php

@@ -19,6 +19,7 @@
 use App\Factory\PostCommentFactory;
 use App\Factory\PostFactory;
 use App\Message\ActivityPub\Inbox\UpdateMessage;
+use App\Message\ActivityPub\Outbox\GenericAnnounceMessage;
 use App\Message\Contracts\MessageInterface;
 use App\MessageHandler\MbinMessageHandler;
 use App\Repository\ApActivityRepository;
@@ -32,6 +33,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\MessageBusInterface;
 
 #[AsMessageHandler]
 class UpdateHandler extends MbinMessageHandler
@@ -53,6 +55,7 @@ public function __construct(
         private readonly ApObjectExtractor $objectExtractor,
         private readonly MessageManager $messageManager,
         private readonly LoggerInterface $logger,
+        private readonly MessageBusInterface $bus,
     ) {
         parent::__construct($this->entityManager);
     }
@@ -82,31 +85,29 @@ public function doWork(MessageInterface $message): void
         }
 
         $object = $this->entityManager->getRepository($object['type'])->find((int) $object['id']);
-
-        if (Entry::class === \get_class($object)) {
+        if ($object instanceof Entry) {
             $this->editEntry($object, $actor);
-        } elseif (EntryComment::class === \get_class($object)) {
+            if (null === $object->magazine->apId) {
+                $this->bus->dispatch(new GenericAnnounceMessage($object->magazine->getId(), $message->payload, $actor->apInboxUrl));
+            }
+        } elseif ($object instanceof EntryComment) {
             $this->editEntryComment($object, $actor);
-        } elseif (Post::class === \get_class($object)) {
+            if (null === $object->magazine->apId) {
+                $this->bus->dispatch(new GenericAnnounceMessage($object->magazine->getId(), $message->payload, $actor->apInboxUrl));
+            }
+        } elseif ($object instanceof Post) {
             $this->editPost($object, $actor);
-        } elseif (PostComment::class === \get_class($object)) {
+            if (null === $object->magazine->apId) {
+                $this->bus->dispatch(new GenericAnnounceMessage($object->magazine->getId(), $message->payload, $actor->apInboxUrl));
+            }
+        } elseif ($object instanceof PostComment) {
             $this->editPostComment($object, $actor);
-        } elseif (Message::class === \get_class($object)) {
+            if (null === $object->magazine->apId) {
+                $this->bus->dispatch(new GenericAnnounceMessage($object->magazine->getId(), $message->payload, $actor->apInboxUrl));
+            }
+        } elseif ($object instanceof Message) {
             $this->editMessage($object, $actor);
         }
-
-        // Dead-code introduced by Ernest "Temp disable handler dispatch", in commit:
-        // 4573e87f91923b9a5758e0dfacb3870d55ef1166
-        //
-        //        if (null === $object->magazine->apId) {
-        //            $this->bus->dispatch(
-        //                new \App\Message\ActivityPub\Outbox\UpdateMessage(
-        //                    $actor->getId(),
-        //                    $object->getId(),
-        //                    get_class($object)
-        //                )
-        //            );
-        //        }
     }
 
     private function editEntry(Entry $entry, User $user): void

src/MessageHandler/ActivityPub/Outbox/GenericAnnounceHandler.php

@@ -48,7 +48,7 @@ public function doWork(MessageInterface $message): void
         }
         $magazineUrl = $this->urlGenerator->generate('ap_magazine', ['name' => $magazine->name], UrlGeneratorInterface::ABSOLUTE_URL);
         $announce = $this->announceWrapper->build($magazineUrl, $message->payloadToAnnounce);
-        $inboxes = $this->magazineRepository->findAudience($magazine);
+        $inboxes = array_filter($this->magazineRepository->findAudience($magazine), fn ($item) => null !== $item && $item !== $message->sourceInstance);
         $this->deliverManager->deliver($inboxes, $announce);
     }
 }