The_Great_Archive/RSNewWebUI
1
0
Fork 0
mirror of https://github.com/RetroShare/RSNewWebUI.git synced 2026-09-12 19:50:04 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24 from jolavillette/fix/mail-unread-badge-for-121

Browse Source 
Mail badge: reading a message must not untrash it, and stop recounting per redraw
This commit is contained in:
defnax 2026-08-27 15:18:59 +02:00 committed by GitHub
commit 2f89c804fe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
webui-src/app/mail/mail_resolver.js
View File

@ -20,13 +20,22 @@ const Messages = {
todo: [],
later: [],
refreshTimer: null,
unreadCount() {
return (Messages.inbox || []).filter((msg) => {
unread: 0,
// The badge is read from the navigation view, so it is asked for on every
// redraw -- once for the rail, twice more for the bottom bar. Counting is a
// full pass over the inbox, so it happens when the inbox changes instead:
// after a load, and after a message is marked read here.
recountUnread() {
Messages.unread = (Messages.inbox || []).filter((msg) => {
const status = msg.msgflags & 0xf0;
return (status === util.RS_MSG_NEW || status === util.RS_MSG_UNREAD_BY_USER)
&& !(msg.msgflags & util.RS_MSG_TRASH)
&& !(msg.msgflags & util.RS_MSG_SPAM);
}).length;
return Messages.unread;
},
unreadCount() {
return Messages.unread;
},
refreshSoon() {
if (Messages.refreshTimer) return;
@ -37,8 +46,15 @@ const Messages = {
},
markReadLocally(msgId) {
Messages.all.forEach((msg) => {
if (msg.msgId === msgId) msg.msgflags &= ~0xf0;
// Only the two unread bits. RS_MSG_TRASH is 0x20, inside the 0xf0 the
// status is read through, so clearing the whole nibble also takes a
// message out of the trash: opening one from there showed it as an
// ordinary read mail until the next load.
if (msg.msgId === msgId) {
msg.msgflags &= ~(util.RS_MSG_NEW | util.RS_MSG_UNREAD_BY_USER);
}
});
Messages.recountUnread();
},
load() {
rs.rsJsonApiRequest('/rsMail/getMessageSummaries', { box: util.BOX_ALL }, (data) => {
@ -82,6 +98,7 @@ const Messages = {
Messages.later = Messages.all.filter(
(msg) => msg.msgtags && msg.msgtags.includes(util.RS_MSGTAGTYPE_LATER)
);
Messages.recountUnread();
m.redraw();
}
});