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

Change: #955 フィルターアクションの「アカウント名だけを出し、本文は警告で隠す」を削除し、外観設定に移動 (#970)

Browse source 
* Remove: #955 フィルターのアクション`half_warn`

* Add: 「フィルター対象投稿の投稿者名やアイコンを表示する」設定

* Fix test
This commit is contained in:
KMY（雪あすか） 2025-01-23 19:18:40 +09:00 • committed by GitHub
parent 22bf14e9f0
commit 67064de265
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,7 +36,6 @@ export const makeGetStatus = () => {
}
let filtered = false;
let filterAction = 'warn';
if ((accountReblog || accountBase).get('id') !== me && filters) {
let filterResults = statusReblog?.get('filtered') || statusBase.get('filtered') || ImmutableList();
const quoteFilterResults = statusQuote?.get('filtered');
@ -47,13 +46,12 @@ export const makeGetStatus = () => {
}
}
if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action_ex']) === 'hide')) {
if (filterResults.some((result) => filters.getIn([result.get('filter'), 'filter_action']) === '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_ex']) === 'warn') ? 'warn' : 'half_warn';
}
}
@ -62,8 +60,6 @@ export const makeGetStatus = () => {
map.set('quote', statusQuote);
map.set('account', accountBase);
map.set('matched_filters', filtered);
map.set('filter_action', filterAction);
map.set('filter_action_ex', filterAction);
});
},
);