CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

Exclude self toots from regular expression filter (#4245)

Browse Source 
* Exclude self toots from regular expression filter

* refactor
This commit is contained in:
Yamagishi Kazutoshi 2017-07-18 22:20:38 +09:00 committed by Eugen Rochko
parent 407073d7a2
commit f5382ec085
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
app/javascript/mastodon/features/ui/containers/status_list_container.js
View File

@ -10,31 +10,36 @@ const makeGetStatusIds = () => createSelector([
(state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()), (state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()),
(state) => state.get('statuses'), (state) => state.get('statuses'),
(state) => state.getIn(['meta', 'me']), (state) => state.getIn(['meta', 'me']),
], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => { ], (columnSettings, statusIds, statuses, me) => {
const statusForId = statuses.get(id); const rawRegex = columnSettings.getIn(['regex', 'body'], '').trim();
let showStatus = true; let regex = null;
if (columnSettings.getIn(['shows', 'reblog']) === false) { try {
showStatus = showStatus && statusForId.get('reblog') === null; regex = rawRegex && new RegExp(rawRegex, 'i');
} catch (e) {
// Bad regex, don't affect filters
} }
if (columnSettings.getIn(['shows', 'reply']) === false) { return statusIds.filter(id => {
showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me); const statusForId = statuses.get(id);
} let showStatus = true;
if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) { if (columnSettings.getIn(['shows', 'reblog']) === false) {
try { showStatus = showStatus && statusForId.get('reblog') === null;
if (showStatus) {
const regex = new RegExp(columnSettings.getIn(['regex', 'body']).trim(), 'i');
showStatus = !regex.test(statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index'));
}
} catch(e) {
// Bad regex, don't affect filters
} }
}
return showStatus; if (columnSettings.getIn(['shows', 'reply']) === false) {
})); showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
}
if (showStatus && regex && statusForId.get('account') !== me) {
const searchIndex = statusForId.get('reblog') ? statuses.getIn([statusForId.get('reblog'), 'search_index']) : statusForId.get('search_index');
showStatus = !regex.test(searchIndex);
}
return showStatus;
});
});
const makeMapStateToProps = () => { const makeMapStateToProps = () => {
const getStatusIds = makeGetStatusIds(); const getStatusIds = makeGetStatusIds();