From ffac571dd8d4709b527d00bfb6425386d18a329a Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 27 Sep 2022 16:07:00 -0700
Subject: [PATCH] systemGivenName/systemFamilyName in ContactPill

---
 protos/SignalStorage.proto                           |  2 ++
 ts/components/StoriesSettingsModal.tsx               |  2 +-
 .../AddGroupMembersModal/ChooseGroupMembersModal.tsx |  2 +-
 .../leftPane/LeftPaneChooseGroupMembersHelper.tsx    |  2 +-
 ts/model-types.d.ts                                  |  2 ++
 ts/models/conversations.ts                           |  3 +++
 ts/services/storageRecordOps.ts                      | 12 ++++++++++++
 ts/state/ducks/conversations.ts                      |  2 ++
 8 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/protos/SignalStorage.proto b/protos/SignalStorage.proto
index 4e5cc6954..43cf7370f 100644
--- a/protos/SignalStorage.proto
+++ b/protos/SignalStorage.proto
@@ -87,6 +87,8 @@ message ContactRecord {
   optional uint64 mutedUntilTimestamp = 13;
   optional bool hideStory = 14;
   optional uint64 unregisteredAtTimestamp = 16;
+  optional string systemGivenName = 17;
+  optional string systemFamilyName = 18;
 }
 
 message GroupV1Record {
diff --git a/ts/components/StoriesSettingsModal.tsx b/ts/components/StoriesSettingsModal.tsx
index b1957a28e..fd0251ea7 100644
--- a/ts/components/StoriesSettingsModal.tsx
+++ b/ts/components/StoriesSettingsModal.tsx
@@ -819,7 +819,7 @@ export const EditDistributionList = ({
                 acceptedMessageRequest={contact.acceptedMessageRequest}
                 avatarPath={contact.avatarPath}
                 color={contact.color}
-                firstName={contact.firstName}
+                firstName={contact.systemGivenName ?? contact.firstName}
                 i18n={i18n}
                 id={contact.id}
                 isMe={contact.isMe}
diff --git a/ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx b/ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
index 98a18e049..c3943f21c 100644
--- a/ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
+++ b/ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
@@ -307,7 +307,7 @@ export const ChooseGroupMembersModal: FunctionComponent<PropsType> = ({
                 acceptedMessageRequest={contact.acceptedMessageRequest}
                 avatarPath={contact.avatarPath}
                 color={contact.color}
-                firstName={contact.firstName}
+                firstName={contact.systemGivenName ?? contact.firstName}
                 i18n={i18n}
                 isMe={contact.isMe}
                 id={contact.id}
diff --git a/ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx b/ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx
index e6611d0e4..8987be8d0 100644
--- a/ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx
+++ b/ts/components/leftPane/LeftPaneChooseGroupMembersHelper.tsx
@@ -219,7 +219,7 @@ export class LeftPaneChooseGroupMembersHelper extends LeftPaneHelper<LeftPaneCho
                 acceptedMessageRequest={contact.acceptedMessageRequest}
                 avatarPath={contact.avatarPath}
                 color={contact.color}
-                firstName={contact.firstName}
+                firstName={contact.systemGivenName ?? contact.firstName}
                 i18n={i18n}
                 id={contact.id}
                 isMe={contact.isMe}
diff --git a/ts/model-types.d.ts b/ts/model-types.d.ts
index 083ef92d6..7deb4fff9 100644
--- a/ts/model-types.d.ts
+++ b/ts/model-types.d.ts
@@ -314,6 +314,8 @@ export type ConversationAttributesType = {
   isArchived?: boolean;
   lastMessage?: string | null;
   name?: string;
+  systemGivenName?: string;
+  systemFamilyName?: string;
   needsStorageServiceSync?: boolean;
   needsVerification?: boolean;
   profileSharing?: boolean;
diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 70ec7c75a..36f64c323 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -1904,6 +1904,8 @@ export class ConversationModel extends window.Backbone
       muteExpiresAt: this.get('muteExpiresAt'),
       dontNotifyForMentionsIfMuted: this.get('dontNotifyForMentionsIfMuted'),
       name: this.get('name'),
+      systemGivenName: this.get('systemGivenName'),
+      systemFamilyName: this.get('systemFamilyName'),
       phoneNumber: this.getNumber(),
       profileName: this.getProfileName(),
       profileSharing: this.get('profileSharing'),
@@ -4971,6 +4973,7 @@ export class ConversationModel extends window.Backbone
       const username = this.get('username');
 
       return (
+        (isShort ? this.get('systemGivenName') : undefined) ||
         this.get('name') ||
         (isShort ? this.get('profileName') : undefined) ||
         this.getProfileName() ||
diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts
index ae524cd66..358603e19 100644
--- a/ts/services/storageRecordOps.ts
+++ b/ts/services/storageRecordOps.ts
@@ -165,6 +165,14 @@ export async function toContactRecord(
   if (profileFamilyName) {
     contactRecord.familyName = profileFamilyName;
   }
+  const systemGivenName = conversation.get('systemGivenName');
+  if (systemGivenName) {
+    contactRecord.systemGivenName = systemGivenName;
+  }
+  const systemFamilyName = conversation.get('systemFamilyName');
+  if (systemFamilyName) {
+    contactRecord.systemFamilyName = systemFamilyName;
+  }
   contactRecord.blocked = conversation.isBlocked();
   contactRecord.whitelisted = Boolean(conversation.get('profileSharing'));
   contactRecord.archived = Boolean(conversation.get('isArchived'));
@@ -934,6 +942,10 @@ export async function mergeContactRecord(
       details.push('updated profile name');
     }
   }
+  conversation.set({
+    systemGivenName: dropNull(contactRecord.systemGivenName),
+    systemFamilyName: dropNull(contactRecord.systemFamilyName),
+  });
 
   if (contactRecord.identityKey) {
     const verified = await conversation.safeGetVerified();
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index d493f6087..f5c1855d9 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -114,6 +114,8 @@ export type ConversationType = {
   pni?: UUIDStringType;
   e164?: string;
   name?: string;
+  systemGivenName?: string;
+  systemFamilyName?: string;
   familyName?: string;
   firstName?: string;
   profileName?: string;