fix negative unread counts #216

yang991178 · Dec 15, 2021 · 4e842e6 · 4e842e6
1 parent 82a6a2c
commit 4e842e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/scripts/models/item.ts b/src/scripts/models/item.ts
@@ -312,7 +312,8 @@ const markUnreadDone = (item: RSSItem): ItemActionTypes => ({
 })
 
 export function markRead(item: RSSItem): AppThunk {
-    return dispatch => {
+    return (dispatch, getState) => {
+        item = getState().items[item._id]
         if (!item.hasRead) {
             db.itemsDB
                 .update(db.items)
@@ -377,7 +378,8 @@ export function markAllRead(
 }
 
 export function markUnread(item: RSSItem): AppThunk {
-    return dispatch => {
+    return (dispatch, getState) => {
+        item = getState().items[item._id]
         if (item.hasRead) {
             db.itemsDB
                 .update(db.items)

diff --git a/src/scripts/models/source.ts b/src/scripts/models/source.ts
@@ -483,7 +483,7 @@ export function sourceReducer(
             }
         case MARK_ALL_READ: {
             let nextState = { ...state }
-            action.sids.map((sid, i) => {
+            action.sids.forEach((sid) => {
                 nextState[sid] = {
                     ...state[sid],
                     unreadCount: action.time ? state[sid].unreadCount : 0,