treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Add missing null handling in notification reducer (#6930) 

This patch adds null item (i.e. gap) handling on below functions to avoid TypeError.

* `filterNotifications` called on user mute/block
* `deleteByStatus` called on status deletion
lolsob-rspec
unarist 2018-03-27 20:05:59 +09:00 committed by Eugen Rochko
parent e829c21cc6
commit 9487e8a4c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/reducers/notifications.js
View File

@ -82,7 +82,7 @@ const expandNormalizedNotifications = (state, notifications, next) => {
};
const filterNotifications = (state, relationship) => {
return state.update('items', list => list.filterNot(item => item.get('account') === relationship.id));
return state.update('items', list => list.filterNot(item => item !== null && item.get('account') === relationship.id));
};
const updateTop = (state, top) => {
@ -94,7 +94,7 @@ const updateTop = (state, top) => {
};
const deleteByStatus = (state, statusId) => {
return state.update('items', list => list.filterNot(item => item.get('status') === statusId));
return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId));
};
export default function notifications(state = initialState, action) {