msglist: Suppress duplicate message on fetch/event race - #2388
Open
chrisbobbe wants to merge 1 commit into
Open
Conversation
rajveermalviya
approved these changes
Jul 28, 2026
rajveermalviya
left a comment
rajveermalviya
left a comment
Member
There was a problem hiding this comment.
Thanks @chrisbobbe! All LGTM, with couple nits below, otherwise please feel free to merge.
Comment on lines
+1160
to
+1161
| messages[index] = message; | ||
| contents[index] = parseMessageContent(message); |
Member
There was a problem hiding this comment.
nit: Do we want to pull this into a helper on _MessageSequence, something like _replaceMessage(int index, Message message)? Because it seems direct writes to messages and contents is exposed only by it's helpers.
Comment on lines
+1162
to
+1169
| if (event.localMessageId != null) { | ||
| // We sent this message; drop its outbox counterpart. | ||
| // (When [haveNewest] is false there are no [outboxMessages], so this | ||
| // is a no-op; see [_syncOutboxMessagesFromStore].) | ||
| final localMessageId = int.parse(event.localMessageId!, radix: 10); | ||
| outboxMessages.removeWhere( | ||
| (message) => message.localMessageId == localMessageId); | ||
| } |
Member
There was a problem hiding this comment.
nit: This is identical to code below at line 1201, do we want to move this into a helper?
Fixes zulip#929. When the user navigates to a narrow, the message fetch can race with the event queue: a newly sent message appears in the fetch response and then later arrives as a message event. Before now, the message would get shown twice in the message list; this commit fixes that. On handling a message event, when the message is already in the list, skip adding a duplicate. Do adopt the event's copy of the message, though, because the message store has done the same, and the list's messages should remain identical to the store's so that the message reflects subsequent update events. Do this adoption before the narrow/haveNewest checks that gate adding a *new* message. Those checks answer whether a new message belongs in the list; but a message we already have must stay in sync with the store regardless -- including in a search narrow (where containsMessage is null) or when the list hasn't yet reached the newest message. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
chrisbobbe
force-pushed
the
claude/issue-929-review-d3memg
branch
from
July 28, 2026 18:18
c80552b to
c450ada
Compare
Collaborator
Author
|
Oh wow, my Claude session (Claude Code on the Web, see #2379) did that force-push all by itself—I haven't reviewed its work yet; I'll need to do that. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #929.
When the user navigates to a narrow, the message fetch can race with the event queue: a newly sent message appears in the fetch response and then later arrives as a message event. Before now, the message would get shown twice in the message list; this commit fixes that.
On handling a message event, when the message is already in the list, skip adding a duplicate. Do adopt the event's copy of the message, though, because the message store has done the same, and the list's messages should remain identical to the store's so that the message reflects subsequent update events.
Do this adoption before the narrow/haveNewest checks that gate adding a new message. Those checks answer whether a new message belongs in the list; but a message we already have must stay in sync with the store regardless -- including in a search narrow (where containsMessage is null) or when the list hasn't yet reached the newest message.