Skip to content

[stable33] fix(chat): improve updating of unread marker from chat-relay #17067

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

Merged
Antreesy merged 1 commit into from
Feb 11, 2026
Merged

[stable33] fix(chat): improve updating of unread marker from chat-relay #17067

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
30 changes: 11 additions & 19 deletions src/store/messagesStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,8 @@ const actions = {
const actorStore = useActorStore()
const chatExtrasStore = useChatExtrasStore()

const conversation = context.getters.conversation(token)

if (isHiddenSystemMessage(message)) {
if (message.systemMessage === MESSAGE.SYSTEM_TYPE.POLL_VOTED) {
const pollsStore = usePollsStore()
Expand All @@ -475,7 +477,6 @@ const actions = {
pollId: message.messageParameters.poll.id,
})

const conversation = context.getters.conversation(token)
if (conversation?.lastMessage?.id && message.id > conversation.lastMessage.id) {
context.dispatch('updateConversationLastMessage', { token, lastMessage: message })
}
Expand Down Expand Up @@ -530,7 +531,7 @@ const actions = {

if ([MESSAGE.SYSTEM_TYPE.MESSAGE_DELETED, MESSAGE.SYSTEM_TYPE.MESSAGE_EDITED].includes(message.systemMessage)) {
// update conversation lastMessage, if it was edited or deleted
if (message.parent.id === context.getters.conversation(token).lastMessage?.id) {
if (message.parent.id === conversation.lastMessage?.id) {
context.dispatch('updateConversationLastMessage', { token, lastMessage: message.parent })
}

Expand Down Expand Up @@ -570,17 +571,9 @@ const actions = {
if (message.referenceId) {
const tempMessages = context.getters.getTemporaryReferences(token, message.referenceId)
if (tempMessages.length > 0) {
// Replacing temporary placeholder message with server response (text message / file share)
const conversation = context.getters.conversation(token)
const isOwnMessage = actorStore.checkIfSelfIsActor(message)

// update lastMessage and lastReadMessage (no await to make it async)
// do it conditionally because there could have been more messages appearing concurrently
if (conversation?.lastMessage && isOwnMessage && message.id > conversation.lastMessage.id) {
context.dispatch('updateConversationLastMessage', { token, lastMessage: message })
}

if (conversation?.lastReadMessage && isOwnMessage && message.id > conversation.lastReadMessage) {
if (actorStore.checkIfSelfIsActor(message)
&& conversation?.lastReadMessage
&& message.id > conversation.lastReadMessage) {
context.dispatch('updateLastReadMessage', { token, id: message.id, updateVisually: true })
}

Expand All @@ -591,13 +584,17 @@ const actions = {
}
}

// update lastMessage, if larger than existing
if (conversation?.lastMessage && message.id > conversation.lastMessage.id) {
context.dispatch('updateConversationLastMessage', { token, lastMessage: message })
}

if ([
MESSAGE.SYSTEM_TYPE.CALL_STARTED,
MESSAGE.SYSTEM_TYPE.CALL_MISSED,
MESSAGE.SYSTEM_TYPE.CALL_ENDED,
MESSAGE.SYSTEM_TYPE.CALL_ENDED_EVERYONE,
].includes(message.systemMessage)) {
const conversation = context.getters.conversation(token)
// Overwrite the conversation.hasCall property so people can join
// after seeing the message in the chat.
if (conversation?.lastMessage && message.id > conversation.lastMessage.id) {
Expand Down Expand Up @@ -1205,11 +1202,6 @@ const actions = {
})

if (conversation?.lastMessage && lastMessage.id > conversation.lastMessage.id) {
context.dispatch('updateConversationLastMessage', {
token,
lastMessage,
})

// only increase the counter if the conversation store was out of sync with the message list
if (countNewMessages > 0) {
context.commit('updateUnreadMessages', {
Expand Down
6 changes: 6 additions & 0 deletions src/store/messagesStore.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,7 @@ describe('messagesStore', () => {
let updateLastCommonReadMessageAction
let addGuestNameAction
let cancelFunctionMock
let conversationMock

const oldMessagesList = [{
id: 98,
Expand Down Expand Up @@ -842,6 +843,8 @@ describe('messagesStore', () => {
addGuestNameAction = vi.fn()
testStoreConfig.actions.updateLastCommonReadMessage = updateLastCommonReadMessageAction
guestNameStore.addGuestName = addGuestNameAction
conversationMock = vi.fn()
testStoreConfig.getters.conversation = vi.fn().mockReturnValue(conversationMock)

cancelFunctionMock = vi.fn()
CancelableRequest.mockImplementation((request) => {
Expand Down Expand Up @@ -945,6 +948,7 @@ describe('messagesStore', () => {
let updateLastCommonReadMessageAction
let addGuestNameAction
let cancelFunctionMock
let conversationMock

beforeEach(() => {
testStoreConfig = cloneDeep(messagesStore)
Expand All @@ -954,6 +958,8 @@ describe('messagesStore', () => {
addGuestNameAction = vi.fn()
testStoreConfig.actions.updateLastCommonReadMessage = updateLastCommonReadMessageAction
guestNameStore.addGuestName = addGuestNameAction
conversationMock = vi.fn()
testStoreConfig.getters.conversation = vi.fn().mockReturnValue(conversationMock)

cancelFunctionMock = vi.fn()
CancelableRequest.mockImplementation((request) => {
Expand Down