diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 14:33:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-12 14:33:14 +0100 |
| commit | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (patch) | |
| tree | 5cdf443e718788f8473148ce4d4205da54efbf04 /app/javascript/flavours/glitch/components | |
| parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
| parent | a808ac1fd8d4a42ee930bbb30cb6b58c810f828b (diff) | |
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/components')
| -rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 2 |
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} |