HiEventsDev · daveearley · Sep 9, 2026 · Sep 9, 2026
diff --git a/backend/app/Console/Commands/RecheckEventSpamCommand.php b/backend/app/Console/Commands/RecheckEventSpamCommand.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace HiEvents\Console\Commands;
+
+use HiEvents\DomainObjects\EventDomainObject;
+use HiEvents\DomainObjects\Status\EventSpamCheckStatus;
+use HiEvents\DomainObjects\Status\EventStatus;
+use HiEvents\Jobs\Event\EventSpamCheckJob;
+use HiEvents\Repository\Interfaces\EventRepositoryInterface;
+use HiEvents\Repository\Interfaces\EventSpamCheckRepositoryInterface;
+use HiEvents\Services\Domain\Event\EventSpamCheckService;
+use Illuminate\Console\Command;
+
+class RecheckEventSpamCommand extends Command
+{
+    protected $signature = 'events:recheck-spam
+                            {--account-id= : Only recheck events belonging to this account}
+                            {--dry-run : Report what would be rechecked without dispatching}';
+
+    protected $description = 'Discard automated CLEAN spam-check results and rerun the check against live events';
+
+    public function __construct(
+        private readonly EventRepositoryInterface $eventRepository,
+        private readonly EventSpamCheckRepositoryInterface $eventSpamCheckRepository,
+        private readonly EventSpamCheckService $eventSpamCheckService,
+    ) {
+        parent::__construct();
+    }
+
+    public function handle(): int
+    {
+        if (! $this->eventSpamCheckService->isEnabled()) {
+            $this->error('Event spam checking is not enabled.');
+
+            return self::FAILURE;
+        }
+
+        $dryRun = (bool) $this->option('dry-run');
+        $accountId = $this->option('account-id');
+
+        $where = ['status' => EventStatus::LIVE->name];
+
+        if ($accountId !== null) {
+            $where['account_id'] = (int) $accountId;
+        }
+
+        $events = $this->eventRepository->findWhere($where);
+
+        $this->info(sprintf('Found %d live event(s) to recheck.', $events->count()));
+
+        if ($dryRun) {
+            $this->warn('DRY RUN MODE - no checks cleared and no jobs dispatched');
+
+            return self::SUCCESS;
+        }
+
+        /** @var EventDomainObject $event */
+        foreach ($events as $event) {
+            $this->eventSpamCheckRepository->deleteWhere([
+                'event_id' => $event->getId(),
+                'status' => EventSpamCheckStatus::CLEAN->name,
+            ]);
+
+            EventSpamCheckJob::dispatch($event->getId());
+        }
+
+        $this->info('Recheck dispatched.');
+
+        return self::SUCCESS;
+    }
+}
diff --git a/backend/app/Jobs/Event/EventSpamCheckJob.php b/backend/app/Jobs/Event/EventSpamCheckJob.php
@@ -2,21 +2,20 @@
 
 namespace HiEvents\Jobs\Event;
 
-use HiEvents\DomainObjects\EventDomainObject;
-use HiEvents\DomainObjects\OrganizerDomainObject;
 use HiEvents\DomainObjects\Status\EventSpamCheckStatus;
 use HiEvents\DomainObjects\Status\EventStatus;
 use HiEvents\Mail\Admin\EventFlaggedAsSpamMail;
 use HiEvents\Mail\Event\EventPendingManualReviewMail;
-use HiEvents\Repository\Eloquent\Value\Relationship;
 use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
 use HiEvents\Repository\Interfaces\EventRepositoryInterface;
 use HiEvents\Repository\Interfaces\EventSpamCheckRepositoryInterface;
 use HiEvents\Services\Domain\Event\DTO\EventSpamCheckResultDTO;
+use HiEvents\Services\Domain\Event\EventSpamCheckContentService;
 use HiEvents\Services\Domain\Event\EventSpamCheckService;
 use Illuminate\Bus\Queueable;
 use Illuminate\Config\Repository;
 use Illuminate\Contracts\Mail\Mailer;
+use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Foundation\Bus\Dispatchable;
@@ -25,19 +24,25 @@
 use Illuminate\Support\Facades\Log;
 use Throwable;
 
-class EventSpamCheckJob implements ShouldQueue
+class EventSpamCheckJob implements ShouldBeUniqueUntilProcessing, ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
     public int $tries = 3;
 
     public array $backoff = [30, 120, 300];
 
+    public int $uniqueFor = 600;
+
     public function __construct(
         private readonly int $eventId,
-        private readonly string $contentHash,
     ) {}
 
+    public function uniqueId(): string
+    {
+        return (string) $this->eventId;
+    }
+
     /**
      * @throws Throwable
      */
@@ -46,6 +51,7 @@ public function handle(
         EventSpamCheckRepositoryInterface $eventSpamCheckRepository,
         AccountRepositoryInterface $accountRepository,
         EventSpamCheckService $eventSpamCheckService,
+        EventSpamCheckContentService $eventSpamCheckContentService,
         Mailer $mailer,
         Repository $config,
         DatabaseManager $databaseManager,
@@ -54,22 +60,18 @@ public function handle(
             return;
         }
 
-        /** @var EventDomainObject|null $event */
-        $event = $eventRepository
-            ->loadRelation(new Relationship(domainObject: OrganizerDomainObject::class, name: 'organizer'))
-            ->findFirstWhere(['id' => $this->eventId]);
+        $event = $eventSpamCheckContentService->loadEvent($this->eventId);
 
         if ($event === null || $event->getStatus() !== EventStatus::LIVE->name) {
             return;
         }
 
-        if ($eventSpamCheckService->hashContent($event->getTitle(), $event->getDescription()) !== $this->contentHash) {
-            return;
-        }
+        $content = $eventSpamCheckContentService->buildForEvent($event);
+        $contentHash = $eventSpamCheckService->hashContent($content);
 
         $existingCheck = $eventSpamCheckRepository->findFirstWhere([
             'event_id' => $this->eventId,
-            'content_hash' => $this->contentHash,
+            'content_hash' => $contentHash,
         ]);
 
         $vettedStatuses = [EventSpamCheckStatus::CLEAN->name, EventSpamCheckStatus::APPROVED->name];
@@ -78,10 +80,10 @@ public function handle(
             return;
         }
 
-        $result = $eventSpamCheckService->checkContent($event->getTitle(), $event->getDescription());
+        $result = $eventSpamCheckService->checkContent($content);
 
         if (! $result->isSpam) {
-            $this->storeCheck($eventSpamCheckRepository, $result, EventSpamCheckStatus::CLEAN);
+            $this->storeCheck($eventSpamCheckRepository, $result, EventSpamCheckStatus::CLEAN, $contentHash);
 
             return;
         }
@@ -94,6 +96,7 @@ public function handle(
             $config,
             $event,
             $result,
+            $contentHash,
         ) {
             $updated = $eventRepository->updateWhere(
                 attributes: ['status' => EventStatus::PENDING_MANUAL_REVIEW->name],
@@ -107,7 +110,7 @@ public function handle(
                 return;
             }
 
-            $this->storeCheck($eventSpamCheckRepository, $result, EventSpamCheckStatus::FLAGGED);
+            $this->storeCheck($eventSpamCheckRepository, $result, EventSpamCheckStatus::FLAGGED, $contentHash);
 
             $organizerEmail = $event->getOrganizer()?->getEmail();
 
@@ -139,12 +142,13 @@ private function storeCheck(
         EventSpamCheckRepositoryInterface $eventSpamCheckRepository,
         EventSpamCheckResultDTO $result,
         EventSpamCheckStatus $status,
+        string $contentHash,
     ): void {
         $eventSpamCheckRepository->create([
             'event_id' => $this->eventId,
             'status' => $status->name,
             'verdict' => $result->toVerdictArray(),
-            'content_hash' => $this->contentHash,
+            'content_hash' => $contentHash,
             'checked_at' => now(),
         ]);
     }

diff --git a/backend/app/Services/Application/Handlers/Admin/ApproveSpamEventHandler.php b/backend/app/Services/Application/Handlers/Admin/ApproveSpamEventHandler.php
@@ -9,6 +9,7 @@
 use HiEvents\Exceptions\ResourceNotFoundException;
 use HiEvents\Repository\Interfaces\EventRepositoryInterface;
 use HiEvents\Repository\Interfaces\EventSpamCheckRepositoryInterface;
+use HiEvents\Services\Domain\Event\EventSpamCheckContentService;
 use HiEvents\Services\Domain\Event\EventSpamCheckService;
 use Illuminate\Database\DatabaseManager;
 use Illuminate\Validation\ValidationException;
@@ -20,6 +21,7 @@ public function __construct(
         private readonly EventRepositoryInterface $eventRepository,
         private readonly EventSpamCheckRepositoryInterface $eventSpamCheckRepository,
         private readonly EventSpamCheckService $eventSpamCheckService,
+        private readonly EventSpamCheckContentService $eventSpamCheckContentService,
         private readonly DatabaseManager $databaseManager,
     ) {}
 
@@ -47,7 +49,7 @@ private function approveEvent(int $eventId, int $reviewedByUserId): void
             throw new ResourceNotFoundException(__('No flagged spam check found for this event'));
         }
 
-        $event = $this->eventRepository->findFirstWhere(['id' => $eventId]);
+        $event = $this->eventSpamCheckContentService->loadEvent($eventId);
 
         $updated = $this->eventRepository->updateWhere(
             attributes: ['status' => EventStatus::LIVE->name],
@@ -66,7 +68,9 @@ private function approveEvent(int $eventId, int $reviewedByUserId): void
         $this->eventSpamCheckRepository->updateWhere(
             attributes: [
                 'status' => EventSpamCheckStatus::APPROVED->name,
-                'content_hash' => $this->eventSpamCheckService->hashContent($event->getTitle(), $event->getDescription()),
+                'content_hash' => $this->eventSpamCheckService->hashContent(
+                    $this->eventSpamCheckContentService->buildForEvent($event),
+                ),
                 'reviewed_by_user_id' => $reviewedByUserId,
                 'reviewed_at' => now(),
             ],

diff --git a/backend/app/Services/Application/Handlers/Event/UpdateEventHandler.php b/backend/app/Services/Application/Handlers/Event/UpdateEventHandler.php
@@ -15,14 +15,13 @@
 use HiEvents\Exceptions\CannotChangeCurrencyException;
 use HiEvents\Helper\DateHelper;
 use HiEvents\Helper\StringHelper;
-use HiEvents\Jobs\Event\EventSpamCheckJob;
 use HiEvents\Jobs\Event\Webhook\DispatchEventWebhookJob;
 use HiEvents\Repository\Eloquent\Value\Relationship;
 use HiEvents\Repository\Interfaces\EventOccurrenceRepositoryInterface;
 use HiEvents\Repository\Interfaces\EventRepositoryInterface;
 use HiEvents\Repository\Interfaces\OrderRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Event\DTO\UpdateEventDTO;
-use HiEvents\Services\Domain\Event\EventSpamCheckService;
+use HiEvents\Services\Domain\Event\EventSpamCheckDispatchService;
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
 use HiEvents\Services\Infrastructure\HtmlPurifier\HtmlPurifierService;
 use Illuminate\Database\DatabaseManager;
@@ -38,7 +37,7 @@ public function __construct(
         private OrderRepositoryInterface $orderRepository,
         private HtmlPurifierService $purifier,
         private EventOccurrenceRepositoryInterface $occurrenceRepository,
-        private EventSpamCheckService $eventSpamCheckService,
+        private readonly EventSpamCheckDispatchService $eventSpamCheckDispatchService,
     ) {}
 
     /**
@@ -118,14 +117,11 @@ private function dispatchSpamCheckIfContentChanged(EventDomainObject $existingEv
         $contentChanged = $attributes['title'] !== $existingEvent->getTitle()
             || $attributes['description'] !== $existingEvent->getDescription();
 
-        if (! $contentChanged || ! $this->eventSpamCheckService->isEnabled()) {
+        if (! $contentChanged) {
             return;
         }
 
-        EventSpamCheckJob::dispatch(
-            $existingEvent->getId(),
-            $this->eventSpamCheckService->hashContent($attributes['title'], $attributes['description']),
-        )->afterCommit();
+        $this->eventSpamCheckDispatchService->dispatchForEvent($existingEvent->getId());
     }
 
     private function updateSingleOccurrenceDates(UpdateEventDTO $eventData, EventDomainObject $existingEvent): void

diff --git a/backend/app/Services/Application/Handlers/Event/UpdateEventStatusHandler.php b/backend/app/Services/Application/Handlers/Event/UpdateEventStatusHandler.php
@@ -10,13 +10,12 @@
 use HiEvents\Exceptions\AccountNotVerifiedException;
 use HiEvents\Exceptions\EventPendingReviewException;
 use HiEvents\Exceptions\ResourceNotFoundException;
-use HiEvents\Jobs\Event\EventSpamCheckJob;
 use HiEvents\Jobs\Event\Webhook\DispatchEventWebhookJob;
 use HiEvents\Repository\Eloquent\Value\Relationship;
 use HiEvents\Repository\Interfaces\AccountRepositoryInterface;
 use HiEvents\Repository\Interfaces\EventRepositoryInterface;
 use HiEvents\Services\Application\Handlers\Event\DTO\UpdateEventStatusDTO;
-use HiEvents\Services\Domain\Event\EventSpamCheckService;
+use HiEvents\Services\Domain\Event\EventSpamCheckDispatchService;
 use HiEvents\Services\Infrastructure\DomainEvents\Enums\DomainEventType;
 use Illuminate\Database\DatabaseManager;
 use Psr\Log\LoggerInterface;
@@ -29,7 +28,7 @@ public function __construct(
         private AccountRepositoryInterface $accountRepository,
         private LoggerInterface $logger,
         private DatabaseManager $databaseManager,
-        private EventSpamCheckService $eventSpamCheckService,
+        private readonly EventSpamCheckDispatchService $eventSpamCheckDispatchService,
     ) {}
 
     /**
@@ -112,11 +111,8 @@ private function updateEventStatus(UpdateEventStatusDTO $updateEventStatusDTO):
         $isBecomingLive = $updateEventStatusDTO->status === EventStatus::LIVE->name
             && $previousStatus !== EventStatus::LIVE->name;
 
-        if ($isBecomingLive && $this->eventSpamCheckService->isEnabled()) {
-            EventSpamCheckJob::dispatch(
-                $event->getId(),
-                $this->eventSpamCheckService->hashContent($event->getTitle(), $event->getDescription()),
-            )->afterCommit();
+        if ($isBecomingLive) {
+            $this->eventSpamCheckDispatchService->dispatchForEvent($event->getId());
         }
 
         return $event;

diff --git a/backend/app/Services/Domain/Event/DTO/EventSpamCheckContentDTO.php b/backend/app/Services/Domain/Event/DTO/EventSpamCheckContentDTO.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace HiEvents\Services\Domain\Event\DTO;
+
+use HiEvents\DataTransferObjects\BaseDataObject;
+
+class EventSpamCheckContentDTO extends BaseDataObject
+{
+    /**
+     * @param  array<string, string>  $supplementaryContent
+     */
+    public function __construct(
+        public readonly ?string $title,
+        public readonly ?string $description,
+        public readonly array $supplementaryContent = [],
+    ) {}
+
+    /**
+     * @return string[]
+     */
+    public function allHtml(): array
+    {
+        return array_values(array_filter(
+            [$this->description, ...array_values($this->supplementaryContent)],
+            static fn (?string $html): bool => $html !== null && trim($html) !== '',
+        ));
+    }
+}