forked from treehouse/mastodon
Remove dead code in WebUI filtering code (#18745)
parent
3c24f19afe
commit
a233a9bfb5
|
@ -1,5 +1,5 @@
|
|||
import { createSelector } from 'reselect';
|
||||
import { List as ImmutableList, Map as ImmutableMap, is } from 'immutable';
|
||||
import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
|
||||
import { me } from '../initial_state';
|
||||
|
||||
const getAccountBase = (state, id) => state.getIn(['accounts', id], null);
|
||||
|
@ -37,31 +37,6 @@ const toServerSideType = columnType => {
|
|||
}
|
||||
};
|
||||
|
||||
const escapeRegExp = string =>
|
||||
string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
||||
|
||||
const regexFromKeywords = keywords => {
|
||||
if (keywords.size === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new RegExp(keywords.map(keyword_filter => {
|
||||
let expr = escapeRegExp(keyword_filter.get('keyword'));
|
||||
|
||||
if (keyword_filter.get('whole_word')) {
|
||||
if (/^[\w]/.test(expr)) {
|
||||
expr = `\\b${expr}`;
|
||||
}
|
||||
|
||||
if (/[\w]$/.test(expr)) {
|
||||
expr = `${expr}\\b`;
|
||||
}
|
||||
}
|
||||
|
||||
return expr;
|
||||
}).join('|'), 'i');
|
||||
};
|
||||
|
||||
const getFilters = (state, { contextType }) => {
|
||||
if (!contextType) return null;
|
||||
|
||||
|
|
Loading…
Reference in New Issue