Merge pull request #2558 from Bilb/fix-notifications-preview-skip-already-visible-check

fix: do not deduplicate notification for previews

ts/components/settings/SessionNotificationGroupSettings.tsx

@@ -60,20 +60,17 @@ export const SessionNotificationGroupSettings = (props: { hasPassword: boolean |
     if (!notificationsAreEnabled) {
       return;
     }
-    Notifications.addNotification(
+    Notifications.addPreviewNotification({
-      {
+      conversationId: `preview-notification-${Date.now()}`,
-        conversationId: `preview-notification-${Date.now()}`,
+      message:
-        message:
+        items.find(m => m.value === initialNotificationEnabled)?.label ||
-          items.find(m => m.value === initialNotificationEnabled)?.label ||
+        window?.i18n?.('messageBody') ||
-          window?.i18n?.('messageBody') ||
+        'Message body',
-          'Message body',
+      title: window.i18n('notificationPreview'),
-        title: window.i18n('notificationPreview'),
+      iconUrl: null,
-        iconUrl: null,
+      isExpiringMessage: false,
-        isExpiringMessage: false,
+      messageSentAt: Date.now(),
-        messageSentAt: Date.now(),
+    });
-      },
-      true
-    );
   };
 
   return (

ts/util/notifications.ts

@@ -77,7 +77,7 @@ function disable() {
  *
  * @param forceRefresh Should only be set when the user triggers a test notification from the settings
  */
-function addNotification(notif: SessionNotification, forceRefresh = false) {
+function addNotification(notif: SessionNotification) {
   const alreadyThere = currentNotifications.find(
     n => n.conversationId === notif.conversationId && n.messageId === notif.messageId
   );
@@ -86,11 +86,15 @@ function addNotification(notif: SessionNotification, forceRefresh = false) {
     return;
   }
   currentNotifications.push(notif);
-  if (forceRefresh) {
+  debouncedUpdate();
-    update(true);
+}
-  } else {
+
-    debouncedUpdate();
+/**
-  }
+ * Special case when we want to display a preview of what notifications looks like
+ */
+function addPreviewNotification(notif: SessionNotification) {
+  currentNotifications.push(notif);
+  update(true);
 }
 
 function clearByConversationID(convoId: string) {
@@ -251,6 +255,7 @@ function onRemove() {
 
 export const Notifications = {
   addNotification,
+  addPreviewNotification,
   disable,
   enable,
   clear,