diff options
| author | tusooa <tusooa@kazv.moe> | 2023-10-11 21:03:19 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2023-10-11 21:03:19 +0000 |
| commit | 3c38a7952652fd8d584473cd8ee85bd499b43275 (patch) | |
| tree | 620a5d1e71f8056f868739913a7c84b6bdb21b51 /src | |
| parent | 45470e3355ee7fc98ef3f380bb4a1bef0a060d6c (diff) | |
| parent | 765fdbe8ab695820efed0c11f7a869abd0f9ccd1 (diff) | |
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 (limited to 'src')
| -rw-r--r-- | src/components/status_content/status_content.js | 4 | ||||
| -rw-r--r-- | src/components/status_content/status_content.vue | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index 89f0aa51..c01b80af 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 c0e5c0b9..e977d489 100644 --- 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 |