nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests 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
This commit is contained in:
unarist 2018-03-27 20:05:59 +09:00 committed by Eugen Rochko
parent ca42f9b0eb
commit 2f3ac14a43
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) => { 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) => { const updateTop = (state, top) => {
@ -94,7 +94,7 @@ const updateTop = (state, top) => {
}; };
const deleteByStatus = (state, statusId) => { 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) { export default function notifications(state = initialState, action) {