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

fix(chat): dont notify or show badge on muted channels 

Fixes #6184 and fixes #8370
This commit is contained in:
Jonathan Rainville 2022-11-24 11:57:49 -05:00 committed by Iuri Matias
parent f934eeebb3
commit 10684c22a0
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/modules/main/chat_section/module.nim
View File

@ -129,8 +129,9 @@ proc buildChatSectionUI(
for chatDto in channelGroup.chats: for chatDto in channelGroup.chats:
if (chatDto.categoryId != ""): if (chatDto.categoryId != ""):
continue continue
let hasNotification = chatDto.unviewedMessagesCount > 0 or chatDto.unviewedMentionsCount > 0
let notificationsCount = chatDto.unviewedMentionsCount let hasNotification = not chatDto.muted and (chatDto.unviewedMessagesCount > 0 or chatDto.unviewedMentionsCount > 0)
let notificationsCount = if (chatDto.muted): 0 else: chatDto.unviewedMentionsCount
var chatName = chatDto.name var chatName = chatDto.name
var chatImage = "" var chatImage = ""
@ -703,9 +704,17 @@ method onContactDetailsUpdated*(self: Module, publicKey: string) =
self.view.chatsModel().updateItemDetails(publicKey, chatName, chatImage, trustStatus) self.view.chatsModel().updateItemDetails(publicKey, chatName, chatImage, trustStatus)
method onNewMessagesReceived*(self: Module, sectionIdMsgBelongsTo: string, chatIdMsgBelongsTo: string, method onNewMessagesReceived*(self: Module, sectionIdMsgBelongsTo: string, chatIdMsgBelongsTo: string,
chatTypeMsgBelongsTo: ChatType, lastMessageTimestamp: int, unviewedMessagesCount: int, unviewedMentionsCount: int, message: MessageDto) = chatTypeMsgBelongsTo: ChatType, lastMessageTimestamp: int, unviewedMessagesCount: int, unviewedMentionsCount: int,
message: MessageDto) =
self.updateLastMessageTimestamp(chatIdMsgBelongsTo, lastMessageTimestamp) self.updateLastMessageTimestamp(chatIdMsgBelongsTo, lastMessageTimestamp)
let chatDetails = self.controller.getChatDetails(chatIdMsgBelongsTo)
if (chatDetails.muted):
# No need to update the badge nor send a notification
return
# Badge notification
let messageBelongsToActiveSection = sectionIdMsgBelongsTo == self.controller.getMySectionId() and let messageBelongsToActiveSection = sectionIdMsgBelongsTo == self.controller.getMySectionId() and
self.controller.getMySectionId() == self.delegate.getActiveSectionId() self.controller.getMySectionId() == self.delegate.getActiveSectionId()
let messageBelongsToActiveChat = self.controller.getActiveChatId() == chatIdMsgBelongsTo let messageBelongsToActiveChat = self.controller.getActiveChatId() == chatIdMsgBelongsTo
@ -723,7 +732,6 @@ method onNewMessagesReceived*(self: Module, sectionIdMsgBelongsTo: string, chatI
let contactDetails = self.controller.getContactDetails(message.`from`) let contactDetails = self.controller.getContactDetails(message.`from`)
let renderedMessageText = self.controller.getRenderedText(message.parsedText) let renderedMessageText = self.controller.getRenderedText(message.parsedText)
let plainText = singletonInstance.utils.plainText(renderedMessageText) let plainText = singletonInstance.utils.plainText(renderedMessageText)
let chatDetails = self.controller.getChatDetails(chatIdMsgBelongsTo)
var notificationTitle = contactDetails.defaultDisplayName var notificationTitle = contactDetails.defaultDisplayName
case chatDetails.chatType: case chatDetails.chatType:
@ -743,8 +751,8 @@ method onNewMessagesReceived*(self: Module, sectionIdMsgBelongsTo: string, chatI
singletonInstance.globalEvents.showMessageNotification(notificationTitle, plainText, sectionIdMsgBelongsTo, singletonInstance.globalEvents.showMessageNotification(notificationTitle, plainText, sectionIdMsgBelongsTo,
self.controller.isCommunity(), messageBelongsToActiveSection, chatIdMsgBelongsTo, messageBelongsToActiveChat, self.controller.isCommunity(), messageBelongsToActiveSection, chatIdMsgBelongsTo, messageBelongsToActiveChat,
message.id, notificationType.int, message.id, notificationType.int, chatTypeMsgBelongsTo == ChatType.OneToOne,
chatTypeMsgBelongsTo == ChatType.OneToOne, chatTypeMsgBelongsTo == ChatType.PrivateGroupChat) chatTypeMsgBelongsTo == ChatType.PrivateGroupChat)
method onMeMentionedInEditedMessage*(self: Module, chatId: string, editedMessage : MessageDto) = method onMeMentionedInEditedMessage*(self: Module, chatId: string, editedMessage : MessageDto) =
if((editedMessage.communityId.len == 0 and if((editedMessage.communityId.len == 0 and