jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getUnverified/getUntrusted: Return conversation array, not collection 

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2022-08-12 15:55:57 -07:00 committed by GitHub
parent ac23c905b3
commit da2cb87268
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ts/components/ForwardMessageModal.tsx
View File

@ -291,6 +291,7 @@ export const ForwardMessageModal: FunctionComponent<PropsType> = ({
onEscape={handleBackOrClose}
onClose={close}
overlayStyles={overlayStyles}
useFocusTrap={false}
>
<animated.div
className="module-ForwardMessageModal"

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();
})
}) || []
);
}

21
ts/views/conversation_view.tsx
View File

@ -18,7 +18,6 @@ import type { ConversationModel } from '../models/conversations';
import type {
GroupV2PendingMemberType,
MessageAttributesType,
ConversationModelCollectionType,
QuotedMessageType,
} from '../model-types.d';
import type { MediaItemType, MediaItemMessageType } from '../types/MediaItem';
@ -2322,9 +2321,9 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
async isCallSafe(): Promise<boolean> {
const contacts = await this.getUntrustedContacts();
if (contacts && contacts.length) {
if (contacts.length) {
const callAnyway = await this.showSendAnywayDialog(
contacts.models,
contacts,
window.i18n('callAnyway')
);
if (!callAnyway) {
@ -2366,8 +2365,8 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
try {
const contacts = await this.getUntrustedContacts(options);
if (contacts && contacts.length) {
const sendAnyway = await this.showSendAnywayDialog(contacts.models);
if (contacts.length) {
const sendAnyway = await this.showSendAnywayDialog(contacts);
if (sendAnyway) {
this.sendStickerMessage({ ...options, force: true });
}
@ -2388,7 +2387,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
async getUntrustedContacts(
options: { force?: boolean } = {}
): Promise<null | ConversationModelCollectionType> {
): Promise<Array<ConversationModel>> {
const { model }: { model: ConversationModel } = this;
// This will go to the trust store for the latest identity key information,
@ -2398,7 +2397,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
if (options.force) {
if (unverifiedContacts.length) {
await markAllAsVerifiedDefault(unverifiedContacts.models);
await markAllAsVerifiedDefault(unverifiedContacts);
// We only want force to break us through one layer of checks
// eslint-disable-next-line no-param-reassign
options.force = false;
@ -2411,13 +2410,13 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
if (options.force) {
if (untrustedContacts.length) {
await markAllAsApproved(untrustedContacts.models);
await markAllAsApproved(untrustedContacts);
}
} else if (untrustedContacts.length) {
return untrustedContacts;
}
return null;
return [];
}
async setQuoteMessage(messageId: null | string): Promise<void> {
@ -2560,8 +2559,8 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
this.disableMessageField();
const contacts = await this.getUntrustedContacts(options);
if (contacts && contacts.length) {
const sendAnyway = await this.showSendAnywayDialog(contacts.models);
if (contacts.length) {
const sendAnyway = await this.showSendAnywayDialog(contacts);
if (sendAnyway) {
this.sendMessage(message, mentions, { force: true, timestamp });
return;