|
|
@ -1,5 +1,5 @@ |
|
|
|
import { createSelector } from 'reselect'; |
|
|
|
import { List as ImmutableList } from 'immutable'; |
|
|
|
import { List as ImmutableList, is } from 'immutable'; |
|
|
|
import { me } from 'flavours/glitch/util/initial_state'; |
|
|
|
|
|
|
|
const getAccountBase = (state, id) => state.getIn(['accounts', id], null); |
|
|
@ -36,12 +36,10 @@ const toServerSideType = columnType => { |
|
|
|
} |
|
|
|
}; |
|
|
|
|
|
|
|
export const getFilters = (state, { contextType }) => state.get('filters', ImmutableList()).filter(filter => contextType && filter.get('context').includes(toServerSideType(contextType)) && (filter.get('expires_at') === null || Date.parse(filter.get('expires_at')) > (new Date()))); |
|
|
|
|
|
|
|
const escapeRegExp = string => |
|
|
|
string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
|
|
|
|
|
|
|
|
export const regexFromFilters = filters => { |
|
|
|
const regexFromFilters = filters => { |
|
|
|
if (filters.size === 0) { |
|
|
|
return null; |
|
|
|
} |
|
|
@ -63,6 +61,27 @@ export const regexFromFilters = filters => { |
|
|
|
}).join('|'), 'i'); |
|
|
|
}; |
|
|
|
|
|
|
|
// Memoize the filter regexps for each valid server contextType
|
|
|
|
const makeGetFiltersRegex = () => { |
|
|
|
let memo = {}; |
|
|
|
|
|
|
|
return (state, { contextType }) => { |
|
|
|
if (!contextType) return ImmutableList(); |
|
|
|
|
|
|
|
const serverSideType = toServerSideType(contextType); |
|
|
|
const filters = state.get('filters', ImmutableList()).filter(filter => filter.get('context').includes(serverSideType) && (filter.get('expires_at') === null || Date.parse(filter.get('expires_at')) > (new Date()))); |
|
|
|
|
|
|
|
if (!memo[serverSideType] || !is(memo[serverSideType].filters, filters)) { |
|
|
|
const dropRegex = regexFromFilters(filters.filter(filter => filter.get('irreversible'))); |
|
|
|
const regex = regexFromFilters(filters); |
|
|
|
memo[serverSideType] = { filters: filters, results: [dropRegex, regex] }; |
|
|
|
} |
|
|
|
return memo[serverSideType].results; |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
export const getFiltersRegex = makeGetFiltersRegex(); |
|
|
|
|
|
|
|
export const makeGetStatus = () => { |
|
|
|
return createSelector( |
|
|
|
[ |
|
|
@ -70,21 +89,21 @@ export const makeGetStatus = () => { |
|
|
|
(state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]), |
|
|
|
(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, |
|
|
|
getFiltersRegex, |
|
|
|
], |
|
|
|
|
|
|
|
(statusBase, statusReblog, accountBase, accountReblog, filters) => { |
|
|
|
(statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => { |
|
|
|
if (!statusBase) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
const dropRegex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters.filter(filter => filter.get('irreversible'))); |
|
|
|
const dropRegex = (accountReblog || accountBase).get('id') !== me && filtersRegex[0]; |
|
|
|
|
|
|
|
if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters); |
|
|
|
const regex = (accountReblog || accountBase).get('id') !== me && filtersRegex[1]; |
|
|
|
let filtered = false; |
|
|
|
|
|
|
|
if (statusReblog) { |
|
|
|