diff --git a/changelog.d/quote-hide.fix b/changelog.d/quote-hide.fix new file mode 100644 index 0000000000..678fc3bc65 --- /dev/null +++ b/changelog.d/quote-hide.fix @@ -0,0 +1 @@ +don't display quoted status twice diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index 89f0aa517d..c01b80af8a 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -73,6 +73,10 @@ const StatusContent = { }, computed: { ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']), + statusCard () { + if (!this.status.card) return null + return this.status.card.url === this.status.quote_url ? null : status.card + }, hideAttachments () { return (this.mergedConfig.hideAttachments && !this.inConversation) || (this.mergedConfig.hideAttachmentsInConv && this.inConversation) diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index c0e5c0b9de..e977d489e1 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -43,7 +43,7 @@ />