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

Fix a UUID variable holding an E164

Browse source
This commit is contained in:
Evan Hahn 2020-09-28 18:25:18 -05:00 committed by Josh Perez
parent 333dc17c0a
commit bf647b36d4
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ts/textsecure/SendMessage.ts
View file

@ -1591,7 +1591,7 @@ export default class MessageSender {
}
const myE164 = window.textsecure.storage.user.getNumber();
const myUuid = window.textsecure.storage.user.getNumber();
const myUuid = window.textsecure.storage.user.getUuid();
// prettier-ignore
const recipients = groupV2
? groupV2.members
@ -1599,8 +1599,16 @@ export default class MessageSender {
? groupV1.members
: [];
// We should always have a UUID but have this check just in case we don't.
let isNotMe: (recipient: string) => boolean;
if (myUuid) {
isNotMe = r => r !== myE164 && r !== myUuid;
} else {
isNotMe = r => r !== myE164;
}
const attrs = {
recipients: recipients.filter(r => r !== myE164 && r !== myUuid),
recipients: recipients.filter(isNotMe),
body: messageText,
timestamp,
attachments,