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

Merge remote-tracking branch 'origin/develop' into shigusegubu-vue3

Browse source
This commit is contained in:
Henry Jameson 2023-10-15 13:25:36 +03:00
commit 5c86c35247
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/quote-hide-oops.fix Normal file
View file

@ -0,0 +1 @@
fix typo in code that prevented cards from showing at all

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

@ -75,7 +75,7 @@ const StatusContent = {
...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']), ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']),
statusCard () { statusCard () {
if (!this.status.card) return null if (!this.status.card) return null
return this.status.card.url === this.status.quote_url ? null : status.card return this.status.card.url === this.status.quote_url ? null : this.status.card
}, },
hideAttachments () { hideAttachments () {
return (this.mergedConfig.hideAttachments && !this.inConversation) || return (this.mergedConfig.hideAttachments && !this.inConversation) ||