|
|
@ -9,7 +9,10 @@ import {
|
|
|
|
NOTIFICATIONS_CLEAR,
|
|
|
|
NOTIFICATIONS_CLEAR,
|
|
|
|
NOTIFICATIONS_SCROLL_TOP,
|
|
|
|
NOTIFICATIONS_SCROLL_TOP,
|
|
|
|
} from '../actions/notifications';
|
|
|
|
} from '../actions/notifications';
|
|
|
|
import { ACCOUNT_BLOCK_SUCCESS } from '../actions/accounts';
|
|
|
|
import {
|
|
|
|
|
|
|
|
ACCOUNT_BLOCK_SUCCESS,
|
|
|
|
|
|
|
|
ACCOUNT_MUTE_SUCCESS,
|
|
|
|
|
|
|
|
} from '../actions/accounts';
|
|
|
|
import { TIMELINE_DELETE } from '../actions/timelines';
|
|
|
|
import { TIMELINE_DELETE } from '../actions/timelines';
|
|
|
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
|
|
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
|
|
|
|
|
|
|
|
|
|
@ -108,6 +111,7 @@ export default function notifications(state = initialState, action) {
|
|
|
|
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
|
|
case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
|
|
return appendNormalizedNotifications(state, action.notifications, action.next);
|
|
|
|
return appendNormalizedNotifications(state, action.notifications, action.next);
|
|
|
|
case ACCOUNT_BLOCK_SUCCESS:
|
|
|
|
case ACCOUNT_BLOCK_SUCCESS:
|
|
|
|
|
|
|
|
case ACCOUNT_MUTE_SUCCESS:
|
|
|
|
return filterNotifications(state, action.relationship);
|
|
|
|
return filterNotifications(state, action.relationship);
|
|
|
|
case NOTIFICATIONS_CLEAR:
|
|
|
|
case NOTIFICATIONS_CLEAR:
|
|
|
|
return state.set('items', ImmutableList()).set('next', null);
|
|
|
|
return state.set('items', ImmutableList()).set('next', null);
|
|
|
|