tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[Glitch] Fix reblogged statuses being erroneously shown as filtered 

Port 3c24f19afe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Claire 2022-06-30 09:51:55 +02:00
parent a15fe32e61
commit bbafe28fbc
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) { 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,

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

@ -100,7 +100,7 @@ export const makeGetStatus = () => {
if (statusReblog) { if (statusReblog) {
statusReblog = statusReblog.set('account', accountReblog); statusReblog = statusReblog.set('account', accountReblog);
statusReblog = statusReblog.set('filtered', filtered); statusReblog = statusReblog.set('matched_filters', filtered);
} else { } else {
statusReblog = null; statusReblog = null;
} }
@ -108,7 +108,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);
}); });
}, },
); );