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
This commit is contained in:
commit
3c38a79526
1
changelog.d/quote-hide.fix
Normal file
1
changelog.d/quote-hide.fix
Normal file
@ -0,0 +1 @@
|
|||||||
|
don't display quoted status twice
|
@ -73,6 +73,10 @@ const StatusContent = {
|
|||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
|
...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
|
||||||
|
statusCard () {
|
||||||
|
if (!this.status.card) return null
|
||||||
|
return this.status.card.url === this.status.quote_url ? null : status.card
|
||||||
|
},
|
||||||
hideAttachments () {
|
hideAttachments () {
|
||||||
return (this.mergedConfig.hideAttachments && !this.inConversation) ||
|
return (this.mergedConfig.hideAttachments && !this.inConversation) ||
|
||||||
(this.mergedConfig.hideAttachmentsInConv && this.inConversation)
|
(this.mergedConfig.hideAttachmentsInConv && this.inConversation)
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
v-if="status.card && !noHeading && !compact"
|
v-if="statusCard && !noHeading && !compact"
|
||||||
class="link-preview media-body"
|
class="link-preview media-body"
|
||||||
>
|
>
|
||||||
<link-preview
|
<link-preview
|
||||||
|
Loading…
Reference in New Issue
Block a user