logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 4c11ac9a27696a7fe57eeb486257d8f7c1295548
parent 3c38a7952652fd8d584473cd8ee85bd499b43275
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Fri, 13 Oct 2023 13:10:57 +0000

Merge branch 'quotes-hide-card' into 'develop'

oops

See merge request pleroma/pleroma-fe!1859

Diffstat:

Achangelog.d/quote-hide-oops.fix1+
Msrc/components/status_content/status_content.js2+-
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.d/quote-hide-oops.fix b/changelog.d/quote-hide-oops.fix @@ -0,0 +1 @@ +fix typo in code that prevented cards from showing at all diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js @@ -75,7 +75,7 @@ const StatusContent = { ...controlledOrUncontrolledGetters(['showingTall', 'expandingSubject', 'showingLongSubject']), statusCard () { 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 () { return (this.mergedConfig.hideAttachments && !this.inConversation) ||