status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-01-17 10:01:44 +00:00
Code Issues Projects Releases Wiki Activity

fix: make sure we only get a community when it's a community

Browse Source 
Part of #11996
This commit is contained in:
Jonathan Rainville 2023-08-29 14:21:37 -04:00
parent 3d6c05a7d1
commit 057b6c2c0f
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/modules/main/activity_center/module.nim
View File

@ -82,7 +82,9 @@ method hasUnseenActivityCenterNotificationsChanged*(self: Module) =
proc createMessageItemFromDto(self: Module, message: MessageDto, communityId: string): MessageItem = proc createMessageItemFromDto(self: Module, message: MessageDto, communityId: string): MessageItem =
let contactDetails = self.controller.getContactDetails(message.`from`) let contactDetails = self.controller.getContactDetails(message.`from`)
let communityChats = self.controller.getCommunityById(communityId).chats var communityChats: seq[ChatDto] = @[]
if communityId != singletonInstance.userProfile.getPubKey():
communityChats = self.controller.getCommunityById(communityId).chats
var quotedMessageAuthorDetails = ContactDetails() var quotedMessageAuthorDetails = ContactDetails()
if message.quotedMessage.`from` != "": if message.quotedMessage.`from` != "":

15
src/app/modules/main/chat_section/chat_content/messages/module.nim
View File

@ -245,7 +245,8 @@ method newMessagesLoaded*(self: Module, messages: seq[MessageDto], reactions: se
else: else:
quotedMessageAuthorDetails = self.controller.getContactDetails(message.quotedMessage.`from`) quotedMessageAuthorDetails = self.controller.getContactDetails(message.quotedMessage.`from`)
var communityChats: seq[ChatDto] var communityChats: seq[ChatDto] = @[]
if self.controller.belongsToCommunity():
communityChats = self.controller.getCommunityDetails().chats communityChats = self.controller.getCommunityDetails().chats
var renderedMessageText = self.controller.getRenderedText(message.parsedText, communityChats) var renderedMessageText = self.controller.getRenderedText(message.parsedText, communityChats)
@ -364,7 +365,9 @@ method messagesAdded*(self: Module, messages: seq[MessageDto]) =
for message in messages: for message in messages:
let sender = self.controller.getContactDetails(message.`from`) let sender = self.controller.getContactDetails(message.`from`)
let communityChats = self.controller.getCommunityDetails().chats var communityChats: seq[ChatDto] = @[]
if self.controller.belongsToCommunity():
communityChats = self.controller.getCommunityDetails().chats
var quotedMessageAuthorDetails = ContactDetails() var quotedMessageAuthorDetails = ContactDetails()
if message.quotedMessage.`from` != "": if message.quotedMessage.`from` != "":
if(message.`from` == message.quotedMessage.`from`): if(message.`from` == message.quotedMessage.`from`):
@ -593,7 +596,9 @@ method updateContactDetails*(self: Module, contactId: string) =
item.quotedMessageAuthorAvatar = updatedContact.icon item.quotedMessageAuthorAvatar = updatedContact.icon
if item.messageContainsMentions and item.mentionedUsersPks.anyIt(it == contactId): if item.messageContainsMentions and item.mentionedUsersPks.anyIt(it == contactId):
let communityChats = self.controller.getCommunityDetails().chats var communityChats: seq[ChatDto] = @[]
if self.controller.belongsToCommunity():
communityChats = self.controller.getCommunityDetails().chats
item.messageText = self.controller.getRenderedText(item.parsedText, communityChats) item.messageText = self.controller.getRenderedText(item.parsedText, communityChats)
method deleteMessage*(self: Module, messageId: string) = method deleteMessage*(self: Module, messageId: string) =
@ -611,7 +616,9 @@ method onMessageEdited*(self: Module, message: MessageDto) =
return return
let mentionedUsersPks = itemBeforeChange.mentionedUsersPks let mentionedUsersPks = itemBeforeChange.mentionedUsersPks
let communityChats = self.controller.getCommunityDetails().chats var communityChats: seq[ChatDto] = @[]
if self.controller.belongsToCommunity():
communityChats = self.controller.getCommunityDetails().chats
self.view.model().updateEditedMsg( self.view.model().updateEditedMsg(
message.id, message.id,

2
src/app/modules/main/profile_section/notifications/module.nim
View File

@ -141,8 +141,6 @@ method addChat*(self: Module, itemId: string) =
if(ind != -1): if(ind != -1):
return return
let chatDto = self.controller.getChatDetails(itemId) let chatDto = self.controller.getChatDetails(itemId)
if chatDto.chatType != ChatType.OneToOne and chatDto.chatType != ChatType.PrivateGroupChat:
return
self.addChat(chatDto) self.addChat(chatDto)
method setName*(self: Module, itemId: string, name: string) = method setName*(self: Module, itemId: string, name: string) =