diff --git a/src/app/features/outbox/OutboxFeature.tsx b/src/app/features/outbox/OutboxFeature.tsx index c8c0d3a89..b80586ba4 100644 --- a/src/app/features/outbox/OutboxFeature.tsx +++ b/src/app/features/outbox/OutboxFeature.tsx @@ -94,10 +94,15 @@ export function OutboxFeature() { OFFLINE.has(mx.getSyncState()) || (typeof navigator !== 'undefined' && navigator.onLine === false); - const persist = (next: OutboxEntry[]) => { - if (next === entries) return; + // [Gitea #268] Read-modify-write: another tab may have queued or cleared + // entries since we last looked, and saving our own copy over the key + // would drop theirs. Entries are added/removed by txnId, so applying our + // change to the stored list merges cleanly. + const persist = (update: (list: OutboxEntry[]) => OutboxEntry[]) => { + const stored = loadOutbox(userId); + const next = update(stored); entries = next; - saveOutbox(userId, entries); + if (next !== stored) saveOutbox(userId, next); }; /** @@ -123,8 +128,8 @@ export function OutboxFeature() { if (!shouldKeepInOutbox(event.getType(), event.getContent())) return; live.set(txnId, { event, room }); if (event.status === EventStatus.NOT_SENT) scheduleBlipRetry(event); - persist( - withEntry(entries, { + persist((list) => + withEntry(list, { txnId, roomId: room.roomId, threadId: event.threadRootId ?? null, @@ -138,7 +143,7 @@ export function OutboxFeature() { // SENT, CANCELLED, or the remote echo replaced it (status null). live.delete(txnId); autoRetries.delete(txnId); - persist(withoutEntry(entries, txnId)); + persist((list) => withoutEntry(list, txnId)); }; /** Re-send network failures, oldest first; a room stops at its first failure. */ @@ -191,7 +196,7 @@ export function OutboxFeature() { return !!room && isDelivered(room, entry.txnId); }, ); - plan.drop.forEach((entry) => persist(withoutEntry(entries, entry.txnId))); + plan.drop.forEach((entry) => persist((list) => withoutEntry(list, entry.txnId))); plan.restore.forEach((entry) => { const room = mx.getRoom(entry.roomId); if (!room || live.has(entry.txnId)) return;