Enhanced push notifications

Author: vj-abishek

public/firebase-messaging-sw.js

@@ -53,6 +53,7 @@ firebase.initializeApp(firebaseConfig);
 const messaging = firebase.messaging();
 
 self.addEventListener('notificationclick', function (event) {
+    console.log('clicking worked');
     const clickedNotification = event.notification;
 
     const promiseChain = clients.matchAll({
@@ -64,19 +65,17 @@ self.addEventListener('notificationclick', function (event) {
 
             for (let i = 0; i < windowClients.length; i++) {
                 const windowClient = windowClients[i];
-                if (windowClient.url === self.location.origin) {
+                if (windowClient.url === `${self.location.origin}/`) {
                     matchingClient = windowClient;
                     break;
                 }
             }
 
             if (matchingClient) {
-                matchingClient.focus();
-
                 matchingClient.postMessage({
                     url: clickedNotification.data.url,
                 });
-                return;
+                return matchingClient.focus();
             } else {
                 return clients.openWindow(self.location.origin);
             }

src/Components/Home/Room/Single.jsx

@@ -73,7 +73,6 @@ const Single = ({
       if (snapShot === undefined) return '';
       const hash = hashTable.includes(snapShot.slug);
       if (snapShot.generated === false && snapShot.from === user.uid && !hash) {
-        console.log(snapShot.bobPublicKey);
         const e2e = new E2E();
         e2e
           .setPrivateKey(

src/Store/Actions/Firestore.js

@@ -49,10 +49,8 @@ export const addSlug = () => (dispatch, getState) => {
       const e2e = new E2E();
       const { Publickey, PrivateKey } = e2e.generateKeys();
 
-      console.log(PrivateKey, Publickey, slug);
 
       await ddb.slug.add({ id: slug, PrivateKey });
-      console.log({ id: slug, PrivateKey });
 
       root
         .doc(e.id)
@@ -121,7 +119,6 @@ export const addChannel = (slug) => async (dispatch, getState) => {
         .get();
       const e2e = new E2E();
       const bobPublicKey = e2e.generateSharedSecret(secretKey.data().Publickey);
-      console.log('BobPublic', bobPublicKey);
       obj.bobPublicKey = bobPublicKey;
 
       const channelId = await db.collection('channel').add(obj);

src/Store/Actions/Message.js

@@ -23,16 +23,13 @@ export const sendmessage = (message, details) => async (dispatch, getState) => {
   ) {
     lastMessageObj = {
       showDateInfo: true,
-      rendered: true,
     };
   }
 
   // Case 2: If there is no messages
   if (hasInMap && typeof getInMap.message === 'undefined') {
     lastMessageObj = {
       showDateInfo: true,
-      rendered: true,
-
     };
   }
 
@@ -165,7 +162,7 @@ export const RecieveMessage = () => (dispatch) => {
         channel: message.channel,
         to: message.to,
         ...parsed,
-        showDateInfo: message.showDateInfo || null,
+        showDateInfo: message.showDateInfo,
       };
       await db.message.add(final);
       const locatioHref = window.location.href;
@@ -180,19 +177,23 @@ export const RecieveMessage = () => (dispatch) => {
         messageTone.play();
         if (notificationPermission === 'granted') {
           try {
-            const notificationTitle = `${message.displayName}`;
-            const notificationOptions = {
-              body: parsed.message,
-              icon: message.photoURL,
-              vibrate: [100, 50, 100],
-              data: { url: `https://relp.now.sh/r/${message.channel}` },
-              actions: [{ action: 'open_url', title: 'Read Message' }],
-              click_action: `https://relp.now.sh/r/${message.channel}`,
-            };
-            navigator.serviceWorker.getRegistrations()
-              .then((req) => {
-                req.showNotification(notificationTitle, notificationOptions);
-              });
+            navigator.serviceWorker.ready.then((registration) => {
+              const notificationTitle = `${message.displayName}`;
+              const notificationOptions = {
+                body: parsed.message,
+                icon: message.photoURL,
+                vibrate: [500, 110, 500, 110, 450, 110, 200, 110, 170, 40, 450, 110, 200, 110, 170, 40, 500],
+                actions: [{ action: 'open_url', title: 'Read Message' }],
+                click_action: `https://relp.now.sh/r/${message.channel}`,
+                tag: parsed.channel,
+                renotify: true,
+                requireInteraction: true,
+              };
+              registration.getRegistrations()
+                .then((req) => {
+                  req.showNotification(notificationTitle, notificationOptions);
+                });
+            });
           } catch (err) {
             console.log(err);
           }