Add a local setting for inline preview cards

diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 0c82ea7c6cf2c664409dbe0d9a4fbe4ae79e986f..9ff53485e8fba9097f22195900c8b5f7a7f48076 100644 (file)
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -478,7 +478,7 @@ export default class Status extends ImmutablePureComponent {
       if (!status.get('sensitive') && !(status.get('spoiler_text').length > 0) && settings.getIn(['collapsed', 'backgrounds', 'preview_images'])) {
         background = attachments.getIn([0, 'preview_url']);
       }
-    } else if (status.get('card')) {
+    } else if (status.get('card') && settings.get('inline_preview_cards')) {
       media = (
         <Card
           onOpenMedia={this.props.onOpenMedia}

diff --git a/app/javascript/flavours/glitch/features/local_settings/page/index.js b/app/javascript/flavours/glitch/features/local_settings/page/index.js
index 4f1b8525f527a1ab2413b65b4b0c498369f7a1ba..6defdfbb667ea11d6d72711ccf41cb5d3edc1d02 100644 (file)
--- a/app/javascript/flavours/glitch/features/local_settings/page/index.js
+++ b/app/javascript/flavours/glitch/features/local_settings/page/index.js
@@ -304,6 +304,14 @@ export default class LocalSettingsPage extends React.PureComponent {
         >
           <FormattedMessage id='settings.media_fullwidth' defaultMessage='Full-width media previews' />
         </LocalSettingsPageItem>
+        <LocalSettingsPageItem
+          settings={settings}
+          item={['inline_preview_cards']}
+          id='mastodon-settings--inline-preview-cards'
+          onChange={onChange}
+        >
+          <FormattedMessage id='settings.inline_preview_cards' defaultMessage='Inline preview cards for external links' />
+        </LocalSettingsPageItem>
       </div>
     ),
   ];

diff --git a/app/javascript/flavours/glitch/reducers/local_settings.js b/app/javascript/flavours/glitch/reducers/local_settings.js
index 19233a963344badcbec1566e503e38e3fa40d729..bf42810e9202e9375b2c532d3d6b4e2ea8461479 100644 (file)
--- a/app/javascript/flavours/glitch/reducers/local_settings.js
+++ b/app/javascript/flavours/glitch/reducers/local_settings.js
@@ -15,6 +15,7 @@ const initialState = ImmutableMap({
   always_show_spoilers_field: false,
   confirm_missing_media_description: false,
   preselect_on_reply: true,
+  inline_preview_cards: true,
   content_warnings : ImmutableMap({
     auto_unfold : false,
     filter      : null,