mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

getPropsForSearchResult: Harden to missing conversation

Browse source
This commit is contained in:
Scott Nonnenberg 2020-06-18 15:28:45 -07:00
parent 9f1304bca8
commit 6aedb30905
3 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/models/messages.js
View file

@ -199,13 +199,15 @@
fromContact.isMe = true;
}
const conversation = this.getConversation();
let to = this.findAndFormatContact(conversation.get('id'));
if (conversation.isMe()) {
const convo = this.getConversation();
let to = convo ? this.findAndFormatContact(convo.get('id')) : {};
if (convo && convo.isMe()) {
to.isMe = true;
} else if (
sourceE164 === conversation.get('e164') ||
sourceUuid === conversation.get('uuid')
(sourceE164 && convo && sourceE164 === convo.get('e164')) ||
(sourceUuid && convo && sourceUuid === convo.get('uuid'))
) {
to = {
isMe: true,
@ -213,7 +215,7 @@
}
return {
from: fromContact,
from: fromContact || {},
to,
isSelected: this.isSelected,