Add testcase for hashtag matching (#1362)

Co-authored-by: Melroy van den Berg <[email protected]>

.env.test

@@ -18,7 +18,7 @@ KBIN_DEFAULT_LANG=en
 KBIN_DOMAIN=kbin.test
 ELASTICSEARCH_ENABLED=false
 KBIN_API_ITEMS_PER_PAGE=2
-KBIN_FEDERATION_ENABLED=false
+KBIN_FEDERATION_ENABLED=true
 
 ###> league/oauth2-server-bundle ###
 OAUTH_PRIVATE_KEY=%kernel.project_dir%/config/oauth2/tests/private.pem

src/Command/ApImportObject.php

@@ -5,7 +5,7 @@
 namespace App\Command;
 
 use App\Message\ActivityPub\Inbox\ActivityMessage;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -21,7 +21,7 @@ class ApImportObject extends Command
 {
     public function __construct(
         private readonly MessageBusInterface $bus,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
     ) {
         parent::__construct();
     }

src/Controller/ActivityPub/WebFingerController.php

@@ -6,19 +6,26 @@
 
 use App\ActivityPub\JsonRd;
 use App\Event\ActivityPub\WebfingerResponseEvent;
+use App\Service\ActivityPub\Webfinger\WebFingerParameters;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 
 class WebFingerController
 {
-    public function __construct(private readonly EventDispatcherInterface $eventDispatcher)
-    {
+    public function __construct(
+        private readonly EventDispatcherInterface $eventDispatcher,
+        private readonly WebFingerParameters $webFingerParameters,
+    ) {
     }
 
     public function __invoke(Request $request): JsonResponse
     {
-        $event = new WebfingerResponseEvent(new JsonRd(), $request);
+        $event = new WebfingerResponseEvent(
+            new JsonRd(),
+            $request->query->get('resource') ?: '',
+            $this->webFingerParameters->getParams($request),
+        );
         $this->eventDispatcher->dispatch($event);
 
         if (!empty($event->jsonRd->getLinks())) {

src/Controller/SearchController.php

@@ -9,7 +9,7 @@
 use App\Entity\User;
 use App\Message\ActivityPub\Inbox\CreateMessage;
 use App\MessageHandler\ActivityPub\Inbox\CreateHandler;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPubManager;
 use App\Service\SearchManager;
 use App\Service\SettingsManager;
@@ -23,7 +23,7 @@ class SearchController extends AbstractController
     public function __construct(
         private readonly SearchManager $manager,
         private readonly ActivityPubManager $activityPubManager,
-        private readonly ApHttpClient $apHttpClient,
+        private readonly ApHttpClientInterface $apHttpClient,
         private readonly SubjectOverviewManager $overviewManager,
         private readonly SettingsManager $settingsManager,
         private readonly LoggerInterface $logger,

src/Entity/User.php

@@ -11,7 +11,7 @@
 use App\Entity\Traits\CreatedAtTrait;
 use App\Entity\Traits\VisibilityTrait;
 use App\Repository\UserRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
@@ -869,7 +869,7 @@ public function hasMagazineOwnershipRequest(Magazine $magazine): bool
         return $this->magazineOwnershipRequests->matching($criteria)->count() > 0;
     }
 
-    public function getFollowerUrl(ApHttpClient $client, UrlGeneratorInterface $urlGenerator, bool $isRemote): ?string
+    public function getFollowerUrl(ApHttpClientInterface $client, UrlGeneratorInterface $urlGenerator, bool $isRemote): ?string
     {
         if ($isRemote) {
             $actorObject = $client->getActorObject($this->apProfileId);

src/Event/ActivityPub/WebfingerResponseEvent.php

@@ -5,13 +5,13 @@
 namespace App\Event\ActivityPub;
 
 use App\ActivityPub\JsonRd;
-use Symfony\Component\HttpFoundation\Request;
 
 class WebfingerResponseEvent
 {
     public function __construct(
         public JsonRd $jsonRd,
-        public Request $request,
+        public string $subject,
+        public array $params,
     ) {
     }
 }

src/EventSubscriber/ActivityPub/GroupWebFingerProfileSubscriber.php

@@ -16,7 +16,6 @@
 class GroupWebFingerProfileSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly WebFingerParameters $webfingerParameters,
         private readonly MagazineRepository $magazineRepository,
         private readonly UrlGeneratorInterface $urlGenerator,
     ) {
@@ -32,7 +31,7 @@ public static function getSubscribedEvents(): array
 
     public function buildResponse(WebfingerResponseEvent $event): void
     {
-        $params = $this->webfingerParameters->getParams($event->request);
+        $params = $event->params;
         $jsonRd = $event->jsonRd;
 
         if (

src/EventSubscriber/ActivityPub/GroupWebFingerSubscriber.php

@@ -16,7 +16,6 @@
 class GroupWebFingerSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly WebFingerParameters $webfingerParameters,
         private readonly MagazineRepository $magazineRepository,
         private readonly UrlGeneratorInterface $urlGenerator,
     ) {
@@ -32,11 +31,10 @@ public static function getSubscribedEvents(): array
 
     public function buildResponse(WebfingerResponseEvent $event): void
     {
-        $request = $event->request;
-        $params = $this->webfingerParameters->getParams($request);
+        $params = $event->params;
         $jsonRd = $event->jsonRd;
 
-        $subject = $request->query->get('resource') ?: '';
+        $subject = $event->subject;
         if (!empty($subject)) {
             $jsonRd->setSubject($subject);
         }

src/EventSubscriber/ActivityPub/UserWebFingerProfileSubscriber.php

@@ -19,7 +19,6 @@
 class UserWebFingerProfileSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly WebFingerParameters $webfingerParameters,
         private readonly UserRepository $userRepository,
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly SettingsManager $settingsManager,
@@ -38,7 +37,7 @@ public static function getSubscribedEvents(): array
 
     public function buildResponse(WebfingerResponseEvent $event): void
     {
-        $params = $this->webfingerParameters->getParams($event->request);
+        $params = $event->params;
         $jsonRd = $event->jsonRd;
 
         if (isset($params[WebFingerParameters::ACCOUNT_KEY_NAME])) {

src/EventSubscriber/ActivityPub/UserWebFingerSubscriber.php

@@ -16,7 +16,6 @@
 class UserWebFingerSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private readonly WebFingerParameters $webfingerParameters,
         private readonly UserRepository $userRepository,
         private readonly UrlGeneratorInterface $urlGenerator,
     ) {
@@ -32,11 +31,10 @@ public static function getSubscribedEvents(): array
 
     public function buildResponse(WebfingerResponseEvent $event): void
     {
-        $request = $event->request;
-        $params = $this->webfingerParameters->getParams($request);
+        $params = $event->params;
         $jsonRd = $event->jsonRd;
 
-        $subject = $request->query->get('resource') ?: '';
+        $subject = $event->subject;
         if (!empty($subject)) {
             $jsonRd->setSubject($subject);
         }

src/Factory/ActivityPub/EntryCommentNoteFactory.php

@@ -8,7 +8,7 @@
 use App\Entity\EntryComment;
 use App\Markdown\MarkdownConverter;
 use App\Markdown\RenderTarget;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\ContextsProvider;
 use App\Service\ActivityPub\Wrapper\ImageWrapper;
 use App\Service\ActivityPub\Wrapper\MentionsWrapper;
@@ -28,7 +28,7 @@ public function __construct(
         private readonly MentionsWrapper $mentionsWrapper,
         private readonly MentionManager $mentionManager,
         private readonly EntryPageFactory $pageFactory,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly ActivityPubManager $activityPubManager,
         private readonly MarkdownConverter $markdownConverter,
     ) {

src/Factory/ActivityPub/EntryPageFactory.php

@@ -8,7 +8,7 @@
 use App\Entity\Entry;
 use App\Markdown\MarkdownConverter;
 use App\Markdown\RenderTarget;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\ContextsProvider;
 use App\Service\ActivityPub\Wrapper\ImageWrapper;
 use App\Service\ActivityPub\Wrapper\MentionsWrapper;
@@ -27,7 +27,7 @@ public function __construct(
         private readonly ImageWrapper $imageWrapper,
         private readonly TagsWrapper $tagsWrapper,
         private readonly MentionsWrapper $mentionsWrapper,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly ActivityPubManager $activityPubManager,
         private readonly MarkdownConverter $markdownConverter,
     ) {

src/Factory/ActivityPub/InstanceFactory.php

@@ -4,15 +4,15 @@
 
 namespace App\Factory\ActivityPub;
 
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\ContextsProvider;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 class InstanceFactory
 {
     public function __construct(
         private string $kbinDomain,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly UrlGeneratorInterface $urlGenerator,
         private readonly ContextsProvider $contextProvider,
     ) {

src/Factory/ActivityPub/PostCommentNoteFactory.php

@@ -8,7 +8,7 @@
 use App\Entity\PostComment;
 use App\Markdown\MarkdownConverter;
 use App\Markdown\RenderTarget;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\ContextsProvider;
 use App\Service\ActivityPub\Wrapper\ImageWrapper;
 use App\Service\ActivityPub\Wrapper\MentionsWrapper;
@@ -28,7 +28,7 @@ public function __construct(
         private readonly TagsWrapper $tagsWrapper,
         private readonly MentionsWrapper $mentionsWrapper,
         private readonly MentionManager $mentionManager,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly ActivityPubManager $activityPubManager,
         private readonly MarkdownConverter $markdownConverter,
     ) {

src/Factory/ActivityPub/PostNoteFactory.php

@@ -8,7 +8,7 @@
 use App\Entity\Post;
 use App\Markdown\MarkdownConverter;
 use App\Markdown\RenderTarget;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\ContextsProvider;
 use App\Service\ActivityPub\Wrapper\ImageWrapper;
 use App\Service\ActivityPub\Wrapper\MentionsWrapper;
@@ -27,7 +27,7 @@ public function __construct(
         private readonly ImageWrapper $imageWrapper,
         private readonly TagsWrapper $tagsWrapper,
         private readonly MentionsWrapper $mentionsWrapper,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly ActivityPubManager $activityPubManager,
         private readonly MentionManager $mentionManager,
         private readonly TagExtractor $tagExtractor,

src/MessageHandler/ActivityPub/Inbox/ActivityHandler.php

@@ -23,7 +23,7 @@
 use App\Message\Contracts\MessageInterface;
 use App\MessageHandler\MbinMessageHandler;
 use App\Repository\InstanceRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\SignatureValidator;
 use App\Service\ActivityPubManager;
 use App\Service\RemoteInstanceManager;
@@ -45,7 +45,7 @@ public function __construct(
         private readonly SettingsManager $settingsManager,
         private readonly MessageBusInterface $bus,
         private readonly ActivityPubManager $activityPubManager,
-        private readonly ApHttpClient $apHttpClient,
+        private readonly ApHttpClientInterface $apHttpClient,
         private readonly InstanceRepository $instanceRepository,
         private readonly RemoteInstanceManager $remoteInstanceManager,
         private readonly LoggerInterface $logger,

src/MessageHandler/ActivityPub/Inbox/AddHandler.php

@@ -15,7 +15,7 @@
 use App\Repository\ApActivityRepository;
 use App\Repository\EntryRepository;
 use App\Repository\MagazineRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPubManager;
 use App\Service\EntryManager;
 use App\Service\MagazineManager;
@@ -33,7 +33,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly ActivityPubManager $activityPubManager,
-        private readonly ApHttpClient $apHttpClient,
+        private readonly ApHttpClientInterface $apHttpClient,
         private readonly ApActivityRepository $apActivityRepository,
         private readonly MagazineRepository $magazineRepository,
         private readonly MagazineManager $magazineManager,

src/MessageHandler/ActivityPub/Inbox/ChainActivityHandler.php

@@ -20,7 +20,7 @@
 use App\Message\Contracts\MessageInterface;
 use App\MessageHandler\MbinMessageHandler;
 use App\Repository\ApActivityRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\Note;
 use App\Service\ActivityPub\Page;
 use App\Service\SettingsManager;
@@ -37,7 +37,7 @@ public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
         private readonly LoggerInterface $logger,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly MessageBusInterface $bus,
         private readonly ApActivityRepository $repository,
         private readonly Note $note,

src/MessageHandler/ActivityPub/Inbox/FollowHandler.php

@@ -9,7 +9,7 @@
 use App\Message\ActivityPub\Inbox\FollowMessage;
 use App\Message\Contracts\MessageInterface;
 use App\MessageHandler\MbinMessageHandler;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\Wrapper\FollowResponseWrapper;
 use App\Service\ActivityPubManager;
 use App\Service\MagazineManager;
@@ -28,7 +28,7 @@ public function __construct(
         private readonly ActivityPubManager $activityPubManager,
         private readonly UserManager $userManager,
         private readonly MagazineManager $magazineManager,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly LoggerInterface $logger,
         private readonly FollowResponseWrapper $followResponseWrapper,
     ) {

src/MessageHandler/ActivityPub/Outbox/DeliverHandler.php

@@ -12,7 +12,7 @@
 use App\Message\Contracts\MessageInterface;
 use App\MessageHandler\MbinMessageHandler;
 use App\Repository\InstanceRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPubManager;
 use App\Service\SettingsManager;
 use Doctrine\ORM\EntityManagerInterface;
@@ -32,7 +32,7 @@ class DeliverHandler extends MbinMessageHandler
     public function __construct(
         private readonly EntityManagerInterface $entityManager,
         private readonly KernelInterface $kernel,
-        private readonly ApHttpClient $client,
+        private readonly ApHttpClientInterface $client,
         private readonly ActivityPubManager $activityPubManager,
         private readonly SettingsManager $settingsManager,
         private readonly LoggerInterface $logger,

src/MessageHandler/ActivityPub/Outbox/FollowHandler.php

@@ -9,7 +9,7 @@
 use App\MessageHandler\MbinMessageHandler;
 use App\Repository\MagazineRepository;
 use App\Repository\UserRepository;
-use App\Service\ActivityPub\ApHttpClient;
+use App\Service\ActivityPub\ApHttpClientInterface;
 use App\Service\ActivityPub\Wrapper\FollowWrapper;
 use App\Service\ActivityPub\Wrapper\UndoWrapper;
 use App\Service\ActivityPubManager;
@@ -30,7 +30,7 @@ public function __construct(
         private readonly ActivityPubManager $activityPubManager,
         private readonly FollowWrapper $followWrapper,
         private readonly UndoWrapper $undoWrapper,
-        private readonly ApHttpClient $apHttpClient,
+        private readonly ApHttpClientInterface $apHttpClient,
         private readonly SettingsManager $settingsManager,
         private readonly DeliverManager $deliverManager,
     ) {