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

Rename ContactType to EmbeddedContactType

Browse source
This commit is contained in:
Fedor Indutny 2021-08-19 18:56:39 -07:00 • committed by GitHub
parent 017a0fa807
commit fe040a2873
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ts/models/conversations.ts
View file

@ -90,7 +90,7 @@ const FIXMEU8 = Uint8Array;
window.Whisper = window.Whisper || {};
const { Services, Util } = window.Signal;
const { Contact, Message } = window.Signal.Types;
const { EmbeddedContact, Message } = window.Signal.Types;
const {
deleteAttachmentData,
doesAttachmentExist,
@ -3170,7 +3170,7 @@ export class ConversationModel extends window.Backbone
async makeQuote(
quotedMessage: typeof window.Whisper.MessageType
): Promise<QuotedMessageType> {
const { getName } = Contact;
const { getName } = EmbeddedContact;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const contact = quotedMessage.getContact()!;
const attachments = quotedMessage.get('attachments');

5
ts/models/messages.ts
View file

@ -129,7 +129,7 @@ const {
Message: TypedMessage,
Attachment,
MIME,
Contact,
EmbeddedContact,
Errors,
} = window.Signal.Types;
const {
@ -678,7 +678,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const contacts = this.get('contact');
if (contacts && contacts.length) {
return {
text: Contact.getName(contacts[0]) || window.i18n('unknownContact'),
text:
EmbeddedContact.getName(contacts[0]) || window.i18n('unknownContact'),
emoji: '👤',
};
}