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

fix(chat/api): don't count muted chats' unviewed count unless mentioned (#3619)

This commit is contained in:
Jonathan Rainville 2023-06-16 14:10:04 -04:00 committed by GitHub
parent 9e7f1338f0
commit a46bf97bf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/chat/api.go
View File

@ -149,7 +149,9 @@ func (api *API) getChannelGroups(ctx context.Context, channelGroupID string) (ma
if !chat.IsActivePersonalChat() { if !chat.IsActivePersonalChat() {
continue continue
} }
if !chat.Muted || chat.UnviewedMentionsCount > 0 {
totalUnviewedMessageCount += int(chat.UnviewedMessagesCount) totalUnviewedMessageCount += int(chat.UnviewedMessagesCount)
}
totalUnviewedMentionsCount += int(chat.UnviewedMentionsCount) totalUnviewedMentionsCount += int(chat.UnviewedMentionsCount)
c, err := api.toAPIChat(chat, nil, pubKey, true) c, err := api.toAPIChat(chat, nil, pubKey, true)
@ -197,8 +199,9 @@ func (api *API) getChannelGroups(ctx context.Context, channelGroupID string) (ma
if chat.CommunityID != community.IDString() || !chat.Active { if chat.CommunityID != community.IDString() || !chat.Active {
continue continue
} }
if !chat.Muted || chat.UnviewedMentionsCount > 0 {
totalUnviewedMessageCount += int(chat.UnviewedMessagesCount) totalUnviewedMessageCount += int(chat.UnviewedMessagesCount)
}
totalUnviewedMentionsCount += int(chat.UnviewedMentionsCount) totalUnviewedMentionsCount += int(chat.UnviewedMentionsCount)
} }