hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'quotes-hide-card' into shigusegubu-vue3

Browse source
This commit is contained in:
Henry Jameson 2023-10-11 22:47:38 +03:00
commit 9bb6ab6ca5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/status_content/status_content.js
View file

@ -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)

2
src/components/status_content/status_content.vue
View file

@ -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