amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-17 06:14:54 +00:00
Code Issues Projects Releases Wiki Activity

feat(mail): delay or disable automatic mark message as read

Browse Source 
Fixes #1585
This commit is contained in:
Francis Lachapelle
2021-12-07 09:55:13 -05:00
parent 30040ba590
commit 4eed98d58d
14 changed files with 129 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/Message.service.js
+47 -7
View File
@@ -132,6 +132,7 @@
_this.flags.splice(i, 1,'_' + flag);
}
});
this.isread = !!this.isread;
};
/**
@@ -540,6 +541,31 @@
return Message.$$resource.post(this.$mailbox.$id(), 'addOrRemoveLabel', data);
};
/**
* @function toggleRead
* @memberof Message.prototype
* @desc Toggle message unseen status
* @returns a promise of the HTTP operation
*/
Message.prototype.toggleRead = function() {
var _this = this;
if (this.isread)
return Message.$$resource.fetch(this.$absolutePath(), 'markMessageUnread').then(function() {
Message.$timeout(function() {
_this.isread = false;
_this.$mailbox.unseenCount++;
});
});
else
return Message.$$resource.fetch(this.$absolutePath(), 'markMessageRead').then(function() {
Message.$timeout(function() {
_this.isread = true;
_this.$mailbox.unseenCount--;
});
});
};
/**
* @function $imipAction
* @memberof Message.prototype
@@ -664,13 +690,16 @@
var _this = this, futureMessageData;
if (options && options.useCache && this.$futureMessageData) {
// The message has already been fetched.
if (!this.isread) {
Message.$$resource.fetch(this.$absolutePath(), 'markMessageRead').then(function() {
Message.$timeout(function() {
_this.isread = true;
_this.$mailbox.unseenCount--;
});
});
if (Message.$Preferences.defaults.SOGoMailAutoMarkAsReadDelay > -1)
// Automatically mark message as read
_this.$markAsReadPromise = Message.$timeout(function() {
Message.$$resource.fetch(_this.$absolutePath(), 'markMessageRead').then(function() {
_this.isread = true;
_this.$mailbox.unseenCount--;
});
}, Message.$Preferences.defaults.SOGoMailAutoMarkAsReadDelay * 1000);
}
return this;
}
@@ -865,7 +894,18 @@
// Resolve and expose the promise
this.$futureMessageData = futureMessageData.then(function(data) {
// Calling $timeout will force Angular to refresh the view
if (_this.isread === 0) {
if (!data.isRead) {
if (Message.$Preferences.defaults.SOGoMailAutoMarkAsReadDelay > -1)
// Automatically mark message as read
_this.$markAsReadPromise = Message.$timeout(function() {
Message.$$resource.fetch(_this.$absolutePath(), 'markMessageRead').then(function() {
_this.isread = true;
_this.$mailbox.unseenCount--;
});
}, Message.$Preferences.defaults.SOGoMailAutoMarkAsReadDelay * 1000);
}
else if (!_this.isread) {
// Message as already been marked read on the server
_this.isread = true;
_this.$mailbox.unseenCount--;
}
UI/WebServerResources/js/Mailer/MessageController.js
+3
View File
@@ -98,6 +98,9 @@
_.forEach(hotkeys, function(key) {
sgHotkeys.deregisterHotkey(key);
});
// Cancel automatic mark as read
if (vm.message.$markAsReadPromise)
vm.service.$timeout.cancel(vm.message.$markAsReadPromise);
});
}; // $onInit