fix(message_persistence): set from in quoted message even when deleted (

#4354) Needed for status-im/status-desktop#12785
status-im · Nov 23, 2023 · b7acde0 · b7acde0
1 parent 5cd20de
commit b7acde0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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) {