From 8b8fe66615889cb9b6bf9ec383699fde67c8516e Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 27 Jan 2021 18:08:37 +1100
Subject: [PATCH] update profile of users when getting profile from opengroup
 message

---
 ts/receiver/queuedJob.ts |  2 --
 ts/receiver/receiver.ts  | 12 +++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index 39d2ece42..1a95dbd5f 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -527,9 +527,7 @@ export async function handleMessageJob(
         ourNumber
       );
     }
-
     const { Whisper, getMessageController } = window;
-
     const id = await message.commit();
     message.set({ id });
     getMessageController().register(message.id, message);
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 42ec85f0a..8c9e3ace9 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -270,12 +270,11 @@ async function handleDecryptedEnvelope(
   }
 }
 
-export async function handlePublicMessage({ message: outerMessage }: any) {
-  const { source } = outerMessage;
-  const { group, profile, profileKey } = outerMessage.message;
+export async function handlePublicMessage(messageData: any) {
+  const { source } = messageData;
+  const { group, profile, profileKey } = messageData.message;
 
-  const ourNumber = window.textsecure.storage.user.getNumber();
-  const isMe = source === ourNumber;
+  const isMe = await UserUtils.isUs(source);
 
   if (!isMe && profile) {
     const conversation = await ConversationController.getInstance().getOrCreateAndWait(
@@ -285,7 +284,6 @@ export async function handlePublicMessage({ message: outerMessage }: any) {
     await updateProfile(conversation, profile, profileKey);
   }
 
-  const isOurDevice = await UserUtils.isUs(source);
   const isPublicChatMessage =
     group && group.id && !!group.id.match(/^publicChat:/);
 
@@ -297,7 +295,7 @@ export async function handlePublicMessage({ message: outerMessage }: any) {
 
   const ev = {
     // Public chat messages from ourselves should be outgoing
-    type: isOurDevice ? 'sent' : 'message',
+    type: isMe ? 'sent' : 'message',
     data: messageData,
     confirm: () => {
       /* do nothing */