luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 21:33:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues with notification cleaning mode when there is a disconnection gap (#1867)

Browse source
This commit is contained in:
Claire 2022-10-13 08:55:00 +02:00 committed by GitHub
parent 2bb443c7d5
commit 27a2edcb79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/javascript/flavours/glitch/reducers/notifications.js
View file

@ -162,7 +162,9 @@ const deleteByStatus = (state, statusId) => {
const markForDelete = (state, notificationId, yes) => { const markForDelete = (state, notificationId, yes) => {
return state.update('items', list => list.map(item => { return state.update('items', list => list.map(item => {
if(item.get('id') === notificationId) { if (item === null) {
return null;
} else if(item.get('id') === notificationId) {
return item.set('markedForDelete', yes); return item.set('markedForDelete', yes);
} else { } else {
return item; return item;
@ -172,7 +174,9 @@ const markForDelete = (state, notificationId, yes) => {
const markAllForDelete = (state, yes) => { const markAllForDelete = (state, yes) => {
return state.update('items', list => list.map(item => { return state.update('items', list => list.map(item => {
if(yes !== null) { if (item === null) {
return null;
} else if(yes !== null) {
return item.set('markedForDelete', yes); return item.set('markedForDelete', yes);
} else { } else {
return item.set('markedForDelete', !item.get('markedForDelete')); return item.set('markedForDelete', !item.get('markedForDelete'));
@ -181,11 +185,11 @@ const markAllForDelete = (state, yes) => {
}; };
const unmarkAllForDelete = (state) => { const unmarkAllForDelete = (state) => {
return state.update('items', list => list.map(item => item.set('markedForDelete', false))); return state.update('items', list => list.map(item => item === null ? item : item.set('markedForDelete', false)));
}; };
const deleteMarkedNotifs = (state) => { const deleteMarkedNotifs = (state) => {
return state.update('items', list => list.filterNot(item => item.get('markedForDelete'))); return state.update('items', list => list.filterNot(item => item === null ? item : item.get('markedForDelete')));
}; };
const updateMounted = (state) => { const updateMounted = (state) => {