UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix reblogged statuses being erroneously shown as filtered (#18744)

master
Claire 2022-06-30 09:51:55 +02:00 committed by GitHub
parent fb552dde2c
commit 3c24f19afe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/status.js
View File

@ -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) { if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
const minHandlers = this.props.muted ? {} : { const minHandlers = this.props.muted ? {} : {
moveUp: this.handleHotkeyMoveUp, moveUp: this.handleHotkeyMoveUp,

2
app/javascript/mastodon/selectors/index.js
View File

@ -106,7 +106,7 @@ export const makeGetStatus = () => {
return statusBase.withMutations(map => { return statusBase.withMutations(map => {
map.set('reblog', statusReblog); map.set('reblog', statusReblog);
map.set('account', accountBase); map.set('account', accountBase);
map.set('filtered', filtered); map.set('matched_filters', filtered);
}); });
}, },
); );