updateGroup: Use hasMember instead of 'left' attribute for membership

Co-authored-by: Scott Nonnenberg <scott@signal.org>
signalapp · Oct 20, 2021 · a707c2b · a707c2b
1 parent a551170
commit a707c2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ts/groups.ts b/ts/groups.ts
@@ -2785,14 +2785,16 @@ async function updateGroup(
   { viaSync = false } = {}
 ): Promise<void> {
   const { newAttributes, groupChangeMessages, members } = updates;
+  const ourUuid = window.textsecure.storage.user.getCheckedUuid();
 
   const startingRevision = conversation.get('revision');
   const endingRevision = newAttributes.revision;
 
   const isInitialDataFetch =
     !isNumber(startingRevision) && isNumber(endingRevision);
   const isInGroup = !updates.newAttributes.left;
-  const justJoinedGroup = conversation.get('left') && isInGroup;
+  const justJoinedGroup =
+    !conversation.hasMember(ourUuid.toString()) && isInGroup;
 
   // Ensure that all generated messages are ordered properly.
   // Before the provided timestamp so update messages appear before the

diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
@@ -2211,6 +2211,7 @@ export function initialize({
         timeout: 0,
         type: 'GET',
         version,
+        redactUrl: _createRedactor(key),
       });
     }