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

Fix: #404 フィルターでhalf_warnを設定してると、クライアントアプリでタイムラインが読み込まれない (#410)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-01-03 22:10:02 +09:00 • committed by GitHub
parent 47489783bc
commit eee362b9e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,13 +56,13 @@ export const makeGetStatus = () => {
}
}
if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'hide')) {
if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
return null;
}
filterResults = filterResults.filter(result => filters.has(result.get('filter')));
if (!filterResults.isEmpty()) {
filtered = filterResults.map(result => filters.getIn([result.get('filter'), 'title']));
filterAction = filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === 'warn') ? 'warn' : 'half_warn';
filterAction = filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'warn') ? 'warn' : 'half_warn';
}
}
@ -72,6 +72,7 @@ export const makeGetStatus = () => {
map.set('account', accountBase);
map.set('matched_filters', filtered);
map.set('filter_action', filterAction);
map.set('filter_action_ex', filterAction);
});
},
);