about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/components
diff options
context:
space:
mode:
authorStarfall <us@starfall.systems>2022-11-12 10:09:41 -0600
committerStarfall <us@starfall.systems>2022-11-12 10:11:39 -0600
commitb07b6b9f339b604f9af150eb10ac1486eca8f189 (patch)
tree512943f7488b1fdb7d7c5d87cc039ea2f1886292 /app/javascript/flavours/glitch/components
parentb96b336a7871b5e88da8f308116e8f0ca7827132 (diff)
parent81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff)
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/javascript/flavours/glitch/components')
-rw-r--r--app/javascript/flavours/glitch/components/status.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js
index 366a98d82..800832dc8 100644
--- a/app/javascript/flavours/glitch/components/status.js
+++ b/app/javascript/flavours/glitch/components/status.js
@@ -687,7 +687,7 @@ 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') && settings.get('inline_preview_cards')) {
+    } else if (status.get('card') && settings.get('inline_preview_cards') && !this.props.muted) {
       media.push(
         <Card
           onOpenMedia={this.handleOpenMedia}