diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-07-19 18:00:14 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-07-19 19:21:20 +0200 |
commit | 249b7c7c1298d2ac4da68a5806043d6424cf3ac0 (patch) | |
tree | e2fdcb6bceaa8a69089be05626326d1c0cfb45d5 /app | |
parent | f170e0492fbae383ffbe64c559b746aa6e8c77cd (diff) |
Fix filtering behaviors
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index e94ce6dfe..7c08ae4e8 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -476,7 +476,7 @@ class Status extends ImmutablePureComponent { featured, ...other } = this.props; - const { isExpanded, isCollapsed } = this.state; + const { isExpanded, isCollapsed, forceFilter } = this.state; let background = null; let attachments = null; let media = null; @@ -496,7 +496,8 @@ class Status extends ImmutablePureComponent { ); } - if ((status.get('filtered') || status.getIn(['reblog', 'filtered'])) && (this.state.forceFilter === true || settings.get('filtering_behavior') !== 'content_warning')) { + const filtered = (status.get('filtered') || status.getIn(['reblog', 'filtered'])) && settings.get('filtering_behavior') !== 'content_warning'; + if (forceFilter === undefined ? filtered : forceFilter) { const minHandlers = this.props.muted ? {} : { moveUp: this.handleHotkeyMoveUp, moveDown: this.handleHotkeyMoveDown, |