From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 19 May 2021 21:51:05 +0000 (+0200)
Subject: [Glitch] Fix unread notification count when polling
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=1a591ffc8b650f815ab37be6319d8132e591bdb2;p=mastodon.git

[Glitch] Fix unread notification count when polling

Port 92f1d739b554b6d5496013fb50196a14434943e2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
---

diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js
index b4c5ef71a..859a8b3a1 100644
--- a/app/javascript/flavours/glitch/reducers/notifications.js
+++ b/app/javascript/flavours/glitch/reducers/notifications.js
@@ -112,7 +112,7 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece
     }
 
     if (shouldCountUnreadNotifications(state)) {
-      mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0));
+      mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), lastReadId) > 0));
     } else {
       const mostRecent = items.find(item => item !== null);
       if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) {