diff --git a/dev/Model/Message.js b/dev/Model/Message.js index ec004a52b..ebb936965 100644 --- a/dev/Model/Message.js +++ b/dev/Model/Message.js @@ -159,8 +159,6 @@ export class MessageModel extends AbstractModel { dateTimestamp: 0, dateTimestampSource: 0, - deleted: false, - // Also used by Selector focused: false, selected: false, @@ -364,7 +362,6 @@ export class MessageModel extends AbstractModel { lineAsCss(flags=1) { let classes = []; forEachObjectEntry({ - deleted: this.deleted() || this.isDeleted(), selected: this.selected(), checked: this.checked(), unseen: this.isUnseen(), diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js index 034c64aee..4323659fe 100644 --- a/dev/Model/MessageCollection.js +++ b/dev/Model/MessageCollection.js @@ -28,14 +28,10 @@ export class MessageCollectionModel extends AbstractCollectionModel */ static reviveFromJson(object/*, cached*/) { let msg = MessageUserStore.message(); - return super.reviveFromJson(object, message => { + return super.reviveFromJson(object, message => // If message is currently viewed, use that. // Maybe then use msg.revivePropertiesFromJson(message) ? - message = (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message); - if (message) { - message.deleted(false); - return message; - } - }); + (msg && msg.hash === message.hash) ? msg : MessageModel.reviveFromJson(message) + ); } } diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js index 3ad0b0bb5..c77318410 100644 --- a/dev/Stores/User/Messagelist.js +++ b/dev/Stores/User/Messagelist.js @@ -470,23 +470,6 @@ MessagelistUserStore.moveMessages = ( if (page > MessagelistUserStore.pageCount()) { setPage = MessagelistUserStore.pageCount(); } - if (MessagelistUserStore.threadUid() - && MessagelistUserStore.length - && MessagelistUserStore.find(item => item?.deleted() && item.uid == MessagelistUserStore.threadUid()) - ) { - const message = MessagelistUserStore.find(item => item && !item.deleted()); - if (!message) { - if (1 < page) { - setPage = page - 1; - } else { - MessagelistUserStore.threadUid(0); - setPage = MessagelistUserStore.pageBeforeThread(); - } - } else if (MessagelistUserStore.threadUid() != message.uid) { - MessagelistUserStore.threadUid(message.uid); - setPage = page; - } - } if (setPage) { MessagelistUserStore.page(setPage); replaceHash( @@ -544,7 +527,6 @@ MessagelistUserStore.moveMessages = ( currentMessage = null; MessageUserStore.message(null); } - item.deleted(true); MessagelistUserStore.remove(item); }); } diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less index 20b305c4b..93130fcf0 100644 --- a/dev/Styles/User/MessageList.less +++ b/dev/Styles/User/MessageList.less @@ -207,10 +207,6 @@ font-weight: bolder; } - &.deleted { - opacity: .3; - } - .messageCheckbox { font-size: 114%; padding: 5px .5em 0;