gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix filters not applying in detailed view (#34259)

Browse source
This commit is contained in:
Claire 2025-03-25 14:11:49 +01:00 • committed by GitHub
parent 38f5e74122
commit 8c3eeb4d29
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/mastodon/selectors/index.js
View file

@ -15,9 +15,10 @@ export const makeGetStatus = () => {
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
getFilters,
(_, { contextType }) => contextType === 'detailed',
],
(statusBase, statusReblog, accountBase, accountReblog, filters) => {
(statusBase, statusReblog, accountBase, accountReblog, filters, warnInsteadOfHide) => {
if (!statusBase || statusBase.get('isLoading')) {
return null;
}
@ -31,7 +32,7 @@ export const makeGetStatus = () => {
let filtered = false;
if ((accountReblog || accountBase).get('id') !== me && filters) {
let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
if (!warnInsteadOfHide && filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
return null;
}
filterResults = filterResults.filter(result => filters.has(result.get('filter')));