From 2701935abe537d157b44f0c5811d37d6564b3c30 Mon Sep 17 00:00:00 2001
From: KMY <tt@kmycode.net>
Date: Mon, 8 Apr 2024 08:07:08 +0900
Subject: [PATCH] =?UTF-8?q?Remove:=20=E6=8A=95=E7=A8=BF=E3=81=AE=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E4=B8=80=E8=A6=A7=E7=94=BB=E9=9D=A2=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/javascript/mastodon/components/status.jsx                | 5 +++--
 app/javascript/mastodon/features/status_references/index.jsx | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/javascript/mastodon/components/status.jsx b/app/javascript/mastodon/components/status.jsx
index 7c049353a25b6f..4cb76f208f2c89 100644
--- a/app/javascript/mastodon/components/status.jsx
+++ b/app/javascript/mastodon/components/status.jsx
@@ -130,6 +130,7 @@ class Status extends ImmutablePureComponent {
       available: PropTypes.bool,
     }),
     withoutEmojiReactions: PropTypes.bool,
+    withoutQuote: PropTypes.bool,
     ...WithOptionalRouterPropTypes,
   };
 
@@ -362,7 +363,7 @@ class Status extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, muted, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId } = this.props;
+    const { intl, hidden, featured, unread, muted, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, withoutQuote } = this.props;
 
     let { status, account, ...other } = this.props;
     
@@ -619,7 +620,7 @@ class Status extends ImmutablePureComponent {
     const withReference = (!withQuote && status.get('status_references_count') > 0) ? <span className='status__visibility-icon'><Icon id='link' icon={ReferenceIcon} title='Quiet quote' /></span> : null;
     const withExpiration = status.get('expires_at') ? <span className='status__visibility-icon'><Icon id='clock-o' icon={TimerIcon} title='Expiration' /></span> : null;
 
-    const quote = !muted && status.get('quote_id') && (['public', 'community'].includes(contextType) ? isShowItem('quote_in_public') : isShowItem('quote_in_home')) && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;
+    const quote = !muted && !withoutQuote && status.get('quote_id') && (['public', 'community'].includes(contextType) ? isShowItem('quote_in_public') : isShowItem('quote_in_home')) && <CompactedStatusContainer id={status.get('quote_id')} history={this.props.history} />;
 
     return (
       <HotKeys handlers={handlers}>
diff --git a/app/javascript/mastodon/features/status_references/index.jsx b/app/javascript/mastodon/features/status_references/index.jsx
index c36d6fadc422e3..e2cc86f4267b26 100644
--- a/app/javascript/mastodon/features/status_references/index.jsx
+++ b/app/javascript/mastodon/features/status_references/index.jsx
@@ -81,7 +81,7 @@ class StatusReferences extends ImmutablePureComponent {
           bindToDocument={!multiColumn}
         >
           {accountIds.map(id =>
-            <StatusContainer key={id} id={id} withNote={false} />,
+            <StatusContainer key={id} id={id} withNote={false} withoutQuote />,
           )}
         </ScrollableList>