Push notification: add notification id

src/Controller/AjaxController.php

@@ -273,7 +273,7 @@ public function registerPushNotifications(#[MapRequestPayload] RegisterPushReque
         $this->entityManager->flush();
 
         try {
-            $testNotification = new PushNotification('', $this->translator->trans('test_push_message', locale: $pushSubscription->locale));
+            $testNotification = new PushNotification(null, '', $this->translator->trans('test_push_message', locale: $pushSubscription->locale));
             $this->pushSubscriptionManager->sendTextToUser($user, $testNotification, specificDeviceKey: $payload->deviceKey);
 
             return new JsonResponse();
@@ -311,7 +311,7 @@ public function testPushNotification(#[MapRequestPayload] TestPushRequestPayload
     {
         $user = $this->getUserOrThrow();
         try {
-            $this->pushSubscriptionManager->sendTextToUser($user, new PushNotification('', $this->translator->trans('test_push_message')), specificDeviceKey: $payload->deviceKey);
+            $this->pushSubscriptionManager->sendTextToUser($user, new PushNotification(null, '', $this->translator->trans('test_push_message')), specificDeviceKey: $payload->deviceKey);
 
             return new JsonResponse();
         } catch (\ErrorException $e) {

src/Controller/Api/Notification/NotificationPushApi.php

@@ -92,7 +92,7 @@ public function createSubscription(
         $this->entityManager->flush();
 
         try {
-            $testNotification = new PushNotification('', $translator->trans('test_push_message', locale: $pushSubscription->locale));
+            $testNotification = new PushNotification(null, '', $translator->trans('test_push_message', locale: $pushSubscription->locale));
             $pushSubscriptionManager->sendTextToUser($user, $testNotification, specificToken: $apiToken);
 
             return new JsonResponse(headers: $headers);
@@ -220,7 +220,7 @@ public function testSubscription(
 
         $sub = $repository->findOneBy(['user' => $user, 'apiToken' => $apiToken]);
         if ($sub) {
-            $testNotification = new PushNotification('', $translator->trans('test_push_message', locale: $sub->locale));
+            $testNotification = new PushNotification(null, '', $translator->trans('test_push_message', locale: $sub->locale));
             try {
                 $pushSubscriptionManager->sendTextToUser($user, $testNotification, specificToken: $apiToken);
 

src/Entity/EntryCommentCreatedNotification.php

@@ -52,6 +52,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'comment_id' => $this->entryComment->getId(),
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_new_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryCommentDeletedNotification.php

@@ -52,6 +52,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'comment_id' => $this->entryComment->getId(),
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_removed_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_removed_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryCommentEditedNotification.php

@@ -52,6 +52,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'comment_id' => $this->entryComment->getId(),
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_edited_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_edited_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryCommentMentionedNotification.php

@@ -50,6 +50,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'comment_id' => $this->entryComment->getId(),
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryCommentReplyNotification.php

@@ -52,6 +52,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'comment_id' => $this->entryComment->getId(),
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_new_reply', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_reply', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryCreatedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => $this->entry->slug ?? '-',
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_new_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryDeletedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => $this->entry->slug ?? '-',
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_removed_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_removed_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryEditedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => $this->entry->slug ?? '-',
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_edited_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_edited_thread', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/EntryMentionedNotification.php

@@ -44,6 +44,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => $this->entry->slug ?? '-',
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/MagazineBanNotification.php

@@ -52,6 +52,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
         $slash = $this->ban->bannedBy->avatar && !str_starts_with('/', $this->ban->bannedBy->avatar->filePath) ? '/' : '';
         $avatarUrl = $this->ban->bannedBy->avatar ? '/media/cache/resolve/avatar_thumb'.$slash.$this->ban->bannedBy->avatar->filePath : null;
 
-        return new PushNotification($message, $trans->trans('notification_title_ban', locale: $locale), avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_ban', locale: $locale), avatarUrl: $avatarUrl);
     }
 }

src/Entity/MessageNotification.php

@@ -45,6 +45,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
         $avatarUrl = $this->message->sender->avatar ? '/media/cache/resolve/avatar_thumb'.$slash.$this->message->sender->avatar->filePath : null;
         $url = $urlGenerator->generate('messages_single', ['id' => $this->message->thread->getId()]);
 
-        return new PushNotification($message, $trans->trans('notification_title_message', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl, category: EPushNotificationType::Message);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_message', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl, category: EPushNotificationType::Message);
     }
 }

src/Entity/NewSignupNotification.php

@@ -36,6 +36,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
         $slash = $this->newUser->avatar && !str_starts_with('/', $this->newUser->avatar->filePath) ? '/' : '';
         $avatarUrl = $this->newUser->avatar ? '/media/cache/resolve/avatar_thumb'.$slash.$this->newUser->avatar->filePath : null;
 
-        return new PushNotification($message, $title, actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $title, actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCommentCreatedNotification.php

@@ -51,6 +51,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]).'#post-comment-'.$this->postComment->getId();
 
-        return new PushNotification($message, $trans->trans('notification_title_new_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCommentDeletedNotification.php

@@ -51,6 +51,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]).'#post-comment-'.$this->postComment->getId();
 
-        return new PushNotification($message, $trans->trans('notification_title_removed_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_removed_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCommentEditedNotification.php

@@ -51,6 +51,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]).'#post-comment-'.$this->postComment->getId();
 
-        return new PushNotification($message, $trans->trans('notification_title_edited_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_edited_comment', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCommentMentionedNotification.php

@@ -51,6 +51,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]).'#post-comment-'.$this->postComment->getId();
 
-        return new PushNotification($message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCommentReplyNotification.php

@@ -51,6 +51,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]).'#post-comment-'.$this->postComment->getId();
 
-        return new PushNotification($message, $trans->trans('notification_title_new_reply', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_reply', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostCreatedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_new_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostDeletedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_removed_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_removed_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostEditedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_edited_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_edited_post', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/PostMentionedNotification.php

@@ -46,6 +46,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             'slug' => empty($this->postComment->post->slug) ? '-' : $this->postComment->post->slug,
         ]);
 
-        return new PushNotification($message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_mention', locale: $locale), actionUrl: $url, avatarUrl: $avatarUrl);
     }
 }

src/Entity/ReportApprovedNotification.php

@@ -55,7 +55,7 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             $actionUrl = $linkToReport;
         }
 
-        return new PushNotification($message, $title, actionUrl: $actionUrl);
+        return new PushNotification($this->getId(), $message, $title, actionUrl: $actionUrl);
     }
 
     private function getSubjectLink(ReportInterface $subject, UrlGeneratorInterface $urlGenerator): string

src/Entity/ReportCreatedNotification.php

@@ -38,6 +38,6 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
         $message = \sprintf('%s %s %s\n%s: %s', $this->report->reporting->username, $trans->trans('reported', locale: $locale), $this->report->reported->username,
             $trans->trans('report_subject', locale: $locale), $subject->getShortTitle());
 
-        return new PushNotification($message, $trans->trans('notification_title_new_report'), actionUrl: $reportLink);
+        return new PushNotification($this->getId(), $message, $trans->trans('notification_title_new_report'), actionUrl: $reportLink);
     }
 }

src/Entity/ReportRejectedNotification.php

@@ -40,7 +40,7 @@ public function getMessage(TranslatorInterface $trans, string $locale, UrlGenera
             $trans->trans('report_subject', locale: $locale), $subject->getShortTitle()
         );
 
-        return new PushNotification($message, $trans->trans('own_report_rejected', locale: $locale), actionUrl: $this->getSubjectLink($subject, $urlGenerator));
+        return new PushNotification($this->getId(), $message, $trans->trans('own_report_rejected', locale: $locale), actionUrl: $this->getSubjectLink($subject, $urlGenerator));
     }
 
     private function getSubjectLink(ReportInterface $subject, UrlGeneratorInterface $urlGenerator): string

src/Payloads/PushNotification.php

@@ -9,6 +9,8 @@
 class PushNotification
 {
     public function __construct(
+        // The id of the notification entity
+        public ?int $id,
         public string $message,
         public string $title,
         public ?string $actionUrl = null,