Skip to content

Commit

Permalink
fix(messagesStore): update lastReadMessage if posted by same actor
Browse files Browse the repository at this point in the history
- text messages already covered in postNewMessage
- this fix is for file shares (we wait for server response to replace local temp messages)

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
  • Loading branch information
Antreesy committed Feb 25, 2025
1 parent 413abe7 commit 0d2ea65
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 3 deletions.
18 changes: 15 additions & 3 deletions src/store/messagesStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -586,9 +586,21 @@ const actions = {

if (message.referenceId) {
const tempMessages = context.getters.getTemporaryReferences(token, message.referenceId)
tempMessages.forEach(tempMessage => {
context.commit('deleteMessage', { token, id: tempMessage.id })
})
if (tempMessages.length > 0) {
// Replacing temporary placeholder message with posted message / file share
const conversation = context.getters.conversation(token)

if (conversation
&& message.actorId === context.getters.getActorId()
&& message.actorType === context.getters.getActorType()
&& message.id > conversation.lastReadMessage) {
context.dispatch('updateLastReadMessage', { token, id: message.id, updateVisually: true })
}

tempMessages.forEach(tempMessage => {
context.commit('deleteMessage', { token, id: tempMessage.id })
})
}
}

if (message.systemMessage === 'poll_voted') {
Expand Down
31 changes: 31 additions & 0 deletions src/store/messagesStore.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,37 @@ describe('messagesStore', () => {
expect(store.getters.messagesList(TOKEN)).toStrictEqual([message1])
})

test('updates last read message when replacing matching temporary message', () => {
conversationMock.mockReturnValueOnce({
token: TOKEN,
lastReadMessage: 100,
lastMessage: {
id: 123,
},
})
const response = generateOCSResponse({ payload: conversation })
updateLastReadMessage.mockResolvedValueOnce(response)

const temporaryMessage = {
id: 'temp-1',
referenceId: 'reference-1',
token: TOKEN,
}
store.dispatch('addTemporaryMessage', { token: TOKEN, message: temporaryMessage })

const message1 = {
id: 123,
token: TOKEN,
actorId: 'actor-id-1',
actorType: ATTENDEE.ACTOR_TYPE.USERS,
referenceId: 'reference-1',
}

store.dispatch('processMessage', { token: TOKEN, message: message1 })
expect(store.getters.messagesList(TOKEN)).toStrictEqual([message1])
expect(updateLastReadMessage).toHaveBeenCalledWith(TOKEN, message1.id)
})

test('replaces existing message', () => {
const message1 = {
id: 1,
Expand Down

0 comments on commit 0d2ea65

Please sign in to comment.