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

Revert unviewed message count changes (#4101)

This commit is contained in:
Alexander 2023-10-12 14:27:56 +02:00 committed by GitHub
parent 5674a010cd
commit e17a247d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
protocol/chat.go
View File

@ -27,13 +27,6 @@ var chatColors = []string{
"#d37ef4", // purple
}
const (
// IncreaseUnviewedMessagesCountTimeoutMs
// this timeout indicates how long the time between received messages should be
// for a new message to increase the unviewed messages counter
IncreaseUnviewedMessagesCountTimeoutMs = 1000 * 60 * 2
)
type ChatType int
const (
@ -398,14 +391,6 @@ func (c *Chat) UpdateFromMessage(message *common.Message, timesource common.Time
return nil
}
func (c *Chat) ShouldIncreaseMessageCount(message *common.Message) bool {
return c.LastMessage == nil ||
c.LastMessage.IsSystemMessage() ||
!c.LastMessage.New ||
c.LastMessage.Seen ||
message.Timestamp > c.LastMessage.Timestamp+IncreaseUnviewedMessagesCountTimeoutMs
}
func (c *Chat) UpdateFirstMessageTimestamp(timestamp uint32) bool {
if timestamp == c.FirstMessageTimestamp {
return false

9
protocol/common/message.go
View File

@ -632,15 +632,6 @@ func (m *Message) PrepareContent(identity string) error {
return m.parseAudio()
}
func (m *Message) IsSystemMessage() bool {
return m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_CONTENT_PRIVATE_GROUP ||
m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_GAP ||
m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_PINNED_MESSAGE ||
m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_MUTUAL_EVENT_SENT ||
m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_MUTUAL_EVENT_ACCEPTED ||
m.ContentType == protobuf.ChatMessage_SYSTEM_MESSAGE_MUTUAL_EVENT_REMOVED
}
// GetSimplifiedText returns a the text stripped of all the markdown and with mentions
// replaced by canonical names
func (m *Message) GetSimplifiedText(identity string, canonicalNames map[string]string) (string, error) {

8
protocol/messenger_handler.go
View File

@ -3084,11 +3084,9 @@ func (m *Messenger) isMessageAllowedFrom(publicKey string, chat *Chat) (bool, er
}
func (m *Messenger) updateUnviewedCounts(chat *Chat, message *common.Message) {
if chat.ShouldIncreaseMessageCount(message) {
chat.UnviewedMessagesCount++
if message.Mentioned || message.Replied || chat.OneToOne() {
chat.UnviewedMentionsCount++
}
chat.UnviewedMessagesCount++
if message.Mentioned || message.Replied || chat.OneToOne() {
chat.UnviewedMentionsCount++
}
}