ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accurately count deleted unread notifications

rebase/4.0.0rc2
Thibaut Girka 2018-09-05 15:20:40 +02:00 committed by ThibG
parent f4ca3262f2
commit 711826cb37
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/javascript/flavours/glitch/reducers/notifications.js
View File

@ -25,6 +25,7 @@ const initialState = ImmutableMap({
hasMore: true, hasMore: true,
top: true, top: true,
unread: 0, unread: 0,
lastReadId: '0',
isLoading: false, isLoading: false,
cleaningMode: false, cleaningMode: false,
// notification removal mark of new notifs loaded whilst cleaningMode is true. // notification removal mark of new notifs loaded whilst cleaningMode is true.
@ -42,7 +43,9 @@ const notificationToMap = (state, notification) => ImmutableMap({
const normalizeNotification = (state, notification) => { const normalizeNotification = (state, notification) => {
const top = state.get('top'); const top = state.get('top');
if (!top) { if (top) {
state = state.set('lastReadId', notification.id);
} else {
state = state.update('unread', unread => unread + 1); state = state.update('unread', unread => unread + 1);
} }
@ -56,6 +59,8 @@ const normalizeNotification = (state, notification) => {
}; };
const expandNormalizedNotifications = (state, notifications, next) => { const expandNormalizedNotifications = (state, notifications, next) => {
const top = state.get('top');
const lastReadId = state.get('lastReadId');
let items = ImmutableList(); let items = ImmutableList();
notifications.forEach((n, i) => { notifications.forEach((n, i) => {
@ -77,6 +82,14 @@ const expandNormalizedNotifications = (state, notifications, next) => {
}); });
} }
if (top) {
if (!items.isEmpty()) {
mutable.update('lastReadId', id => compareId(id, items.first().get('id')) > 0 ? id : items.first().get('id'));
}
} else {
mutable.update('unread', unread => unread + items.filter(item => compareId(item.get('id'), lastReadId) > 0).size);
}
if (!next) { if (!next) {
mutable.set('hasMore', true); mutable.set('hasMore', true);
} }
@ -92,12 +105,19 @@ const filterNotifications = (state, relationship) => {
const updateTop = (state, top) => { const updateTop = (state, top) => {
if (top) { if (top) {
state = state.set('unread', 0); state = state.set('unread', 0);
const lastNotification = state.get('items').find(item => item !== null);
state = state.set('lastReadId', lastNotification ? lastNotification.get('id') : '0');
} }
return state.set('top', top); return state.set('top', top);
}; };
const deleteByStatus = (state, statusId) => { const deleteByStatus = (state, statusId) => {
if (!state.get('top')) {
const lastReadId = state.get('lastReadId');
const deletedUnread = state.get('items').filter(item => item !== null && item.get('status') === statusId && compareId(item.get('id'), lastReadId) > 0);
state = state.update('unread', unread => unread - deletedUnread.size);
}
return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId)); return state.update('items', list => list.filterNot(item => item !== null && item.get('status') === statusId));
}; };