|
|
@ -1,5 +1,6 @@ |
|
|
|
import { createSelector } from 'reselect'; |
|
|
|
import { createSelector } from 'reselect'; |
|
|
|
import { List as ImmutableList } from 'immutable'; |
|
|
|
import { List as ImmutableList } from 'immutable'; |
|
|
|
|
|
|
|
import { me } from '../initial_state'; |
|
|
|
|
|
|
|
|
|
|
|
const getAccountBase = (state, id) => state.getIn(['accounts', id], null); |
|
|
|
const getAccountBase = (state, id) => state.getIn(['accounts', id], null); |
|
|
|
const getAccountCounters = (state, id) => state.getIn(['accounts_counters', id], null); |
|
|
|
const getAccountCounters = (state, id) => state.getIn(['accounts_counters', id], null); |
|
|
@ -83,7 +84,7 @@ export const makeGetStatus = () => { |
|
|
|
statusReblog = null; |
|
|
|
statusReblog = null; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const regex = regexFromFilters(filters); |
|
|
|
const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters); |
|
|
|
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index')); |
|
|
|
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index')); |
|
|
|
|
|
|
|
|
|
|
|
return statusBase.withMutations(map => { |
|
|
|
return statusBase.withMutations(map => { |
|
|
|