ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix filtering behaviors

rebase/4.0.0rc2
Thibaut Girka 2019-07-19 18:00:14 +02:00 committed by ThibG
parent f170e0492f
commit 249b7c7c12
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/flavours/glitch/components/status.js
View File

@ -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,