mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

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

Browse source
This commit is contained in:
Scott Nonnenberg 2021-10-20 14:32:38 -07:00 • committed by GitHub
parent b32d068e83
commit fe49edce8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/groups.ts
View file

@ -2785,6 +2785,7 @@ async function updateGroup(
{ viaSync = false } = {} { viaSync = false } = {}
): Promise<void> { ): Promise<void> {
const { newAttributes, groupChangeMessages, members } = updates; const { newAttributes, groupChangeMessages, members } = updates;
const ourUuid = window.textsecure.storage.user.getCheckedUuid();
const startingRevision = conversation.get('revision'); const startingRevision = conversation.get('revision');
const endingRevision = newAttributes.revision; const endingRevision = newAttributes.revision;
@ -2792,7 +2793,8 @@ async function updateGroup(
const isInitialDataFetch = const isInitialDataFetch =
!isNumber(startingRevision) && isNumber(endingRevision); !isNumber(startingRevision) && isNumber(endingRevision);
const isInGroup = !updates.newAttributes.left; 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. // Ensure that all generated messages are ordered properly.
// Before the provided timestamp so update messages appear before the // Before the provided timestamp so update messages appear before the

1
ts/textsecure/WebAPI.ts
View file

@ -2211,6 +2211,7 @@ export function initialize({
timeout: 0, timeout: 0,
type: 'GET', type: 'GET',
version, version,
redactUrl: _createRedactor(key),
}); });
} }