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

webui: marking a mail unread must not fight the auto-mark-read

Browse Source 
The reading pane marked the open message read on EVERY redraw
(onupdate), so "Mark as unread" was undone the instant it ran -- and
worse, the change notification scheduled a summaries reload whose
redraw re-triggered the marking: a full getMessageSummaries fetch every
~250 ms for as long as the message stayed open. The auto-mark now runs
once per opened message (reset when the pane closes), and selecting a
message no longer sends a second MessageRead -- loadMail() already
does.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
jolavillette 2026-09-11 22:03:02 +02:00
parent a266ea0368
commit d0f34871be
1 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,10 +175,30 @@ const tagFilterOptions = [
const MailComponent = () => {
let showCompose = false;
let mobileNavOpen = false;
// Which message the auto-mark-read already ran for. Running it on EVERY
// redraw re-cleared the local unread bits the instant "Mark as unread"
// set them, and the change notification scheduled a summaries reload
// whose redraw re-triggered it: a full getMessageSummaries fetch every
// ~250 ms for as long as the message stayed open.
let lastAutoReadMsgId = null;
const autoMarkRead = (msgId) => {
if (!msgId) {
lastAutoReadMsgId = null;
return;
}
if (msgId === lastAutoReadMsgId) return;
lastAutoReadMsgId = msgId;
Messages.markReadLocally(msgId);
};
let searchQuery = '';
let filterUnreadOnly = false;
let selectedTagFilter = '';
let viewMode = localStorage.getItem('rs_mail_view_mode') || 'cards';
// Cards fetch a body each (for the snippet): unpaginated, a large folder
// fired one getMessage per mail in one burst. Same page size as the table.
const CARD_PAGE_SIZE = 50;
let cardPage = 0;
let cardPageTab = null;
function setShowCompose(bool) {
showCompose = bool;
@ -187,14 +207,10 @@ const MailComponent = () => {
return {
oninit: (vnode) => {
Messages.load();
if (vnode.attrs.msgId) {
Messages.markReadLocally(vnode.attrs.msgId);
}
autoMarkRead(vnode.attrs.msgId);
},
onupdate: (vnode) => {
if (vnode.attrs.msgId) {
Messages.markReadLocally(vnode.attrs.msgId);
}
autoMarkRead(vnode.attrs.msgId);
},
view: (vnode) => {
const activeTab = vnode.attrs.tab || 'inbox';
@ -239,7 +255,9 @@ const MailComponent = () => {
function selectMessage(id) {
Messages.markReadLocally(id);
util.markMessageRead(id);
// No markMessageRead here: MessageView.loadMail() sends it when the
// message opens -- both did, two server calls and two summaries
// reloads per click.
m.route.set('/mail/:tab/:msgId', { tab: activeTab, msgId: id });
}
@ -462,18 +480,41 @@ const MailComponent = () => {
m('p', searchQuery || filterUnreadOnly || selectedTagFilter ? 'No emails match your filter criteria.' : 'This folder is currently empty.'),
])
: viewMode === 'cards'
? m(
'.mail-cards-container',
sortedList.map((msg) =>
m(util.MessageCard, {
key: msg.msgId,
msg,
isSelected: msg.msgId === activeMsgId,
category: activeTab,
onSelect: (id) => selectMessage(id),
})
)
)
? (() => {
if (cardPageTab !== activeTab) {
cardPageTab = activeTab;
cardPage = 0;
}
const totalCardPages = Math.ceil(sortedList.length / CARD_PAGE_SIZE) || 1;
if (cardPage >= totalCardPages) cardPage = totalCardPages - 1;
const pageStart = cardPage * CARD_PAGE_SIZE;
const pagedCards = sortedList.slice(pageStart, pageStart + CARD_PAGE_SIZE);
return [
m(
'.mail-cards-container',
pagedCards.map((msg) =>
m(util.MessageCard, {
key: msg.msgId,
msg,
isSelected: msg.msgId === activeMsgId,
category: activeTab,
onSelect: (id) => selectMessage(id),
})
)
),
sortedList.length > CARD_PAGE_SIZE && m('.mail-cards-pagination', [
m('button[type=button]', {
disabled: cardPage === 0,
onclick: () => { cardPage -= 1; },
}, m('i.fas.fa-chevron-left')),
m('span', `${cardPage + 1} / ${totalCardPages}`),
m('button[type=button]', {
disabled: cardPage >= totalCardPages - 1,
onclick: () => { cardPage += 1; },
}, m('i.fas.fa-chevron-right')),
]),
];
})()
: m(
util.Table,
m(