Merge pull request #1565 from josaphatim/empty-message

fix(frontend): show meaningful message when email is already moved

Author: kroky

modules/core/site.js

@@ -457,14 +457,16 @@ class Hm_Alert {
 
         this.container.appendChild(alert);
 
-        setTimeout(() => {
-            alert.style.opacity = '0';
-            alert.style.transform = 'translateY(-20px)';
+        if (dismissible) {
             setTimeout(() => {
-                const bsAlert = new bootstrap.Alert(alert);
-                bsAlert.close();
-            }, 500);
-        }, dismissTime * 1000);
+                alert.style.opacity = '0';
+                alert.style.transform = 'translateY(-20px)';
+                setTimeout(() => {
+                    const bsAlert = new bootstrap.Alert(alert);
+                    bsAlert.close();
+                }, 500);
+            }, dismissTime * 1000);
+        }
     }
 
     #getIcon(type) {

modules/imap/site.js

@@ -642,34 +642,27 @@ var get_message_content = function(msg_part, uid, list_path, listParent, detail,
             window.scrollTo(0,0);
         }
         const onSuccess = function(res) {
-            if (!noupdate) {
-                $('.msg_text').html('');
-                $('.msg_text').append(res.msg_headers);
-                $('.msg_text').append(res.msg_text);
-                $('.msg_text').append(res.msg_parts);
-                document.title = $('.header_subject th').text();
-                imap_message_view_finished(uid, detail, listParent);
-            }
-            else {
-                $('.reply_link, .reply_all_link, .forward_link').each(function() {
-                    $(this).attr("href", $(this).data("href"));
-                    $(this).removeClass('disabled_link');
-                });
-            }
+            $('.msg_text').html('');
+            $('.msg_text').append(res.msg_headers);
+            $('.msg_text').append(res.msg_text);
+            $('.msg_text').append(res.msg_parts);
+
+            document.title = $('.header_subject th').text();
+            imap_message_view_finished(uid, detail, listParent);
+
             if (!res.show_pagination_links) {
                 $('.prev, .next').hide();
             }
             globals.auto_advance_email_enabled = Boolean(res.auto_advance_email_enabled);
         };
 
         if (!msg_part) {
-            const msgContent = get_local_message_content(uid, list_path);
+            var msgContent = get_local_message_content(uid, list_path);
             if (msgContent) {
                 onSuccess(msgContent);
                 if (callback) {
                     callback(msgContent)
                 }
-                return;
             }
         }
 
@@ -680,7 +673,23 @@ var get_message_content = function(msg_part, uid, list_path, listParent, detail,
             {'name': 'imap_server_id', 'value': detail.server_id},
             {'name': 'folder', 'value': detail.folder}],
             function(res) {
-                onSuccess(res);
+                if (res.msg_text === '<div class="msg_text_inner"></div>' && noupdate) {
+                    const modal = new Hm_Modal({
+                        title: 'Message not found',
+                        modalId: 'messageNotFoundModal',
+                    })
+                    modal.setContent("The email you're looking for isn't here.<br>It may have been deleted, moved.");
+                    modal.addFooterBtn('Go to message list', 'btn-success', function() {
+                        Hm_Utils.redirect("?page=message_list&list_path="+listParent);
+                    });
+                    modal.addFooterBtn('Search mail', 'btn-success', function() {
+                        Hm_Utils.redirect("?page=search");
+                    });
+                    modal.open();
+                }
+                if (!noupdate) {
+                    onSuccess(res);
+                }
                 if (!noupdate && !msg_part) {
                     Hm_Utils.save_to_local_storage(getMessageStorageKey(uid), JSON.stringify(res));
                 }
@@ -845,27 +854,8 @@ var imap_setup_message_view_page = function(uid, details, list_path, listParent,
     }
 
     const msg_content = get_local_message_content(uid, list_path);
-    if (!msg_content) {
-        get_message_content(false, uid, list_path, listParent, details, callback);
-    }
-    else {
-        const msgResponse = msg_content;
-        $('.msg_text').append(msgResponse.msg_headers)
-                        .append(msgResponse.msg_text)
-                        .append(msgResponse.msg_parts);
-        document.title = $('.header_subject th').text();
-        if ($('.header_subject th').find('i.bi.bi-x-lg.close_inline_msg').length === 0) {
-            $('.header_subject th').append('<i class="bi bi-x-lg close_inline_msg"></i>');
-            $('.close_inline_msg').on("click", function() { msg_inline_close(); });
-        }
-
-        $('.reply_link, .reply_all_link, .forward_link').each(function() {
-            $(this).data("href", $(this).attr("href")).removeAttr("href");
-            $(this).addClass('disabled_link');
-        });
-        imap_message_view_finished(uid, details, listParent);
-        get_message_content(false, uid, list_path, listParent, details, callback, true);
-    }
+    const noupdate = Boolean(msg_content);
+    get_message_content(false, uid, list_path, listParent, details, callback, noupdate);
 };
 
 var display_reply_content = function(res) {

modules/inline_message/site.js

@@ -122,8 +122,8 @@ var update_imap_links = function(uid, details) {
 };
 
 var capture_subject_click = function() {
-    $('.subject a').off('click');
-    $('.subject a').on("click", function(e) {
+    $(document).off('click', ".subject a");
+    $(document).on("click", ".subject a", function(e) {
         var msg_details = get_inline_msg_details(this);
         var uid = msg_details[0];
         var list_path = msg_details[1];