From dd1e31c986b0142fda3ff35a9289bf639736055c Mon Sep 17 00:00:00 2001 From: sneakers-the-rat Date: Sun, 30 Jun 2024 01:30:43 -0700 Subject: [PATCH] minor merge bugs - working version --- .../flavours/glitch/components/status_action_bar.jsx | 2 +- app/javascript/flavours/glitch/features/status/index.jsx | 4 ++-- app/models/status.rb | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx index 0341a011785cc9..a889ba41effbc9 100644 --- a/app/javascript/flavours/glitch/components/status_action_bar.jsx +++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx @@ -144,7 +144,7 @@ class StatusActionBar extends ImmutablePureComponent { }; handleQuoteClick = () => { - const { signedIn } = this.context.identity; + const { signedIn } = this.props.identity; if (signedIn) { this.props.onQuote(this.props.status, this.context.router.history); diff --git a/app/javascript/flavours/glitch/features/status/index.jsx b/app/javascript/flavours/glitch/features/status/index.jsx index b328ff0be1a872..ab5b696e7d9468 100644 --- a/app/javascript/flavours/glitch/features/status/index.jsx +++ b/app/javascript/flavours/glitch/features/status/index.jsx @@ -344,11 +344,11 @@ class Status extends ImmutablePureComponent { }; handleQuoteClick = (status) => { - const { signedIn } = this.context.identity; + const { signedIn } = this.props.identity; const { dispatch } = this.props; if (signedIn) { - dispatch(quoteCompose(status, this.context.router.history)); + dispatch(quoteCompose(status, this.props.history)); } else { dispatch(openModal('INTERACTION', { type: 'reply', diff --git a/app/models/status.rb b/app/models/status.rb index a3d73e230a747d..781b96d9cb594b 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -186,7 +186,6 @@ class Status < ApplicationRecord quote: [ :application, :tags, - :preview_cards, :media_attachments, :conversation, :status_stat,