diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-30 09:51:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-30 09:51:55 +0200 |
commit | 3c24f19afedc2169a7a343c5af4a8f892d863f0b (patch) | |
tree | 8e2360a710c682eb29614eba7dbb300717ed01a1 /app | |
parent | fb552dde2c733c372c0b235397e4106f2e4480bb (diff) |
Fix reblogged statuses being erroneously shown as filtered (#18744)
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/mastodon/components/status.js | 2 | ||||
-rw-r--r-- | app/javascript/mastodon/selectors/index.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 4ca392824..238a0d734 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -338,7 +338,7 @@ class Status extends ImmutablePureComponent { ); } - const matchedFilters = status.get('filtered') || status.getIn(['reblog', 'filtered']); + const matchedFilters = status.get('matched_filters'); if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) { const minHandlers = this.props.muted ? {} : { moveUp: this.handleHotkeyMoveUp, diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js index 6aeb8b7bd..bf1db4bb4 100644 --- a/app/javascript/mastodon/selectors/index.js +++ b/app/javascript/mastodon/selectors/index.js @@ -106,7 +106,7 @@ export const makeGetStatus = () => { return statusBase.withMutations(map => { map.set('reblog', statusReblog); map.set('account', accountBase); - map.set('filtered', filtered); + map.set('matched_filters', filtered); }); }, ); |