fix(frontend): web push notifications were not triggered anymore (#1531)

Author: mercihabam

modules/core/js_modules/Hm_MessagesStore.js

@@ -25,6 +25,7 @@ class Hm_MessagesStore {
         this.pages = 0;
         this.page = page;
         this.offsets = '';
+        this.newMessages = [];
     }
 
     /**
@@ -58,6 +59,7 @@ class Hm_MessagesStore {
 
         const { formatted_message_list: updatedMessages, pages, folder_status, do_not_flag_as_read_on_open, offsets } = await this.#fetch(hideLoadingState);
 
+        this.newMessages = this.#getNewMessages(updatedMessages);
         this.count = folder_status && Object.values(folder_status)[0]?.messages;
         this.pages = parseInt(pages);
         this.rows = updatedMessages;
@@ -152,6 +154,27 @@ class Hm_MessagesStore {
         }
     }
 
+    #getNewMessages(fetchedRows) {
+        const actualRows = this.hasLocalData() ? Object.values(this.rows): [];
+        const fetchedRowsValues = Object.values(fetchedRows);
+
+        const newMessages = [];
+
+        fetchedRowsValues.forEach(fetchedRow => {
+            const isNew = !actualRows.some(actualRow => {
+                return $(actualRow['0']).data('uid') === $(fetchedRow['0']).data('uid');
+            });
+            if (isNew) {
+                const row = $(fetchedRow['0']);
+                if (row.hasClass('unseen')) {
+                    newMessages.push(fetchedRow['0']);
+                }
+            }
+        });
+
+        return newMessages;
+    }
+
     #fetch(hideLoadingState = false) {
         return new Promise((resolve, reject) => {
             Hm_Ajax.request(

modules/core/js_modules/utils/messageList.js

@@ -0,0 +1,9 @@
+function triggerNewMessageEvent(uid, row) {
+    const newRowEvent = new CustomEvent('new-message', {
+        detail: {
+            uid: uid,
+            row: row,
+        }
+    });
+    window.dispatchEvent(newRowEvent);
+}

modules/desktop_notifications/site.js

@@ -1,35 +1,31 @@
 'use strict';
 
-
 $(function() {
-    $('body').on('new_message', function() {
-        var unread_page = false;
-        if (getPageNameParam() == 'message_list' && getListPathParam() == 'unread') {
-            unread_page = true;
-        }
-        if (!document.hidden && unread_page) {
-            return;
-        }
-        var current = $('.total_unread_count').text()*1;
-        var past = Hm_Message_List.past_total;
-        if (current == past || current < past) {
-            return;
-        }
-        var content;
-        if (unread_page) {
-            content = Hm_Message_List.just_inserted.reverse().join("\n\n");
-        }
-        else if (globals.Hm_Background_Unread) {
-            content = globals.Hm_Background_Unread.just_inserted.reverse().join("\n\n");
-        }
-        if (!content) {
-            return;
-        }
-        Push.create(hm_trans("New Message"), {
+    window.addEventListener('new-message', (event) => {
+        const row = event.detail.row;
+        const content = $(row).find('.from').text() + ' - ' + $(row).find('.subject').text();
+
+        const pushNotification = () => Push.create(hm_trans("New Message"), {
             body: content,
             timeout: 10000,
             icon: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAAIBJREFUWIXtlkEOgCAMBEdfpj/Hl+FB8GBiWoqEg7sJt7YzTXoAlL9nAfJMgXUmXAJVYAeOCeyjsO9sQOI6ypEvFdZrRomY4FEiJtgqiIp45zY3fAWu9d0Devu6N4mCTYHw9TrBboFWES+4WcASaQWHBZ4iUXAGsv4DEpCABBTlBOkR5VdJRFCfAAAAAElFTkSuQmCC',
             onClick: function () { window.focus(); this.close(); }
         });
+
+        if (Push.Permission.has()) {
+            pushNotification();
+        } else {
+            Push.Permission.request(pushNotification);
+        }
     });
+
+    // refresh the unread messages state
+    setInterval(() => {
+        // undefined_undefined: load with no filter and no keyword
+        new Hm_MessagesStore('unread', 1, 'undefined_undefined').load(true, true).then((store) => {
+            store.newMessages.forEach((messageRow) => {
+                triggerNewMessageEvent($(messageRow).data('uid'), $(messageRow)[0]);
+            });
+        });
+    }, 60000);
 });

modules/imap/site.js

@@ -416,6 +416,11 @@ async function select_imap_folder(path, page = 1,reload, processInTheBackground
         if (messages.pages) {
             showPagination(messages.pages);
         }
+
+        messages.newMessages.forEach((newMessage) => {
+            const row = $(newMessage);
+            triggerNewMessageEvent(row.data('uid'), row[0]);
+        });
     });
 
     if (path === 'unread') {