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

Display proper text when quoting view once message

Browse source
This commit is contained in:
Fedor Indutny 2021-06-02 09:42:19 -07:00 • committed by GitHub
parent 81227066ce
commit b009967a83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 102 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ts/models/conversations.ts
View file

@ -41,7 +41,7 @@ import {
trimForDisplay,
verifyAccessKey,
} from '../Crypto';
import { GroupChangeClass } from '../textsecure.d';
import { GroupChangeClass, DataMessageClass } from '../textsecure.d';
import { BodyRangesType } from '../types/Util';
import { getTextWithMentions } from '../util';
import { migrateColor } from '../util/migrateColor';
@ -3130,7 +3130,7 @@ export class ConversationModel extends window.Backbone
async makeQuote(
quotedMessage: typeof window.Whisper.MessageType
): Promise<WhatIsThis> {
): Promise<DataMessageClass.Quote> {
const { getName } = Contact;
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const contact = quotedMessage.getContact()!;
@ -3150,6 +3150,7 @@ export class ConversationModel extends window.Backbone
bodyRanges: quotedMessage.get('bodyRanges'),
id: quotedMessage.get('sent_at'),
text: body || embeddedContactName,
isViewOnce: quotedMessage.isTapToView(),
attachments: quotedMessage.isTapToView()
? [{ contentType: 'image/jpeg', fileName: null }]
: await this.getQuoteAttachment(attachments, preview, sticker),