37dbfa4cd7
* Unread indicator was invisible behind column header, adjusted * Unread indicator now a CSS pseudo-element * Adjust flex
68 lines
2.3 KiB
JavaScript
68 lines
2.3 KiB
JavaScript
import { connect } from 'react-redux';
|
|
import StatusList from '../../../components/status_list';
|
|
import { scrollTopTimeline } from '../../../actions/timelines';
|
|
import Immutable from 'immutable';
|
|
import { createSelector } from 'reselect';
|
|
import { debounce } from 'lodash';
|
|
|
|
const makeGetStatusIds = () => createSelector([
|
|
(state, { type }) => state.getIn(['settings', type], Immutable.Map()),
|
|
(state, { type }) => state.getIn(['timelines', type, 'items'], Immutable.List()),
|
|
(state) => state.get('statuses'),
|
|
(state) => state.getIn(['meta', 'me']),
|
|
], (columnSettings, statusIds, statuses, me) => statusIds.filter(id => {
|
|
const statusForId = statuses.get(id);
|
|
let showStatus = true;
|
|
|
|
if (columnSettings.getIn(['shows', 'reblog']) === false) {
|
|
showStatus = showStatus && statusForId.get('reblog') === null;
|
|
}
|
|
|
|
if (columnSettings.getIn(['shows', 'reply']) === false) {
|
|
showStatus = showStatus && (statusForId.get('in_reply_to_id') === null || statusForId.get('in_reply_to_account_id') === me);
|
|
}
|
|
|
|
if (columnSettings.getIn(['regex', 'body'], '').trim().length > 0) {
|
|
try {
|
|
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;
|
|
}));
|
|
|
|
const makeMapStateToProps = () => {
|
|
const getStatusIds = makeGetStatusIds();
|
|
|
|
const mapStateToProps = (state, { timelineId }) => ({
|
|
statusIds: getStatusIds(state, { type: timelineId }),
|
|
isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
|
|
hasMore: !!state.getIn(['timelines', timelineId, 'next']),
|
|
});
|
|
|
|
return mapStateToProps;
|
|
};
|
|
|
|
const mapDispatchToProps = (dispatch, { timelineId, loadMore }) => ({
|
|
|
|
onScrollToBottom: debounce(() => {
|
|
dispatch(scrollTopTimeline(timelineId, false));
|
|
loadMore();
|
|
}, 300, { leading: true }),
|
|
|
|
onScrollToTop: debounce(() => {
|
|
dispatch(scrollTopTimeline(timelineId, true));
|
|
}, 100),
|
|
|
|
onScroll: debounce(() => {
|
|
dispatch(scrollTopTimeline(timelineId, false));
|
|
}, 100),
|
|
|
|
});
|
|
|
|
export default connect(makeMapStateToProps, mapDispatchToProps)(StatusList);
|