From 21f72f8caf3f7601677f562bd12f44e9d1a8c2f6 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Wed, 27 Jan 2021 11:45:46 +1100
Subject: [PATCH] Make group updates more descriptive

---
 SessionMessagingKit/Threads/TSGroupModel.m | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/SessionMessagingKit/Threads/TSGroupModel.m b/SessionMessagingKit/Threads/TSGroupModel.m
index 6f5826b63..4323485ac 100644
--- a/SessionMessagingKit/Threads/TSGroupModel.m
+++ b/SessionMessagingKit/Threads/TSGroupModel.m
@@ -135,18 +135,22 @@ const int32_t kGroupIdLength = 16;
     }
     
     if (membersWhoJoined.count > 0) {
-        updatedGroupInfoString = @"New members joined";
+        NSArray *newMembersNames = [[membersWhoJoined allObjects] map:^NSString*(NSString* item) {
+            return [LKUserDisplayNameUtilities getPrivateChatDisplayNameAvoidWriteTransaction:item] ?: item;
+        }];
+        updatedGroupInfoString = [updatedGroupInfoString
+                                  stringByAppendingString:[NSString
+                                                           stringWithFormat:NSLocalizedString(@"GROUP_MEMBER_JOINED", @""),
+                                                           [newMembersNames componentsJoinedByString:@", "]]];
     }
     
     if (newModel.removedMembers.count > 0) {
-        NSString *masterDeviceHexEncodedPublicKey = [NSUserDefaults.standardUserDefaults stringForKey:@"masterDeviceHexEncodedPublicKey"];
-        NSString *hexEncodedPublicKey = masterDeviceHexEncodedPublicKey != nil ? masterDeviceHexEncodedPublicKey : TSAccountManager.localNumber;
-        if ([newModel.removedMembers containsObject:hexEncodedPublicKey]) {
+        if ([newModel.removedMembers containsObject:[SNGeneralUtilities getUserPublicKey]]) {
             updatedGroupInfoString = [updatedGroupInfoString
                                       stringByAppendingString:NSLocalizedString(@"YOU_WERE_REMOVED", @"")];
         } else {
             NSArray *removedMemberNames = [newModel.removedMembers.allObjects map:^NSString*(NSString* publicKey) {
-                return [LKUserDisplayNameUtilities getPrivateChatDisplayNameFor:publicKey];
+                return [LKUserDisplayNameUtilities getPrivateChatDisplayNameAvoidWriteTransaction:publicKey] ?: publicKey;
             }];
             if ([removedMemberNames count] > 1) {
                 updatedGroupInfoString = [updatedGroupInfoString