From 04c1ff56807ff3c71b6aa23858eb70943ec373d2 Mon Sep 17 00:00:00 2001
From: YoheiZuho <yuuman002@gmail.com>
Date: Sun, 16 May 2021 08:27:48 +0200
Subject: [PATCH] Revert "Fix quote on public stream"

This reverts commit 23738ca635e16a0f7a74b43a851ed40b01b078af.
---
 .../mastodon/containers/timeline_container.js |  4 +--
 .../status/components/detailed_status.js      |  2 +-
 .../containers/detailed_status_container.js   | 17 -------------
 app/javascript/packs/public.js                | 25 -------------------
 app/javascript/styles/mastodon/statuses.scss  |  4 ---
 5 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/app/javascript/mastodon/containers/timeline_container.js b/app/javascript/mastodon/containers/timeline_container.js
index 768169458..ed8095f90 100644
--- a/app/javascript/mastodon/containers/timeline_container.js
+++ b/app/javascript/mastodon/containers/timeline_container.js
@@ -47,9 +47,7 @@ export default class TimelineContainer extends React.PureComponent {
       <IntlProvider locale={locale} messages={messages}>
         <Provider store={store}>
           <Fragment>
-            <div className='standalone-timeline'>
-              {timeline}
-            </div>
+            {timeline}
 
             {ReactDOM.createPortal(
               <ModalContainer />,
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
index 35f09b90b..d97190698 100644
--- a/app/javascript/mastodon/features/status/components/detailed_status.js
+++ b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -197,7 +197,7 @@ class DetailedStatus extends ImmutablePureComponent {
       } else {
         quote = (
           <div className='quote-status' data-id={quote_status.get('id')} dataurl={quote_status.get('url')}>
-            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} className='detailed-status__display-name'>
+            <a href={quote_status.getIn(['account', 'url'])} onClick={this.handleAccountClick} data-id={quote_status.getIn(['account', 'id'])} data-group={quote_status.getIn(['account', 'group'])} className='detailed-status__display-name'>
               <div className='detailed-status__display-avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
               <DisplayName account={quote_status.get('account')} localDomain={this.props.domain} />
             </a>
diff --git a/app/javascript/mastodon/features/status/containers/detailed_status_container.js b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
index 8238f654d..bfed16620 100644
--- a/app/javascript/mastodon/features/status/containers/detailed_status_container.js
+++ b/app/javascript/mastodon/features/status/containers/detailed_status_container.js
@@ -20,8 +20,6 @@ import {
   deleteStatus,
   hideStatus,
   revealStatus,
-  hideQuote,
-  revealQuote,
 } from '../../../actions/statuses';
 import { initMuteModal } from '../../../actions/mutes';
 import { initBlockModal } from '../../../actions/blocks';
@@ -138,14 +136,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     dispatch(openModal('VIDEO', { media, options }));
   },
 
-  onOpenMediaQuote (media, index) {
-    dispatch(openModal('MEDIA', { media, index }));
-  },
-
-  onOpenVideoQuote (media, options) {
-    dispatch(openModal('VIDEO', { media, options }));
-  },
-
   onBlock (status) {
     const account = status.get('account');
     dispatch(initBlockModal(account));
@@ -175,13 +165,6 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
     }
   },
 
-  onQuoteToggleHidden (status) {
-    if (status.get('quote_hidden')) {
-      dispatch(revealQuote(status.get('id')));
-    } else {
-      dispatch(hideQuote(status.get('id')));
-    }
-  },
 });
 
 export default injectIntl(connect(makeMapStateToProps, mapDispatchToProps)(DetailedStatus));
diff --git a/app/javascript/packs/public.js b/app/javascript/packs/public.js
index 3a92d891a..8c5c15b8f 100644
--- a/app/javascript/packs/public.js
+++ b/app/javascript/packs/public.js
@@ -291,31 +291,6 @@ function main() {
       }
     });
   });
-
-  delegate(document, '.quote-status', 'click', ({ target }) => {
-    if (target.closest('.status__content__spoiler-link') ||
-      target.closest('.media-gallery') ||
-      target.closest('.video-player') ||
-      target.closest('.audio-player')) {
-      return false;
-    }
-
-    let url = target.closest('.quote-status').getAttribute('dataurl');
-    if (target.closest('.status__display-name')) {
-      url = target.closest('.status__display-name').getAttribute('href');
-    } else if (target.closest('.detailed-status__display-name')) {
-      url = target.closest('.detailed-status__display-name').getAttribute('href');
-    } else if (target.closest('.status-card')) {
-      url = target.closest('.status-card').getAttribute('href');
-    }
-
-    if (window.location.hostname === url.split('/')[2].split(':')[0]) {
-      window.location.href = url;
-    } else {
-      window.open(url, 'blank');
-    }
-    return false;
-  });
 }
 
 loadPolyfills()
diff --git a/app/javascript/styles/mastodon/statuses.scss b/app/javascript/styles/mastodon/statuses.scss
index 7e915dd6e..078714325 100644
--- a/app/javascript/styles/mastodon/statuses.scss
+++ b/app/javascript/styles/mastodon/statuses.scss
@@ -77,10 +77,6 @@
   }
 }
 
-.standalone-timeline .quote-status {
-  cursor: pointer;
-}
-
 .button.logo-button {
   flex: 0 auto;
   font-size: 14px;