status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(QuotedMessage): pass Deleted to QuotedMessage 

This is to let the front end determine a new message if the quoted message is deleted instead of just unknown
This commit is contained in:
Jonathan Rainville 2023-01-11 16:09:40 -05:00
parent 7717f9519f
commit cb1d80c082
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.122.2 0.122.3

2
protocol/common/message.go
View File

@ -37,6 +37,8 @@ type QuotedMessage struct {
HasSticker bool `json:"sticker,omitempty"` HasSticker bool `json:"sticker,omitempty"`
// CommunityID is the id of the community advertised // CommunityID is the id of the community advertised
CommunityID string `json:"communityId,omitempty"` CommunityID string `json:"communityId,omitempty"`
Deleted bool `json:"deleted,omitempty"`
} }
type CommandState int type CommandState int

27
protocol/message_persistence.go
View File

@ -16,7 +16,7 @@ var basicMessagesSelectQuery = `
SELECT %s %s SELECT %s %s
FROM user_messages m1 FROM user_messages m1
LEFT JOIN user_messages m2 LEFT JOIN user_messages m2
ON m1.response_to = m2.id AND m2.deleted = 0 ON m1.response_to = m2.id
LEFT JOIN contacts c LEFT JOIN contacts c
ON m1.source = c.id ON m1.source = c.id
LEFT JOIN discord_messages dm LEFT JOIN discord_messages dm
@ -170,6 +170,7 @@ func (db sqlitePersistence) tableUserMessagesAllFieldsJoin() string {
m2.community_id, m2.community_id,
m2.id, m2.id,
m2.content_type, m2.content_type,
m2.deleted,
c.alias, c.alias,
c.identicon` c.identicon`
} }
@ -190,6 +191,7 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
var quotedFrom sql.NullString var quotedFrom sql.NullString
var quotedAudioDuration sql.NullInt64 var quotedAudioDuration sql.NullInt64
var quotedCommunityID sql.NullString var quotedCommunityID sql.NullString
var quotedDeleted sql.NullBool
var serializedMentions []byte var serializedMentions []byte
var serializedLinks []byte var serializedLinks []byte
var alias sql.NullString var alias sql.NullString
@ -289,6 +291,7 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
&quotedCommunityID, &quotedCommunityID,
&quotedID, &quotedID,
&ContentType, &ContentType,
&quotedDeleted,
&alias, &alias,
&identicon, &identicon,
} }
@ -318,13 +321,21 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
} }
if quotedText.Valid { if quotedText.Valid {
message.QuotedMessage = &common.QuotedMessage{ if quotedDeleted.Bool == true {
ID: quotedID.String, message.QuotedMessage = &common.QuotedMessage{
ContentType: ContentType.Int64, ID: quotedID.String,
From: quotedFrom.String, Deleted: quotedDeleted.Bool,
Text: quotedText.String, }
ParsedText: quotedParsedText, } else {
CommunityID: quotedCommunityID.String, message.QuotedMessage = &common.QuotedMessage{
ID: quotedID.String,
ContentType: ContentType.Int64,
From: quotedFrom.String,
Text: quotedText.String,
ParsedText: quotedParsedText,
CommunityID: quotedCommunityID.String,
Deleted: quotedDeleted.Bool,
}
} }
} }
message.Alias = alias.String message.Alias = alias.String

4
protocol/persistence_test.go
View File

@ -555,9 +555,9 @@ func TestMessageReplies(t *testing.T) {
require.Equal(t, "", retrievedMessages[4].ResponseTo) require.Equal(t, "", retrievedMessages[4].ResponseTo)
require.Nil(t, retrievedMessages[4].QuotedMessage) require.Nil(t, retrievedMessages[4].QuotedMessage)
// We have a ResponseTo, but no QuotedMessage, since the message was deleted // We have a ResponseTo, but no QuotedMessage only gives the ID and Deleted
require.Equal(t, "id-4", retrievedMessages[0].ResponseTo) require.Equal(t, "id-4", retrievedMessages[0].ResponseTo)
require.Nil(t, retrievedMessages[0].QuotedMessage) require.Equal(t, &common.QuotedMessage{ID: "id-4", Deleted: true}, retrievedMessages[0].QuotedMessage)
} }
func TestMessageByChatIDWithTheSameClocks(t *testing.T) { func TestMessageByChatIDWithTheSameClocks(t *testing.T) {