Add additional checks for banned instances + various code improvements along the way

src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php

@@ -44,7 +44,7 @@ public function __construct(
         private readonly SignatureValidator $signatureValidator,
         private readonly SettingsManager $settingsManager,
         private readonly MessageBusInterface $bus,
-        private readonly ActivityPubManager $manager,
+        private readonly ActivityPubManager $activityPubManager,
         private readonly ApHttpClient $apHttpClient,
         private readonly InstanceRepository $instanceRepository,
         private readonly RemoteInstanceManager $remoteInstanceManager,
@@ -121,15 +121,15 @@ public function doWork(MessageInterface $message): void
 
         try {
             if (isset($payload['actor']) || isset($payload['attributedTo'])) {
-                if (!$this->verifyInstanceDomain($payload['actor'] ?? $this->manager->getSingleActorFromAttributedTo($payload['attributedTo']))) {
+                if (!$this->verifyInstanceDomain($payload['actor'] ?? $this->activityPubManager->getSingleActorFromAttributedTo($payload['attributedTo']))) {
                     return;
                 }
-                $user = $this->manager->findActorOrCreate($payload['actor'] ?? $this->manager->getSingleActorFromAttributedTo($payload['attributedTo']));
+                $user = $this->activityPubManager->findActorOrCreate($payload['actor'] ?? $this->activityPubManager->getSingleActorFromAttributedTo($payload['attributedTo']));
             } else {
                 if (!$this->verifyInstanceDomain($payload['id'])) {
                     return;
                 }
-                $user = $this->manager->findActorOrCreate($payload['id']);
+                $user = $this->activityPubManager->findActorOrCreate($payload['id']);
             }
         } catch (\Exception $e) {
             $this->logger->error('[ActivityHandler::doWork] Payload: '.json_encode($payload));
@@ -159,7 +159,7 @@ private function handle(?array $payload)
         if ('Announce' === $payload['type']) {
             // we check for an array here, because boosts are announces with an url (string) as the object
             if (\is_array($payload['object'])) {
-                $actorObject = $this->manager->findActorOrCreate($payload['actor']);
+                $actorObject = $this->activityPubManager->findActorOrCreate($payload['actor']);
                 if ($actorObject instanceof Magazine && $actorObject->lastOriginUpdate < (new \DateTime())->modify('-3 hours')) {
                     if (isset($payload['object']['type']) && 'Create' === $payload['object']['type']) {
                         $actorObject->lastOriginUpdate = new \DateTime();
@@ -171,7 +171,7 @@ private function handle(?array $payload)
                 $payload = $payload['object'];
                 $actor = $payload['actor'] ?? $payload['attributedTo'] ?? null;
                 if ($actor) {
-                    $user = $this->manager->findActorOrCreate($actor);
+                    $user = $this->activityPubManager->findActorOrCreate($actor);
                     if ($user instanceof User && null === $user->apId) {
                         // don't do anything if we get an announce activity for something a local user did (unless it's a boost, see comment above)
                         $this->logger->warning('[ActivityHandler::handle] Ignoring this message because it announces an activity from a local user');

src/MessageHandler/ActivityPub/Inbox/AnnounceHandler.php

@@ -14,7 +14,6 @@
 use App\Service\VoteManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Messenger\MessageBusInterface;
 
@@ -25,8 +24,7 @@ public function __construct(
         private readonly ActivityPubManager $activityPubManager,
         private readonly EntityManagerInterface $entityManager,
         private readonly MessageBusInterface $bus,
-        private readonly KernelInterface $kernel,
-        private readonly VoteManager $manager,
+        private readonly VoteManager $voteManager,
         private readonly VoteHandleSubscriber $voteHandleSubscriber,
         private readonly LoggerInterface $logger,
     ) {
@@ -59,7 +57,7 @@ public function doWork(MessageInterface $message): void
             $actor = $this->activityPubManager->findActorOrCreate($message->payload['actor']);
 
             if ($actor instanceof User) {
-                $this->manager->upvote($entity, $actor);
+                $this->voteManager->upvote($entity, $actor);
                 $this->voteHandleSubscriber->clearCache($entity);
             } else {
                 $entity->lastActive = new \DateTime();

src/MessageHandler/ActivityPub/Inbox/LikeHandler.php

@@ -31,7 +31,7 @@ public function __construct(
         private readonly ActivityPubManager $activityPubManager,
         private readonly VoteManager $voteManager,
         private readonly MessageBusInterface $bus,
-        private readonly FavouriteManager $manager,
+        private readonly FavouriteManager $favouriteManager,
         private readonly LoggerInterface $logger,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
@@ -68,7 +68,7 @@ public function doWork(MessageInterface $message): void
             $actor = $this->activityPubManager->findActorOrCreate($message->payload['actor']);
             // Check if actor and entity aren't empty
             if (!empty($actor) && !empty($entity)) {
-                $this->manager->toggle($actor, $entity, FavouriteManager::TYPE_LIKE);
+                $this->favouriteManager->toggle($actor, $entity, FavouriteManager::TYPE_LIKE);
             }
         } elseif ('Undo' === $message->payload['type']) {
             if ('Like' === $message->payload['object']['type']) {
@@ -80,7 +80,7 @@ public function doWork(MessageInterface $message): void
                 $actor = $this->activityPubManager->findActorOrCreate($message->payload['actor']);
                 // Check if actor and entity aren't empty
                 if (!empty($actor) && !empty($entity)) {
-                    $this->manager->toggle($actor, $entity, FavouriteManager::TYPE_UNLIKE);
+                    $this->favouriteManager->toggle($actor, $entity, FavouriteManager::TYPE_UNLIKE);
                     $this->voteManager->removeVote($entity, $actor);
                 }
             }

src/MessageHandler/ActivityPub/Outbox/DeliverHandler.php

@@ -33,7 +33,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly ApHttpClient $client,
-        private readonly ActivityPubManager $manager,
+        private readonly ActivityPubManager $activityPubManager,
         private readonly SettingsManager $settingsManager,
         private readonly LoggerInterface $logger,
         private readonly InstanceRepository $instanceRepository,
@@ -122,7 +122,7 @@ public function doWork(MessageInterface $message): void
             $url = $message->payload['actor'];
         }
         $this->logger->debug("Getting Actor for url: $url");
-        $actor = $this->manager->findActorOrCreate($url);
+        $actor = $this->activityPubManager->findActorOrCreate($url);
 
         if (!$actor) {
             $this->logger->debug('got no actor :(');

src/MessageHandler/ActivityPub/UpdateActorHandler.php

@@ -13,7 +13,6 @@
 use App\Service\ActivityPubManager;
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
@@ -22,8 +21,7 @@ class UpdateActorHandler extends MbinMessageHandler
 {
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
-        private readonly KernelInterface $kernel,
-        private readonly ActivityPubManager $manager,
+        private readonly ActivityPubManager $activityPubManager,
         private readonly ApHttpClient $apHttpClient,
         private readonly LockFactory $lockFactory,
         private readonly UserRepository $userRepository,
@@ -63,7 +61,7 @@ public function doWork(MessageInterface $message): void
                 $this->apHttpClient->invalidateActorObjectCache($actorUrl);
             }
             if ($message->force || $actor->apFetchedAt < (new \DateTime())->modify('-1 hour')) {
-                $this->manager->updateActor($actorUrl);
+                $this->activityPubManager->updateActor($actorUrl);
             } else {
                 $this->logger->debug('not updating actor {url}: last updated is recent: {fetched}', [
                     'url' => $actorUrl,

src/MessageHandler/Notification/SentEntryCommentCreatedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendCreated($comment);
+        $this->notificationManager->sendCreated($comment);
     }
 }

src/MessageHandler/Notification/SentEntryCommentDeletedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendDeleted($comment);
+        $this->notificationManager->sendDeleted($comment);
     }
 }

src/MessageHandler/Notification/SentEntryCommentEditedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendEdited($comment);
+        $this->notificationManager->sendEdited($comment);
     }
 }

src/MessageHandler/Notification/SentEntryCreatedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Entry not found');
         }
 
-        $this->manager->sendCreated($entry);
+        $this->notificationManager->sendCreated($entry);
     }
 }

src/MessageHandler/Notification/SentEntryDeletedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Entry not found');
         }
 
-        $this->manager->sendDeleted($entry);
+        $this->notificationManager->sendDeleted($entry);
     }
 }

src/MessageHandler/Notification/SentEntryEditedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly EntryRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Entry not found');
         }
 
-        $this->manager->sendEdited($entry);
+        $this->notificationManager->sendEdited($entry);
     }
 }

src/MessageHandler/Notification/SentMagazineBanNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly MagazineBanRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Ban not found');
         }
 
-        $this->manager->sendMagazineBanNotification($ban);
+        $this->notificationManager->sendMagazineBanNotification($ban);
     }
 }

src/MessageHandler/Notification/SentPostCommentCreatedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendCreated($comment);
+        $this->notificationManager->sendCreated($comment);
     }
 }

src/MessageHandler/Notification/SentPostCommentDeletedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendDeleted($comment);
+        $this->notificationManager->sendDeleted($comment);
     }
 }

src/MessageHandler/Notification/SentPostCommentEditedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostCommentRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Comment not found');
         }
 
-        $this->manager->sendEdited($comment);
+        $this->notificationManager->sendEdited($comment);
     }
 }

src/MessageHandler/Notification/SentPostCreatedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Post not found');
         }
 
-        $this->manager->sendCreated($post);
+        $this->notificationManager->sendCreated($post);
     }
 }

src/MessageHandler/Notification/SentPostDeletedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Post not found');
         }
 
-        $this->manager->sendDeleted($post);
+        $this->notificationManager->sendDeleted($post);
     }
 }

src/MessageHandler/Notification/SentPostEditedNotificationHandler.php

@@ -21,7 +21,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly PostRepository $repository,
-        private readonly NotificationManager $manager,
+        private readonly NotificationManager $notificationManager,
     ) {
         parent::__construct($this->entityManager, $this->kernel);
     }
@@ -42,6 +42,6 @@ public function doWork(MessageInterface $message): void
             throw new UnrecoverableMessageHandlingException('Post not found');
         }
 
-        $this->manager->sendEdited($post);
+        $this->notificationManager->sendEdited($post);
     }
 }