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

getUnverified/getUntrusted: Return conversation array, not collection

Browse source
This commit is contained in:
Scott Nonnenberg 2022-08-12 12:43:24 -07:00 • committed by GitHub
parent 3991b06256
commit da28b4d6cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
ts/models/conversations.ts
View file

@ -8,7 +8,6 @@ import { v4 as generateGuid } from 'uuid';
import type {
ConversationAttributesType,
ConversationLastProfileType,
ConversationModelCollectionType,
LastMessageStatus,
MessageAttributesType,
QuotedMessageType,
@ -2783,19 +2782,17 @@ export class ConversationModel extends window.Backbone
});
}
getUnverified(): ConversationModelCollectionType {
getUnverified(): Array<ConversationModel> {
if (isDirectConversation(this.attributes)) {
return this.isUnverified()
? new window.Whisper.ConversationCollection([this])
: new window.Whisper.ConversationCollection();
return this.isUnverified() ? [this] : [];
}
return new window.Whisper.ConversationCollection(
return (
this.contactCollection?.filter(contact => {
if (isMe(contact.attributes)) {
return false;
}
return contact.isUnverified();
})
}) || []
);
}
@ -2844,22 +2841,21 @@ export class ConversationModel extends window.Backbone
});
}
getUntrusted(): ConversationModelCollectionType {
getUntrusted(): Array<ConversationModel> {
if (isDirectConversation(this.attributes)) {
if (this.isUntrusted()) {
return new window.Whisper.ConversationCollection([this]);
return [this];
}
return new window.Whisper.ConversationCollection();
return [];
}
return new window.Whisper.ConversationCollection(
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.contactCollection!.filter(contact => {
return (
this.contactCollection?.filter(contact => {
if (isMe(contact.attributes)) {
return false;
}
return contact.isUntrusted();
})
}) || []
);
}