From 325331550cdaddc325b6dcef4821e818276a3700 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 2 Nov 2020 16:50:54 +1100 Subject: [PATCH] fix group update message for medium group 'You' left or kicked --- js/models/messages.js | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/js/models/messages.js b/js/models/messages.js index 78cfd0bfa..8af9b0e21 100644 --- a/js/models/messages.js +++ b/js/models/messages.js @@ -462,15 +462,26 @@ isMe: true, }); } else if (groupUpdate.left) { - changes.push({ - type: 'remove', - contacts: _.map( - Array.isArray(groupUpdate.left) - ? groupUpdate.left - : [groupUpdate.left], - phoneNumber => this.findAndFormatContact(phoneNumber) - ), - }); + if ( + Array.isArray(groupUpdate.left) && + groupUpdate.left.length === 1 && + groupUpdate.left[0] === textsecure.storage.user.getNumber() + ) { + changes.push({ + type: 'remove', + isMe: true, + }); + } else { + changes.push({ + type: 'remove', + contacts: _.map( + Array.isArray(groupUpdate.left) + ? groupUpdate.left + : [groupUpdate.left], + phoneNumber => this.findAndFormatContact(phoneNumber) + ), + }); + } } if (groupUpdate.name) {