Show quote properly when replying to 1:1 story reaction
This commit is contained in:
parent
9bbb262c8e
commit
83eccee42e
2 changed files with 14 additions and 11 deletions
|
@ -2030,6 +2030,18 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
return result;
|
||||
}
|
||||
|
||||
getQuoteBodyText(): string | undefined {
|
||||
const storyReactionEmoji = this.get('storyReaction')?.emoji;
|
||||
const body = this.get('body');
|
||||
const embeddedContact = this.get('contact');
|
||||
const embeddedContactName =
|
||||
embeddedContact && embeddedContact.length > 0
|
||||
? EmbeddedContact.getName(embeddedContact[0])
|
||||
: '';
|
||||
|
||||
return body || embeddedContactName || storyReactionEmoji;
|
||||
}
|
||||
|
||||
async copyQuoteContentFromOriginal(
|
||||
originalMessage: MessageModel,
|
||||
quote: QuotedMessageType
|
||||
|
@ -2078,7 +2090,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
|
|||
quote.isViewOnce = false;
|
||||
|
||||
// eslint-disable-next-line no-param-reassign
|
||||
quote.text = originalMessage.get('body');
|
||||
quote.text = originalMessage.getQuoteBodyText();
|
||||
if (firstAttachment) {
|
||||
firstAttachment.thumbnail = null;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue