Revert "Include preview cards in status entity in REST API (mastodon#…

…9120)"

app/controllers/application_controller.rb

@@ -126,7 +126,6 @@ def cache_collection(raw, klass)
  def respond_with_error(code)
  respond_to do |format|
  format.any { head code }
-
  format.html do
  set_locale
  render "errors/#{code}", layout: 'error', status: code

app/javascript/mastodon/components/status.js

@@ -9,7 +9,6 @@ import DisplayName from './display_name';
 import StatusContent from './status_content';
 import StatusActionBar from './status_action_bar';
 import AttachmentList from './attachment_list';
-import Card from '../features/status/components/card';
 import { injectIntl, FormattedMessage } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import { MediaGallery, Video } from '../features/ui/util/async-components';
@@ -258,14 +257,6 @@ class Status extends ImmutablePureComponent {
  </Bundle>
  );
  }
- } else if (status.get('spoiler_text').length === 0 && status.get('card')) {
- media = (
- <Card
- onOpenMedia={this.props.onOpenMedia}
- card={status.get('card')}
- compact
- />
- );
  }
 
  if (otherAccounts) {

app/javascript/mastodon/features/status/components/card.js

@@ -64,7 +64,6 @@ export default class Card extends React.PureComponent {
 
  static defaultProps = {
  maxDescription: 50,
- compact: false,
  };
 
  state = {
@@ -133,25 +132,25 @@ export default class Card extends React.PureComponent {
  }
 
  render () {
- const { card, maxDescription, compact } = this.props;
- const { width, embedded } = this.state;
+ const { card, maxDescription } = this.props;
+ const { width, embedded }  = this.state;
 
  if (card === null) {
  return null;
  }
 
  const provider = card.get('provider_name').length === 0 ? decodeIDNA(getHostname(card.get('url'))) : card.get('provider_name');
- const horizontal = (!compact && card.get('width') > card.get('height') && (card.get('width') + 100 >= width)) || card.get('type') !== 'link' || embedded;
+ const horizontal = card.get('width') > card.get('height') && (card.get('width') + 100 >= width) || card.get('type') !== 'link';
+ const className = classnames('status-card', { horizontal });
  const interactive = card.get('type') !== 'link';
- const className = classnames('status-card', { horizontal, compact, interactive });
  const title = interactive ? <a className='status-card__title' href={card.get('url')} title={card.get('title')} rel='noopener' target='_blank'><strong>{card.get('title')}</strong></a> : <strong className='status-card__title' title={card.get('title')}>{card.get('title')}</strong>;
  const ratio = card.get('width') / card.get('height');
  const height = (compact && !embedded) ? (width / (16 / 9)) : (width / ratio);
 
  const description = (
  <div className='status-card__content'>
  {title}
- {!(horizontal || compact) && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
+ {!horizontal && <p className='status-card__description'>{trim(card.get('description') || '', maxDescription)}</p>}
  <span className='status-card__host'>{provider}</span>
  </div>
  );
@@ -176,7 +175,7 @@ export default class Card extends React.PureComponent {
  <div className='status-card__actions'>
  <div>
  <button onClick={this.handleEmbedClick}><i className={`fa fa-${iconVariant}`} /></button>
- {horizontal && <a href={card.get('url')} target='_blank' rel='noopener'><i className='fa fa-external-link' /></a>}
+ <a href={card.get('url')} target='_blank' rel='noopener'><i className='fa fa-external-link' /></a>
  </div>
  </div>
  </div>
@@ -186,7 +185,7 @@ export default class Card extends React.PureComponent {
  return (
  <div className={className} ref={this.setRef}>
  {embed}
- {!compact && description}
+ {description}
  </div>
  );
  } else if (card.get('image')) {

app/javascript/mastodon/features/status/containers/card_container.js

@@ -0,0 +1,8 @@
+import { connect } from 'react-redux';
+import Card from '../components/card';
+
+const mapStateToProps = (state, { statusId }) => ({
+ card: state.getIn(['cards', statusId], null),
+});
+
+export default connect(mapStateToProps)(Card);

app/javascript/mastodon/reducers/index.js

@@ -14,6 +14,7 @@ import relationships from './relationships';
 import settings from './settings';
 import push_notifications from './push_notifications';
 import status_lists from './status_lists';
+import cards from './cards';
 import mutes from './mutes';
 import reports from './reports';
 import contexts from './contexts';
@@ -45,6 +46,7 @@ const reducers = {
  relationships,
  settings,
  push_notifications,
+ cards,
  mutes,
  reports,
  contexts,

app/javascript/styles/mastodon/components.scss

@@ -2562,9 +2562,6 @@ a.status-card {
  display: block;
  margin-top: 5px;
  font-size: 13px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
 }
 
 .status-card__image {
@@ -2589,31 +2586,6 @@ a.status-card {
  }
 }
 
-.status-card.compact {
- border-color: lighten($ui-base-color, 4%);
-
- &.interactive {
- border: 0;
- }
-
- .status-card__content {
- padding: 8px;
- padding-top: 10px;
- }
-
- .status-card__title {
- white-space: nowrap;
- }
-
- .status-card__image {
- flex: 0 0 60px;
- }
-}
-
-a.status-card.compact:hover {
- background-color: lighten($ui-base-color, 4%);
-}
-
 .status-card__image-image {
  border-radius: 4px 0 0 4px;
  display: block;

app/models/status.rb

@@ -90,15 +90,13 @@ class Status < ApplicationRecord
  :conversation,
  :status_stat,
  :tags,
- :preview_cards,
  :stream_entry,
  active_mentions: :account,
  reblog: [
  :account,
  :application,
  :stream_entry,
  :tags,
- :preview_cards,
  :media_attachments,
  :conversation,
  :status_stat,
@@ -166,10 +164,6 @@ def target
  reblog
  end
 
- def preview_card
- preview_cards.first
- end
-
  def title
  if destroyed?
  "#{account.acct} deleted status"

app/serializers/rest/status_serializer.rb

@@ -20,8 +20,6 @@ class REST::StatusSerializer < ActiveModel::Serializer
  has_many :tags
  has_many :emojis, serializer: REST::CustomEmojiSerializer
 
- has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
-
  def id
  object.id.to_s
  end

app/services/fetch_link_card_service.rb

@@ -62,7 +62,6 @@ def process_url
 
  def attach_card
  @status.preview_cards << @card
- Rails.cache.delete(@status)
  end
 
  def parse_urls