treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Fix reblogged statuses being erroneously shown as filtered 

Port 106b27830b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
lolsob-rspec
Claire 2022-06-30 09:51:55 +02:00
parent 60649e5665
commit 6ce8b42ff1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
app/javascript/flavours/glitch/selectors/index.js
View File

@ -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);
});
},
);