Merge pull request #433 from ThibG/glitch-soc/fixes/status-filtering
Status filtering fixes from upstream
This commit is contained in:
commit
6fb610f865
2 changed files with 29 additions and 29 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
import {
|
||||||
|
ACCOUNT_BLOCK_SUCCESS,
|
||||||
|
ACCOUNT_MUTE_SUCCESS,
|
||||||
|
} from 'flavours/glitch/actions/accounts';
|
||||||
import { CONTEXT_FETCH_SUCCESS } from 'flavours/glitch/actions/statuses';
|
import { CONTEXT_FETCH_SUCCESS } from 'flavours/glitch/actions/statuses';
|
||||||
import { TIMELINE_DELETE, TIMELINE_CONTEXT_UPDATE } from 'flavours/glitch/actions/timelines';
|
import { TIMELINE_DELETE, TIMELINE_CONTEXT_UPDATE } from 'flavours/glitch/actions/timelines';
|
||||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||||
|
@ -17,18 +21,30 @@ const normalizeContext = (state, id, ancestors, descendants) => {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const deleteFromContexts = (state, id) => {
|
const deleteFromContexts = (immutableState, ids) => immutableState.withMutations(state => {
|
||||||
state.getIn(['descendants', id], ImmutableList()).forEach(descendantId => {
|
state.update('ancestors', immutableAncestors => immutableAncestors.withMutations(ancestors => {
|
||||||
state = state.updateIn(['ancestors', descendantId], ImmutableList(), list => list.filterNot(itemId => itemId === id));
|
state.update('descendants', immutableDescendants => immutableDescendants.withMutations(descendants => {
|
||||||
});
|
ids.forEach(id => {
|
||||||
|
descendants.get(id, ImmutableList()).forEach(descendantId => {
|
||||||
|
ancestors.update(descendantId, ImmutableList(), list => list.filterNot(itemId => itemId === id));
|
||||||
|
});
|
||||||
|
|
||||||
state.getIn(['ancestors', id], ImmutableList()).forEach(ancestorId => {
|
ancestors.get(id, ImmutableList()).forEach(ancestorId => {
|
||||||
state = state.updateIn(['descendants', ancestorId], ImmutableList(), list => list.filterNot(itemId => itemId === id));
|
descendants.update(ancestorId, ImmutableList(), list => list.filterNot(itemId => itemId === id));
|
||||||
});
|
});
|
||||||
|
|
||||||
state = state.deleteIn(['descendants', id]).deleteIn(['ancestors', id]);
|
descendants.delete(id);
|
||||||
|
ancestors.delete(id);
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
return state;
|
const filterContexts = (state, relationship, statuses) => {
|
||||||
|
const ownedStatusIds = statuses.filter(status => status.get('account') === relationship.id)
|
||||||
|
.map(status => status.get('id'));
|
||||||
|
|
||||||
|
return deleteFromContexts(state, ownedStatusIds);
|
||||||
};
|
};
|
||||||
|
|
||||||
const updateContext = (state, status, references) => {
|
const updateContext = (state, status, references) => {
|
||||||
|
@ -49,10 +65,13 @@ const updateContext = (state, status, references) => {
|
||||||
|
|
||||||
export default function contexts(state = initialState, action) {
|
export default function contexts(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
|
case ACCOUNT_BLOCK_SUCCESS:
|
||||||
|
case ACCOUNT_MUTE_SUCCESS:
|
||||||
|
return filterContexts(state, action.relationship, action.statuses);
|
||||||
case CONTEXT_FETCH_SUCCESS:
|
case CONTEXT_FETCH_SUCCESS:
|
||||||
return normalizeContext(state, action.id, action.ancestors, action.descendants);
|
return normalizeContext(state, action.id, action.ancestors, action.descendants);
|
||||||
case TIMELINE_DELETE:
|
case TIMELINE_DELETE:
|
||||||
return deleteFromContexts(state, action.id);
|
return deleteFromContexts(state, [action.id]);
|
||||||
case TIMELINE_CONTEXT_UPDATE:
|
case TIMELINE_CONTEXT_UPDATE:
|
||||||
return updateContext(state, action.status, action.references);
|
return updateContext(state, action.status, action.references);
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -26,10 +26,6 @@ import {
|
||||||
TIMELINE_DELETE,
|
TIMELINE_DELETE,
|
||||||
TIMELINE_EXPAND_SUCCESS,
|
TIMELINE_EXPAND_SUCCESS,
|
||||||
} from 'flavours/glitch/actions/timelines';
|
} from 'flavours/glitch/actions/timelines';
|
||||||
import {
|
|
||||||
ACCOUNT_BLOCK_SUCCESS,
|
|
||||||
ACCOUNT_MUTE_SUCCESS,
|
|
||||||
} from 'flavours/glitch/actions/accounts';
|
|
||||||
import {
|
import {
|
||||||
NOTIFICATIONS_UPDATE,
|
NOTIFICATIONS_UPDATE,
|
||||||
NOTIFICATIONS_REFRESH_SUCCESS,
|
NOTIFICATIONS_REFRESH_SUCCESS,
|
||||||
|
@ -96,18 +92,6 @@ const deleteStatus = (state, id, references) => {
|
||||||
return state.delete(id);
|
return state.delete(id);
|
||||||
};
|
};
|
||||||
|
|
||||||
const filterStatuses = (state, relationship) => {
|
|
||||||
state.forEach(status => {
|
|
||||||
if (status.get('account') !== relationship.id) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
state = deleteStatus(state, status.get('id'), state.filter(item => item.get('reblog') === status.get('id')));
|
|
||||||
});
|
|
||||||
|
|
||||||
return state;
|
|
||||||
};
|
|
||||||
|
|
||||||
const initialState = ImmutableMap();
|
const initialState = ImmutableMap();
|
||||||
|
|
||||||
export default function statuses(state = initialState, action) {
|
export default function statuses(state = initialState, action) {
|
||||||
|
@ -155,9 +139,6 @@ export default function statuses(state = initialState, action) {
|
||||||
return normalizeStatuses(state, action.statuses);
|
return normalizeStatuses(state, action.statuses);
|
||||||
case TIMELINE_DELETE:
|
case TIMELINE_DELETE:
|
||||||
return deleteStatus(state, action.id, action.references);
|
return deleteStatus(state, action.id, action.references);
|
||||||
case ACCOUNT_BLOCK_SUCCESS:
|
|
||||||
case ACCOUNT_MUTE_SUCCESS:
|
|
||||||
return filterStatuses(state, action.relationship);
|
|
||||||
default:
|
default:
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue