From da451ed369d201076f076055415eef41d8c59d52 Mon Sep 17 00:00:00 2001 From: the-djmaze <> Date: Mon, 3 Oct 2022 16:04:39 +0200 Subject: [PATCH] Also show inline images as attachments --- dev/Model/AttachmentCollection.js | 7 ------- dev/Model/Message.js | 3 ++- dev/View/User/MailBox/MessageView.js | 4 ++-- .../v/0.0.0/app/templates/Views/User/MailMessageView.html | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dev/Model/AttachmentCollection.js b/dev/Model/AttachmentCollection.js index b799dc8dc..2ac19db90 100644 --- a/dev/Model/AttachmentCollection.js +++ b/dev/Model/AttachmentCollection.js @@ -20,13 +20,6 @@ export class AttachmentCollectionModel extends AbstractCollectionModel */ } - /** - * @returns {boolean} - */ - hasVisible() { - return !!this.filter(item => !item.isLinked()).length; - } - /** * @param {string} cid * @returns {*} diff --git a/dev/Model/Message.js b/dev/Model/Message.js index 404eb429c..83e4634d6 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -150,7 +150,8 @@ export class MessageModel extends AbstractModel { this.addComputables({ attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()), threadsLen: () => this.threads().length, - hasAttachments: () => this.attachments().hasVisible(), +// hasAttachments: () => this.attachments().filter(item => !item.isLinked()).length, + hasAttachments: () => this.attachments().length, isUnseen: () => !this.flags().includes('\\seen'), isFlagged: () => this.flags().includes('\\flagged'), diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js index 04c585f22..89256efed 100644 --- a/dev/View/User/MailBox/MessageView.js +++ b/dev/View/User/MailBox/MessageView.js @@ -137,7 +137,7 @@ export class MailMessageView extends AbstractViewRight { downloadAsZipAllowed: () => this.attachmentsActions.includes('zip') && (currentMessage()?.attachments || []) - .filter(item => item?.download && !item?.isLinked() && item?.checked()) + .filter(item => item?.download /*&& !item?.isLinked()*/ && item?.checked()) .length, tagsAllowed: () => FolderUserStore.currentFolder() ? FolderUserStore.currentFolder().tagsAllowed() : false, @@ -467,7 +467,7 @@ export class MailMessageView extends AbstractViewRight { downloadAsZip() { const hashes = (currentMessage() ? currentMessage().attachments : []) - .map(item => item?.checked() && !item?.isLinked() ? item.download : '') + .map(item => item?.checked() /*&& !item?.isLinked()*/ ? item.download : '') .filter(v => v); if (hashes.length) { Remote.post('AttachmentsActions', this.downloadAsZipLoading, { diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html index 452af6905..47576b7a1 100644 --- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html +++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html @@ -226,7 +226,7 @@