luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-01 04:24:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix notifications reducer bug

Browse source
This commit is contained in:
Eugen Rochko 2016-12-22 11:23:30 +01:00
parent 318e63cb79
commit 025f7bb223
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/components/actions/notifications.jsx
View file

@ -76,7 +76,7 @@ export function refreshNotificationsSuccess(notifications, next) {
type: NOTIFICATIONS_REFRESH_SUCCESS, type: NOTIFICATIONS_REFRESH_SUCCESS,
notifications, notifications,
accounts: notifications.map(item => item.account), accounts: notifications.map(item => item.account),
statuses: notifications.map(item => item.status), statuses: notifications.map(item => item.status).filter(status => !!status),
next next
}; };
}; };
@ -120,7 +120,7 @@ export function expandNotificationsSuccess(notifications, next) {
type: NOTIFICATIONS_EXPAND_SUCCESS, type: NOTIFICATIONS_EXPAND_SUCCESS,
notifications, notifications,
accounts: notifications.map(item => item.account), accounts: notifications.map(item => item.account),
statuses: notifications.map(item => item.status), statuses: notifications.map(item => item.status).filter(status => !!status),
next next
}; };
}; };

3
app/assets/javascripts/components/reducers/accounts.jsx
View file

@ -78,9 +78,10 @@ export default function accounts(state = initialState, action) {
case FAVOURITES_FETCH_SUCCESS: case FAVOURITES_FETCH_SUCCESS:
case COMPOSE_SUGGESTIONS_READY: case COMPOSE_SUGGESTIONS_READY:
case SEARCH_SUGGESTIONS_READY: case SEARCH_SUGGESTIONS_READY:
return normalizeAccounts(state, action.accounts);
case NOTIFICATIONS_REFRESH_SUCCESS: case NOTIFICATIONS_REFRESH_SUCCESS:
case NOTIFICATIONS_EXPAND_SUCCESS: case NOTIFICATIONS_EXPAND_SUCCESS:
return normalizeAccounts(state, action.accounts); return normalizeAccountsFromStatuses(normalizeAccounts(state, action.accounts), action.statuses);
case TIMELINE_REFRESH_SUCCESS: case TIMELINE_REFRESH_SUCCESS:
case TIMELINE_EXPAND_SUCCESS: case TIMELINE_EXPAND_SUCCESS:
case ACCOUNT_TIMELINE_FETCH_SUCCESS: case ACCOUNT_TIMELINE_FETCH_SUCCESS: