[Glitch] Do not filter the status collection after muting and blocking
Port fd87e5a53b
to glitch-soc
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
parent
d55ab8e3e8
commit
f84b4d90cb
|
@ -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 { TIMELINE_DELETE, TIMELINE_CONTEXT_UPDATE } from 'flavours/glitch/actions/timelines';
|
||||
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
||||
|
@ -31,6 +35,12 @@ const deleteFromContexts = (state, id) => {
|
|||
return state;
|
||||
};
|
||||
|
||||
const filterContexts = (state, relationship) => {
|
||||
return state.map(
|
||||
statuses => statuses.filter(
|
||||
status => status.get('account') !== relationship.id));
|
||||
};
|
||||
|
||||
const updateContext = (state, status, references) => {
|
||||
return state.update('descendants', map => {
|
||||
references.forEach(parentId => {
|
||||
|
@ -49,6 +59,9 @@ const updateContext = (state, status, references) => {
|
|||
|
||||
export default function contexts(state = initialState, action) {
|
||||
switch(action.type) {
|
||||
case ACCOUNT_BLOCK_SUCCESS:
|
||||
case ACCOUNT_MUTE_SUCCESS:
|
||||
return filterContexts(state, action.relationship);
|
||||
case CONTEXT_FETCH_SUCCESS:
|
||||
return normalizeContext(state, action.id, action.ancestors, action.descendants);
|
||||
case TIMELINE_DELETE:
|
||||
|
|
|
@ -26,10 +26,6 @@ import {
|
|||
TIMELINE_DELETE,
|
||||
TIMELINE_EXPAND_SUCCESS,
|
||||
} from 'flavours/glitch/actions/timelines';
|
||||
import {
|
||||
ACCOUNT_BLOCK_SUCCESS,
|
||||
ACCOUNT_MUTE_SUCCESS,
|
||||
} from 'flavours/glitch/actions/accounts';
|
||||
import {
|
||||
NOTIFICATIONS_UPDATE,
|
||||
NOTIFICATIONS_REFRESH_SUCCESS,
|
||||
|
@ -96,18 +92,6 @@ const deleteStatus = (state, id, references) => {
|
|||
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();
|
||||
|
||||
export default function statuses(state = initialState, action) {
|
||||
|
@ -155,9 +139,6 @@ export default function statuses(state = initialState, action) {
|
|||
return normalizeStatuses(state, action.statuses);
|
||||
case TIMELINE_DELETE:
|
||||
return deleteStatus(state, action.id, action.references);
|
||||
case ACCOUNT_BLOCK_SUCCESS:
|
||||
case ACCOUNT_MUTE_SUCCESS:
|
||||
return filterStatuses(state, action.relationship);
|
||||
default:
|
||||
return state;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue