nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix accounts not being normalized from context statuses

This commit is contained in:
Eugen 2016-10-31 01:27:19 +01:00 committed by GitHub
parent 7e35650398
commit 50aaf4667f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/components/reducers/accounts.jsx
View File

@ -19,7 +19,10 @@ import {
TIMELINE_UPDATE, TIMELINE_UPDATE,
TIMELINE_EXPAND_SUCCESS TIMELINE_EXPAND_SUCCESS
} from '../actions/timelines'; } from '../actions/timelines';
import { STATUS_FETCH_SUCCESS } from '../actions/statuses'; import {
STATUS_FETCH_SUCCESS,
CONTEXT_FETCH_SUCCESS
} from '../actions/statuses';
import Immutable from 'immutable'; import Immutable from 'immutable';
const normalizeAccount = (state, account) => state.set(account.get('id'), account); const normalizeAccount = (state, account) => state.set(account.get('id'), account);
@ -66,6 +69,7 @@ export default function accounts(state = initialState, action) {
case TIMELINE_EXPAND_SUCCESS: case TIMELINE_EXPAND_SUCCESS:
case ACCOUNT_TIMELINE_FETCH_SUCCESS: case ACCOUNT_TIMELINE_FETCH_SUCCESS:
case ACCOUNT_TIMELINE_EXPAND_SUCCESS: case ACCOUNT_TIMELINE_EXPAND_SUCCESS:
case CONTEXT_FETCH_SUCCESS:
return normalizeAccountsFromStatuses(state, Immutable.fromJS(action.statuses)); return normalizeAccountsFromStatuses(state, Immutable.fromJS(action.statuses));
case TIMELINE_UPDATE: case TIMELINE_UPDATE:
case REBLOG_SUCCESS: case REBLOG_SUCCESS: