commit: 3c38a7952652fd8d584473cd8ee85bd499b43275
parent 45470e3355ee7fc98ef3f380bb4a1bef0a060d6c
Author: tusooa <tusooa@kazv.moe>
Date: Wed, 11 Oct 2023 21:03:19 +0000
Merge branch 'quotes-hide-card' into 'develop'
Don't display link preview card if it's the same as quoted status
See merge request pleroma/pleroma-fe!1858
Diffstat:
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changelog.d/quote-hide.fix 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
@@ -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
@@ -43,7 +43,7 @@
/>
<div
- v-if="status.card && !noHeading && !compact"
+ v-if="statusCard && !noHeading && !compact"
class="link-preview media-body"
>
<link-preview