v0.6.5 various bug fixes

frontend/public/sw.js

@@ -27,36 +27,53 @@ self.addEventListener('fetch', (event) => {
   );
 });
 
-// Track badge count in SW
+// Track badge count in SW scope
 let badgeCount = 0;
 
 self.addEventListener('push', (event) => {
   if (!event.data) return;
-  const data = event.data.json();
+
+  let data = {};
+  try { data = event.data.json(); } catch (e) { return; }
 
   badgeCount++;
 
-  // Update app badge (supported on Android Chrome and some desktop)
-  if (navigator.setAppBadge) {
-    navigator.setAppBadge(badgeCount).catch(() => {});
+  // Update app badge
+  if (self.navigator && self.navigator.setAppBadge) {
+    self.navigator.setAppBadge(badgeCount).catch(() => {});
   }
 
-  event.waitUntil(
-    self.registration.showNotification(data.title || 'New Message', {
+  // Check if app is currently visible — if so, skip the notification
+  const showNotification = clients.matchAll({
+    type: 'window',
+    includeUncontrolled: true,
+  }).then((clientList) => {
+    const appVisible = clientList.some(
+      (c) => c.visibilityState === 'visible'
+    );
+    // Still show if app is open but hidden (minimized), skip only if truly visible
+    if (appVisible) return;
+
+    return self.registration.showNotification(data.title || 'New Message', {
       body: data.body || '',
       icon: '/icons/icon-192.png',
-      badge: '/icons/icon-192.png',
+      badge: '/icons/icon-192-maskable.png',
       data: { url: data.url || '/' },
-      tag: 'jama-message',       // replaces previous notification instead of stacking
-      renotify: true,                 // still vibrate/sound even if replacing
-    })
-  );
+      // Use unique tag per group so notifications group by conversation
+      tag: data.groupId ? `jama-group-${data.groupId}` : 'jama-message',
+      renotify: true,
+    });
+  });
+
+  event.waitUntil(showNotification);
 });
 
 self.addEventListener('notificationclick', (event) => {
   event.notification.close();
   badgeCount = 0;
-  if (navigator.clearAppBadge) navigator.clearAppBadge().catch(() => {});
+  if (self.navigator && self.navigator.clearAppBadge) {
+    self.navigator.clearAppBadge().catch(() => {});
+  }
   event.waitUntil(
     clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clientList) => {
       const url = event.notification.data?.url || '/';
@@ -71,10 +88,22 @@ self.addEventListener('notificationclick', (event) => {
   );
 });
 
-// Clear badge when user opens the app
+// Clear badge when app signals it
 self.addEventListener('message', (event) => {
   if (event.data?.type === 'CLEAR_BADGE') {
     badgeCount = 0;
-    if (navigator.clearAppBadge) navigator.clearAppBadge().catch(() => {});
+    if (self.navigator && self.navigator.clearAppBadge) {
+      self.navigator.clearAppBadge().catch(() => {});
+    }
+  }
+  if (event.data?.type === 'SET_BADGE') {
+    badgeCount = event.data.count || 0;
+    if (self.navigator && self.navigator.setAppBadge) {
+      if (badgeCount > 0) {
+        self.navigator.setAppBadge(badgeCount).catch(() => {});
+      } else {
+        self.navigator.clearAppBadge().catch(() => {});
+      }
+    }
   }
 });