|
@@ -1,5 +1,4 @@
|
|
|
import {
|
|
|
- ACCOUNT_SET_SELF,
|
|
|
ACCOUNT_FETCH_SUCCESS,
|
|
|
FOLLOWERS_FETCH_SUCCESS,
|
|
|
FOLLOWERS_EXPAND_SUCCESS,
|
|
@@ -33,6 +32,7 @@ import {
|
|
|
NOTIFICATIONS_REFRESH_SUCCESS,
|
|
|
NOTIFICATIONS_EXPAND_SUCCESS
|
|
|
} from '../actions/notifications';
|
|
|
+import { STORE_HYDRATE } from '../actions/store';
|
|
|
import Immutable from 'immutable';
|
|
|
|
|
|
const normalizeAccount = (state, account) => state.set(account.id, Immutable.fromJS(account));
|
|
@@ -67,38 +67,39 @@ const initialState = Immutable.Map();
|
|
|
|
|
|
export default function accounts(state = initialState, action) {
|
|
|
switch(action.type) {
|
|
|
- case ACCOUNT_SET_SELF:
|
|
|
- case ACCOUNT_FETCH_SUCCESS:
|
|
|
- case NOTIFICATIONS_UPDATE:
|
|
|
- return normalizeAccount(state, action.account);
|
|
|
- case FOLLOWERS_FETCH_SUCCESS:
|
|
|
- case FOLLOWERS_EXPAND_SUCCESS:
|
|
|
- case FOLLOWING_FETCH_SUCCESS:
|
|
|
- case FOLLOWING_EXPAND_SUCCESS:
|
|
|
- case REBLOGS_FETCH_SUCCESS:
|
|
|
- case FAVOURITES_FETCH_SUCCESS:
|
|
|
- case COMPOSE_SUGGESTIONS_READY:
|
|
|
- case SEARCH_SUGGESTIONS_READY:
|
|
|
- case FOLLOW_REQUESTS_FETCH_SUCCESS:
|
|
|
- return normalizeAccounts(state, action.accounts);
|
|
|
- case NOTIFICATIONS_REFRESH_SUCCESS:
|
|
|
- case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
|
- return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
|
|
|
- case TIMELINE_REFRESH_SUCCESS:
|
|
|
- case TIMELINE_EXPAND_SUCCESS:
|
|
|
- case ACCOUNT_TIMELINE_FETCH_SUCCESS:
|
|
|
- case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
|
|
|
- case CONTEXT_FETCH_SUCCESS:
|
|
|
- return normalizeAccountsFromStatuses(state, action.statuses);
|
|
|
- case REBLOG_SUCCESS:
|
|
|
- case FAVOURITE_SUCCESS:
|
|
|
- case UNREBLOG_SUCCESS:
|
|
|
- case UNFAVOURITE_SUCCESS:
|
|
|
- return normalizeAccountFromStatus(state, action.response);
|
|
|
- case TIMELINE_UPDATE:
|
|
|
- case STATUS_FETCH_SUCCESS:
|
|
|
- return normalizeAccountFromStatus(state, action.status);
|
|
|
- default:
|
|
|
- return state;
|
|
|
+ case STORE_HYDRATE:
|
|
|
+ return state.merge(action.state.get('accounts'));
|
|
|
+ case ACCOUNT_FETCH_SUCCESS:
|
|
|
+ case NOTIFICATIONS_UPDATE:
|
|
|
+ return normalizeAccount(state, action.account);
|
|
|
+ case FOLLOWERS_FETCH_SUCCESS:
|
|
|
+ case FOLLOWERS_EXPAND_SUCCESS:
|
|
|
+ case FOLLOWING_FETCH_SUCCESS:
|
|
|
+ case FOLLOWING_EXPAND_SUCCESS:
|
|
|
+ case REBLOGS_FETCH_SUCCESS:
|
|
|
+ case FAVOURITES_FETCH_SUCCESS:
|
|
|
+ case COMPOSE_SUGGESTIONS_READY:
|
|
|
+ case SEARCH_SUGGESTIONS_READY:
|
|
|
+ case FOLLOW_REQUESTS_FETCH_SUCCESS:
|
|
|
+ return normalizeAccounts(state, action.accounts);
|
|
|
+ case NOTIFICATIONS_REFRESH_SUCCESS:
|
|
|
+ case NOTIFICATIONS_EXPAND_SUCCESS:
|
|
|
+ return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
|
|
|
+ case TIMELINE_REFRESH_SUCCESS:
|
|
|
+ case TIMELINE_EXPAND_SUCCESS:
|
|
|
+ case ACCOUNT_TIMELINE_FETCH_SUCCESS:
|
|
|
+ case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
|
|
|
+ case CONTEXT_FETCH_SUCCESS:
|
|
|
+ return normalizeAccountsFromStatuses(state, action.statuses);
|
|
|
+ case REBLOG_SUCCESS:
|
|
|
+ case FAVOURITE_SUCCESS:
|
|
|
+ case UNREBLOG_SUCCESS:
|
|
|
+ case UNFAVOURITE_SUCCESS:
|
|
|
+ return normalizeAccountFromStatus(state, action.response);
|
|
|
+ case TIMELINE_UPDATE:
|
|
|
+ case STATUS_FETCH_SUCCESS:
|
|
|
+ return normalizeAccountFromStatus(state, action.status);
|
|
|
+ default:
|
|
|
+ return state;
|
|
|
}
|
|
|
};
|