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

Conversation.getProps: Allow for our own ACI to be missing

Browse source
This commit is contained in:
Scott Nonnenberg 2022-07-25 14:08:31 -07:00 • committed by GitHub
parent 1062126077
commit 78ad890a20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/models/conversations.ts
View file

@ -1755,7 +1755,7 @@ export class ConversationModel extends window.Backbone
const { customColor, customColorId } = this.getCustomColorData(); const { customColor, customColorId } = this.getCustomColorData();
const ourACI = window.textsecure.storage.user.getCheckedUuid(UUIDKind.ACI); const ourACI = window.textsecure.storage.user.getUuid(UUIDKind.ACI);
const ourPNI = window.textsecure.storage.user.getUuid(UUIDKind.PNI); const ourPNI = window.textsecure.storage.user.getUuid(UUIDKind.PNI);
// TODO: DESKTOP-720 // TODO: DESKTOP-720
@ -1775,12 +1775,13 @@ export class ConversationModel extends window.Backbone
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
activeAt: this.get('active_at')!, activeAt: this.get('active_at')!,
areWePending: areWePending:
this.isMemberPending(ourACI) || ourACI &&
Boolean( (this.isMemberPending(ourACI) ||
ourPNI && !this.isMember(ourACI) && this.isMemberPending(ourPNI) Boolean(
), ourPNI && !this.isMember(ourACI) && this.isMemberPending(ourPNI)
)),
areWePendingApproval: Boolean( areWePendingApproval: Boolean(
ourConversationId && this.isMemberAwaitingApproval(ourACI) ourConversationId && ourACI && this.isMemberAwaitingApproval(ourACI)
), ),
areWeAdmin: this.areWeAdmin(), areWeAdmin: this.areWeAdmin(),
avatars: getAvatarData(this.attributes), avatars: getAvatarData(this.attributes),