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(@desktop/chat): Fix referencing message nil pointer 

Fix #13812
This commit is contained in:
Michal Iskierko 2024-03-07 12:56:15 +01:00 committed by Jonathan Rainville
parent 473fdc9fbb
commit 33c3fcf582
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -439,6 +439,8 @@ method toggleReaction*(self: Module, messageId: string, emojiId: int) =
var emojiIdAsEnum: EmojiId var emojiIdAsEnum: EmojiId
if(message_reaction_item.toEmojiIdAsEnum(emojiId, emojiIdAsEnum)): if(message_reaction_item.toEmojiIdAsEnum(emojiId, emojiIdAsEnum)):
let item = self.view.model().getItemWithMessageId(messageId) let item = self.view.model().getItemWithMessageId(messageId)
if(item.isNil):
return
let myPublicKey = singletonInstance.userProfile.getPubKey() let myPublicKey = singletonInstance.userProfile.getPubKey()
if(item.shouldAddReaction(emojiIdAsEnum, myPublicKey)): if(item.shouldAddReaction(emojiIdAsEnum, myPublicKey)):
self.controller.addReaction(messageId, emojiId) self.controller.addReaction(messageId, emojiId)
@ -569,6 +571,8 @@ method onMessageRemoved*(self: Module, messageId, removedBy: string) =
if removedBy == "": if removedBy == "":
# removedBy is empty if it was removed by the sender # removedBy is empty if it was removed by the sender
let messageItem = self.view.model().getItemWithMessageId(messageId) let messageItem = self.view.model().getItemWithMessageId(messageId)
if(messageItem.isNil):
return
if messageItem.id == "": if messageItem.id == "":
return return
removedByValue = messageItem.senderId removedByValue = messageItem.senderId