Merge main into notification filters

app/Actions/Notifications/BuildProjectNotificationSettingsPayload.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Notifications;
 
+use App\Enums\DiscordAllowedMentionType;
 use App\Enums\NotificationChannel;
 use App\Enums\NotificationEventType;
 use App\Enums\NotificationFilterAttribute;
@@ -26,6 +27,7 @@ class BuildProjectNotificationSettingsPayload
             'eventTypeOptions' => NotificationEventType::options(),
             'filterAttributeOptions' => NotificationFilterAttribute::options(),
             'filterOperatorOptions' => NotificationFilterOperator::options(),
+            'discordAllowedMentionOptions' => DiscordAllowedMentionType::options(),
             'notificationActions' => NotificationActionResource::collection(
                 $this->listProjectNotificationActions->handle($project),
             )->resolve(),

app/Actions/Notifications/BuildTicketCreatedPayload.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Notifications;
 
-use App\Enums\NotificationEventType;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketStatus;
@@ -17,9 +16,8 @@ class BuildTicketCreatedPayload
         TicketStatus $ticketStatus,
         ?User $actor,
         CarbonImmutable $occurredAt,
-    ): TicketStatusChangedPayload {
-        return new TicketStatusChangedPayload(
-            eventType: NotificationEventType::TicketCreate,
+    ): TicketCreatedPayload {
+        return new TicketCreatedPayload(
             projectId: $project->id,
             projectKey: $project->key,
             projectName: $project->name,
@@ -29,8 +27,6 @@ class BuildTicketCreatedPayload
             ticketUrl: route('projects.tickets.show', [$project, $ticket]),
             actorId: $actor?->id,
             actorName: $actor?->name,
-            fromStatusId: null,
-            fromStatusLabel: null,
             toStatusId: $ticketStatus->id,
             toStatusLabel: $this->statusLabel($ticketStatus),
             occurredAt: $occurredAt,

app/Actions/Notifications/BuildTicketStatusChangedPayload.php

@@ -2,7 +2,6 @@
 
 namespace App\Actions\Notifications;
 
-use App\Enums\NotificationEventType;
 use App\Models\Project;
 use App\Models\Ticket;
 use App\Models\TicketStatus;
@@ -22,7 +21,6 @@ class BuildTicketStatusChangedPayload
         CarbonImmutable $occurredAt,
     ): TicketStatusChangedPayload {
         return new TicketStatusChangedPayload(
-            eventType: NotificationEventType::TicketStatusChanged,
             projectId: $project->id,
             projectKey: $project->key,
             projectName: $project->name,

app/Actions/Notifications/DeliverNotificationAction.php

@@ -2,6 +2,7 @@
 
 namespace App\Actions\Notifications;
 
+use App\Enums\DiscordAllowedMentionType;
 use App\Enums\NotificationChannel;
 use App\Enums\NotificationDeliveryStatus;
 use App\Models\NotificationAction;
@@ -27,7 +28,7 @@ class DeliverNotificationAction implements ShouldQueue
 
     public function __construct(
         public int $notificationActionId,
-        public TicketStatusChangedPayload $payload,
+        public NotificationEvent $event,
         public ?int $notificationDeliveryLogId,
     ) {}
 
@@ -59,7 +60,7 @@ class DeliverNotificationAction implements ShouldQueue
         if ($notificationAction->channel === NotificationChannel::Discord) {
             $discordMessage = app(RenderDiscordMessageTemplate::class)->handle(
                 $notificationAction->message_template,
-                $this->payload,
+                $this->event,
             );
 
             $validationError = $this->discordMessageValidationError($discordMessage);
@@ -244,7 +245,7 @@ class DeliverNotificationAction implements ShouldQueue
             'attempt_count' => 0,
             'channel' => $notificationAction->channel,
             'delivery_status' => NotificationDeliveryStatus::Pending,
-            'event_type' => $this->payload->eventType,
+            'event_type' => $this->event->eventType(),
             'notification_action_id' => $notificationAction->id,
             'payload_metadata' => $this->payloadMetadata(),
         ]);
@@ -280,18 +281,60 @@ class DeliverNotificationAction implements ShouldQueue
             ->post($notificationAction->delivery_url, [
                 'content' => $message,
                 'allowed_mentions' => [
-                    'parse' => [],
+                    'parse' => $this->discordAllowedMentions($notificationAction),
                 ],
             ]);
     }
 
+    /**
+     * @return list<string>
+     */
+    private function discordAllowedMentions(NotificationAction $notificationAction): array
+    {
+        $configuredAllowedMentions = data_get(
+            $notificationAction->channel_configuration,
+            'allowed_mentions',
+            [],
+        );
+
+        if (! is_array($configuredAllowedMentions)) {
+            return [];
+        }
+
+        $allowedMentions = [];
+
+        foreach ($configuredAllowedMentions as $allowedMention) {
+            if (! is_string($allowedMention)) {
+                continue;
+            }
+
+            $allowedMention = Str::lower(trim($allowedMention));
+
+            if ($allowedMention === '') {
+                continue;
+            }
+
+            if (! in_array($allowedMention, DiscordAllowedMentionType::values(), true)) {
+                continue;
+            }
+
+            if (in_array($allowedMention, $allowedMentions, true)) {
+                continue;
+            }
+
+            $allowedMentions[] = $allowedMention;
+        }
+
+        return $allowedMentions;
+    }
+
     private function sendWebhookRequest(NotificationAction $notificationAction): Response
     {
         return Http::acceptJson()
             ->asJson()
             ->connectTimeout(5)
             ->timeout(10)
-            ->post($notificationAction->delivery_url, $this->payload->toArray());
+            ->post($notificationAction->delivery_url, $this->event->payload()->toArray());
     }
 
     private function hasAttemptsRemaining(int $attemptCount): bool
@@ -355,14 +398,11 @@ class DeliverNotificationAction implements ShouldQueue
     }
 
     /**
-     * @return array{project_key: string, ticket_key: string}
+     * @return array<string, scalar|null>
      */
     private function payloadMetadata(): array
     {
-        return [
-            'project_key' => $this->payload->projectKey,
-            'ticket_key' => $this->payload->ticketKey,
-        ];
+        return $this->event->payload()->deliveryMetadata();
     }
 
     private function excerpt(?string $value): ?string

app/Actions/Notifications/MatchNotificationFilters.php

@@ -10,7 +10,7 @@ class MatchNotificationFilters
     /**
      * @param  array<int, array{attribute?: mixed, operator?: mixed, value?: mixed}>  $filters
      */
-    public function handle(array $filters, TicketStatusChangedPayload $payload): bool
+    public function handle(array $filters, NotificationEventPayload $payload): bool
     {
         if ($filters === []) {
             return true;
@@ -175,32 +175,46 @@ class MatchNotificationFilters
     /**
      * @return array<string, mixed>
      */
-    private function payloadContext(TicketStatusChangedPayload $payload): array
+    private function payloadContext(NotificationEventPayload $payload): array
     {
+        $projectId = property_exists($payload, 'projectId') ? $payload->projectId : $payload->projectId();
+        $projectKey = property_exists($payload, 'projectKey') ? $payload->projectKey : null;
+        $projectName = property_exists($payload, 'projectName') ? $payload->projectName : null;
+        $ticketId = property_exists($payload, 'ticketId') ? $payload->ticketId : null;
+        $ticketKey = property_exists($payload, 'ticketKey') ? $payload->ticketKey : null;
+        $ticketTitle = property_exists($payload, 'ticketTitle') ? $payload->ticketTitle : null;
+        $ticketUrl = property_exists($payload, 'ticketUrl') ? $payload->ticketUrl : null;
+        $actorId = property_exists($payload, 'actorId') ? $payload->actorId : null;
+        $actorName = property_exists($payload, 'actorName') ? $payload->actorName : null;
+        $fromStatusId = property_exists($payload, 'fromStatusId') ? $payload->fromStatusId : null;
+        $fromStatusLabel = property_exists($payload, 'fromStatusLabel') ? $payload->fromStatusLabel : null;
+        $toStatusId = property_exists($payload, 'toStatusId') ? $payload->toStatusId : null;
+        $toStatusLabel = property_exists($payload, 'toStatusLabel') ? $payload->toStatusLabel : null;
+
         return [
             'project' => [
-                'id' => $payload->projectId,
-                'key' => $payload->projectKey,
-                'name' => $payload->projectName,
+                'id' => $projectId,
+                'key' => $projectKey,
+                'name' => $projectName,
             ],
             'ticket' => [
-                'id' => $payload->ticketId,
-                'key' => $payload->ticketKey,
-                'title' => $payload->ticketTitle,
-                'url' => $payload->ticketUrl,
+                'id' => $ticketId,
+                'key' => $ticketKey,
+                'title' => $ticketTitle,
+                'url' => $ticketUrl,
             ],
             'actor' => [
-                'id' => $payload->actorId,
-                'name' => $payload->actorName,
+                'id' => $actorId,
+                'name' => $actorName,
             ],
             'status' => [
                 'from' => [
-                    'id' => $payload->fromStatusId,
-                    'label' => $payload->fromStatusLabel,
+                    'id' => $fromStatusId,
+                    'label' => $fromStatusLabel,
                 ],
                 'to' => [
-                    'id' => $payload->toStatusId,
-                    'label' => $payload->toStatusLabel,
+                    'id' => $toStatusId,
+                    'label' => $toStatusLabel,
                 ],
             ],
         ];

app/Actions/Notifications/NotificationEvent.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Actions\Notifications;
+
+use App\Enums\NotificationEventType;
+
+interface NotificationEvent
+{
+    public function eventType(): NotificationEventType;
+
+    public function payload(): NotificationEventPayload;
+}

app/Actions/Notifications/NotificationEventPayload.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Actions\Notifications;
+
+use Illuminate\Contracts\Support\Arrayable;
+
+/**
+ * @extends Arrayable<string, mixed>
+ */
+interface NotificationEventPayload extends Arrayable
+{
+    public function projectId(): int;
+
+    /**
+     * @return array<string, scalar|null>
+     */
+    public function deliveryMetadata(): array;
+
+    /**
+     * @return array<string, string>
+     */
+    public function discordTemplateVariables(): array;
+}

app/Actions/Notifications/QueueNotificationEventDeliveries.php

@@ -7,24 +7,26 @@ use App\Enums\NotificationDeliveryStatus;
 use App\Models\NotificationAction;
 use App\Models\NotificationDeliveryLog;
 
-class QueueTicketStatusChangedNotificationDeliveries
+class QueueNotificationEventDeliveries
 {
     public function __construct(
         private readonly MatchNotificationFilters $matchNotificationFilters,
     ) {}
 
-    public function handle(TicketStatusChanged|TicketCreated $event): void
+    public function handle(NotificationEvent $event): void
     {
+        $payload = $event->payload();
+        $eventType = $event->eventType();
+
         NotificationAction::query()
             ->enabled()
-            ->where('project_id', $event->payload->projectId)
-            ->where('event_type', $event->payload->eventType->value)
+            ->where('project_id', $payload->projectId())
+            ->where('event_type', $eventType->value)
             ->get(['channel', 'filters', 'id'])
-            ->each(function (NotificationAction $notificationAction) use ($event): void {
-                if (! $this->matchNotificationFilters->handle($notificationAction->filters ?? [], $event->payload)) {
+            ->each(function (NotificationAction $notificationAction) use ($event, $payload): void {
+                if (! $this->matchNotificationFilters->handle($notificationAction->filters ?? [], $payload)) {
                     return;
                 }
-
                 $notificationDeliveryLogId = null;
 
                 if (in_array($notificationAction->channel, [NotificationChannel::Discord, NotificationChannel::Webhook], true)) {
@@ -32,18 +34,15 @@ class QueueTicketStatusChangedNotificationDeliveries
                         'attempt_count' => 0,
                         'channel' => $notificationAction->channel,
                         'delivery_status' => NotificationDeliveryStatus::Pending,
-                        'event_type' => $event->payload->eventType,
+                        'event_type' => $event->eventType(),
                         'notification_action_id' => $notificationAction->id,
-                        'payload_metadata' => [
-                            'project_key' => $event->payload->projectKey,
-                            'ticket_key' => $event->payload->ticketKey,
-                        ],
+                        'payload_metadata' => $payload->deliveryMetadata(),
                     ])->id;
                 }
 
                 DeliverNotificationAction::dispatch(
                     notificationActionId: $notificationAction->id,
-                    payload: $event->payload,
+                    event: $event,
                     notificationDeliveryLogId: $notificationDeliveryLogId,
                 );
             });

app/Actions/Notifications/RenderDiscordMessageTemplate.php

@@ -6,16 +6,8 @@ use Illuminate\Support\Str;
 
 class RenderDiscordMessageTemplate
 {
-    public function handle(?string $messageTemplate, TicketStatusChangedPayload $payload): string
+    public function handle(?string $messageTemplate, NotificationEvent $event): string
     {
-        return strtr((string) Str::of((string) $messageTemplate), [
-            '$url' => $payload->ticketUrl,
-            '$ticket_key' => $payload->ticketKey,
-            '$ticket_title' => $payload->ticketTitle,
-            '$project_name' => $payload->projectName,
-            '$status_from' => $payload->fromStatusLabel ?? '',
-            '$status_to' => $payload->toStatusLabel,
-            '$actor_name' => $payload->actorName ?? '',
-        ]);
+        return strtr((string) Str::of((string) $messageTemplate), $event->payload()->discordTemplateVariables());
     }
 }

app/Actions/Notifications/TicketCreated.php

@@ -2,14 +2,25 @@
 
 namespace App\Actions\Notifications;
 
+use App\Enums\NotificationEventType;
 use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Foundation\Events\Dispatchable;
 
-final readonly class TicketCreated implements ShouldDispatchAfterCommit
+final readonly class TicketCreated implements NotificationEvent, ShouldDispatchAfterCommit
 {
     use Dispatchable;
 
     public function __construct(
-        public TicketStatusChangedPayload $payload,
+        public TicketCreatedPayload $payload,
     ) {}
+
+    public function eventType(): NotificationEventType
+    {
+        return NotificationEventType::TicketCreate;
+    }
+
+    public function payload(): NotificationEventPayload
+    {
+        return $this->payload;
+    }
 }

app/Actions/Notifications/TicketCreatedPayload.php

@@ -0,0 +1,105 @@
+<?php
+
+namespace App\Actions\Notifications;
+
+use App\Enums\NotificationEventType;
+use Carbon\CarbonImmutable;
+
+final readonly class TicketCreatedPayload implements NotificationEventPayload
+{
+    public ?int $fromStatusId;
+
+    public ?string $fromStatusLabel;
+
+    public function __construct(
+        public int $projectId,
+        public string $projectKey,
+        public string $projectName,
+        public int $ticketId,
+        public string $ticketKey,
+        public string $ticketTitle,
+        public string $ticketUrl,
+        public ?int $actorId,
+        public ?string $actorName,
+        public int $toStatusId,
+        public string $toStatusLabel,
+        public CarbonImmutable $occurredAt,
+    ) {
+        $this->fromStatusId = null;
+        $this->fromStatusLabel = null;
+    }
+
+    public function projectId(): int
+    {
+        return $this->projectId;
+    }
+
+    /**
+     * @return array<string, scalar|null>
+     */
+    public function deliveryMetadata(): array
+    {
+        return [
+            'project_key' => $this->projectKey,
+            'ticket_key' => $this->ticketKey,
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function discordTemplateVariables(): array
+    {
+        return [
+            '$url' => $this->ticketUrl,
+            '$ticket_key' => $this->ticketKey,
+            '$ticket_title' => $this->ticketTitle,
+            '$project_name' => $this->projectName,
+            '$status_from' => '',
+            '$status_to' => $this->toStatusLabel,
+            '$actor_name' => $this->actorName ?? '',
+        ];
+    }
+
+    /**
+     * @return array{
+     *     event_type: string,
+     *     project: array{id: int, key: string, name: string},
+     *     ticket: array{id: int, key: string, title: string},
+     *     actor: array{id: int, name: string}|null,
+     *     from: null,
+     *     to: array{id: int, label: string},
+     *     ticket_url: string,
+     *     occurred_at: string
+     * }
+     */
+    public function toArray(): array
+    {
+        return [
+            'event_type' => NotificationEventType::TicketCreate->value,
+            'project' => [
+                'id' => $this->projectId,
+                'key' => $this->projectKey,
+                'name' => $this->projectName,
+            ],
+            'ticket' => [
+                'id' => $this->ticketId,
+                'key' => $this->ticketKey,
+                'title' => $this->ticketTitle,
+            ],
+            'actor' => $this->actorId === null || $this->actorName === null
+                ? null
+                : [
+                    'id' => $this->actorId,
+                    'name' => $this->actorName,
+                ],
+            'from' => null,
+            'to' => [
+                'id' => $this->toStatusId,
+                'label' => $this->toStatusLabel,
+            ],
+            'ticket_url' => $this->ticketUrl,
+            'occurred_at' => $this->occurredAt->toISOString(),
+        ];
+    }
+}

app/Actions/Notifications/TicketStatusChanged.php

@@ -2,14 +2,25 @@
 
 namespace App\Actions\Notifications;
 
+use App\Enums\NotificationEventType;
 use Illuminate\Contracts\Events\ShouldDispatchAfterCommit;
 use Illuminate\Foundation\Events\Dispatchable;
 
-final readonly class TicketStatusChanged implements ShouldDispatchAfterCommit
+final readonly class TicketStatusChanged implements NotificationEvent, ShouldDispatchAfterCommit
 {
     use Dispatchable;
 
     public function __construct(
         public TicketStatusChangedPayload $payload,
     ) {}
+
+    public function eventType(): NotificationEventType
+    {
+        return NotificationEventType::TicketStatusChanged;
+    }
+
+    public function payload(): NotificationEventPayload
+    {
+        return $this->payload;
+    }
 }

app/Actions/Notifications/TicketStatusChangedPayload.php

@@ -4,15 +4,10 @@ namespace App\Actions\Notifications;
 
 use App\Enums\NotificationEventType;
 use Carbon\CarbonImmutable;
-use Illuminate\Contracts\Support\Arrayable;
 
-/**
- * @implements Arrayable<string, mixed>
- */
-final readonly class TicketStatusChangedPayload implements Arrayable
+final readonly class TicketStatusChangedPayload implements NotificationEventPayload
 {
     public function __construct(
-        public NotificationEventType $eventType,
         public int $projectId,
         public string $projectKey,
         public string $projectName,
@@ -22,20 +17,52 @@ final readonly class TicketStatusChangedPayload implements Arrayable
         public string $ticketUrl,
         public ?int $actorId,
         public ?string $actorName,
-        public ?int $fromStatusId,
-        public ?string $fromStatusLabel,
+        public int $fromStatusId,
+        public string $fromStatusLabel,
         public int $toStatusId,
         public string $toStatusLabel,
         public CarbonImmutable $occurredAt,
     ) {}
 
+    public function projectId(): int
+    {
+        return $this->projectId;
+    }
+
+    /**
+     * @return array<string, scalar|null>
+     */
+    public function deliveryMetadata(): array
+    {
+        return [
+            'project_key' => $this->projectKey,
+            'ticket_key' => $this->ticketKey,
+        ];
+    }
+
+    /**
+     * @return array<string, string>
+     */
+    public function discordTemplateVariables(): array
+    {
+        return [
+            '$url' => $this->ticketUrl,
+            '$ticket_key' => $this->ticketKey,
+            '$ticket_title' => $this->ticketTitle,
+            '$project_name' => $this->projectName,
+            '$status_from' => $this->fromStatusLabel,
+            '$status_to' => $this->toStatusLabel,
+            '$actor_name' => $this->actorName ?? '',
+        ];
+    }
+
     /**
      * @return array{
      *     event_type: string,
      *     project: array{id: int, key: string, name: string},
      *     ticket: array{id: int, key: string, title: string},
      *     actor: array{id: int, name: string}|null,
-     *     from: array{id: int, label: string}|null,
+     *     from: array{id: int, label: string},
      *     to: array{id: int, label: string},
      *     ticket_url: string,
      *     occurred_at: string
@@ -44,7 +71,7 @@ final readonly class TicketStatusChangedPayload implements Arrayable
     public function toArray(): array
     {
         return [
-            'event_type' => $this->eventType->value,
+            'event_type' => NotificationEventType::TicketStatusChanged->value,
             'project' => [
                 'id' => $this->projectId,
                 'key' => $this->projectKey,
@@ -61,12 +88,10 @@ final readonly class TicketStatusChangedPayload implements Arrayable
                     'id' => $this->actorId,
                     'name' => $this->actorName,
                 ],
-            'from' => $this->fromStatusId === null || $this->fromStatusLabel === null
-                ? null
-                : [
-                    'id' => $this->fromStatusId,
-                    'label' => $this->fromStatusLabel,
-                ],
+            'from' => [
+                'id' => $this->fromStatusId,
+                'label' => $this->fromStatusLabel,
+            ],
             'to' => [
                 'id' => $this->toStatusId,
                 'label' => $this->toStatusLabel,