From b7acde0910e78b2ce063a6437c2f043d8a10b441 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 23 Nov 2023 13:07:42 -0500 Subject: [PATCH] fix(message_persistence): set from in quoted message even when deleted (#4354) Needed for https://github.com/status-im/status-desktop/issues/12785 --- protocol/message_persistence.go | 1 + protocol/persistence_test.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/protocol/message_persistence.go b/protocol/message_persistence.go index 9a40c33ca..85d29c242 100644 --- a/protocol/message_persistence.go +++ b/protocol/message_persistence.go @@ -365,6 +365,7 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message if quotedDeleted.Bool || quotedDeletedForMe.Bool { message.QuotedMessage = &common.QuotedMessage{ ID: quotedID.String, + From: quotedFrom.String, Deleted: quotedDeleted.Bool, DeletedForMe: quotedDeletedForMe.Bool, } diff --git a/protocol/persistence_test.go b/protocol/persistence_test.go index 2e70b0c61..b98a69d8b 100644 --- a/protocol/persistence_test.go +++ b/protocol/persistence_test.go @@ -557,9 +557,9 @@ func TestMessageReplies(t *testing.T) { require.Equal(t, "", retrievedMessages[4].ResponseTo) require.Nil(t, retrievedMessages[4].QuotedMessage) - // We have a ResponseTo, but no QuotedMessage only gives the ID and Deleted + // We have a ResponseTo, but no QuotedMessage only gives the ID, From, and Deleted require.Equal(t, "id-4", retrievedMessages[0].ResponseTo) - require.Equal(t, &common.QuotedMessage{ID: "id-4", Deleted: true}, retrievedMessages[0].QuotedMessage) + require.Equal(t, &common.QuotedMessage{ID: "id-4", Deleted: true, From: "2"}, retrievedMessages[0].QuotedMessage) } func TestMessageByChatIDWithTheSameClocks(t *testing.T) {