tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix regexp filtering in pinned community/public TLs (#1840)

Browse Source
This commit is contained in:
Claire
2022-09-02 11:57:06 +02:00
committed by GitHub
parent d4e63cd980
commit 2a46fcc3ed
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/javascript/flavours/glitch/features/ui/containers/status_list_container.js
View File

@ -6,20 +6,8 @@ import { createSelector } from 'reselect';
import { debounce } from 'lodash';
import { me } from 'flavours/glitch/util/initial_state';
const normalizeTimelineId = timelineId => {
if (timelineId.startsWith('public:')) {
return 'public';
}
if (timelineId.startsWith('community:')) {
return 'community';
}
return timelineId;
};
const getRegex = createSelector([
(state, { type }) => state.getIn(['settings', normalizeTimelineId(type), 'regex', 'body']),
(state, { regex }) => regex,
], (rawRegex) => {
let regex = null;
@ -32,7 +20,7 @@ const getRegex = createSelector([
});
const makeGetStatusIds = (pending = false) => createSelector([
(state, { type }) => state.getIn(['settings', normalizeTimelineId(type)], ImmutableMap()),
(state, { type }) => state.getIn(['settings', type], ImmutableMap()),
(state, { type }) => state.getIn(['timelines', type, pending ? 'pendingItems' : 'items'], ImmutableList()),
(state) => state.get('statuses'),
getRegex,
@ -70,8 +58,8 @@ const makeMapStateToProps = () => {
const getStatusIds = makeGetStatusIds();
const getPendingStatusIds = makeGetStatusIds(true);
const mapStateToProps = (state, { timelineId }) => ({
statusIds: getStatusIds(state, { type: timelineId }),
const mapStateToProps = (state, { timelineId, regex }) => ({
statusIds: getStatusIds(state, { type: timelineId, regex }),
isLoading: state.getIn(['timelines', timelineId, 'isLoading'], true),
isPartial: state.getIn(['timelines', timelineId, 'isPartial'], false),
hasMore: state.getIn(['timelines', timelineId, 'hasMore']),