Skip to content

fix(webmail): move deleted messages to Trash mailbox and enable 30s inbox polling #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
farrasrayhand wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(webmail): move deleted messages to Trash mailbox and enable 30s inbox polling #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/email/client/hooks/use-threads.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ export const useThreads = () => {
// explicit refresh button). Without this, stale-while-revalidate
// refetches were overwriting a just-marked row with the older
// server snapshot and visibly "reverting" the action.
staleTime: Infinity,
refetchOnMount: false,
refetchOnWindowFocus: false,
staleTime: 10000,
refetchInterval: 30000,
refetchOnMount: true,
refetchOnWindowFocus: true,
},
),
);
Expand Down
10 changes: 9 additions & 1 deletion apps/email/server/src/lib/imap-driver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,15 @@ export async function modifyLabels(
}
if (!found) continue;
if (input.addLabels && input.addLabels.length > 0) {
await client.messageFlagsAdd(found, input.addLabels, { uid: true });
if (input.addLabels.includes('TRASH') || input.addLabels.includes('bin')) {
if (mailbox === 'Trash') {
await client.messageDelete(found, { uid: true });
} else {
await client.messageMove(found, 'Trash', { uid: true });
}
} else {
await client.messageFlagsAdd(found, input.addLabels, { uid: true });
}
}
if (input.removeLabels && input.removeLabels.length > 0) {
await client.messageFlagsRemove(found, input.removeLabels, { uid: true });
Expand Down