diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-06-30 09:51:55 +0200 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-08-25 09:52:13 +0200 |
commit | bbafe28fbc31f333d526103990b0c0b5d73f7eaf (patch) | |
tree | 3ccf79914456095b459ae5f636bf24585fd32a52 /app/javascript | |
parent | a15fe32e61f75e5aad28568491e3d33b63b860f8 (diff) |
[Glitch] Fix reblogged statuses being erroneously shown as filtered
Port 3c24f19afedc2169a7a343c5af4a8f892d863f0b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Diffstat (limited to 'app/javascript')
-rw-r--r-- | app/javascript/flavours/glitch/components/status.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/selectors/index.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/components/status.js b/app/javascript/flavours/glitch/components/status.js index 4ba602def..501bcd300 100644 --- a/app/javascript/flavours/glitch/components/status.js +++ b/app/javascript/flavours/glitch/components/status.js @@ -557,7 +557,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/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js index 63b10167c..91f9a81d9 100644 --- a/app/javascript/flavours/glitch/selectors/index.js +++ b/app/javascript/flavours/glitch/selectors/index.js @@ -100,7 +100,7 @@ export const makeGetStatus = () => { if (statusReblog) { statusReblog = statusReblog.set('account', accountReblog); - statusReblog = statusReblog.set('filtered', filtered); + statusReblog = statusReblog.set('matched_filters', filtered); } else { statusReblog = null; } @@ -108,7 +108,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); }); }, ); |