feat: 重複して取得されてしまう問題を修正

pantasystem · Sep 7, 2024 · e49379c · e49379c
1 parent f1a9e9d
commit e49379c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...va/net/pantasystem/milktea/data/infrastructure/notification/impl/NotificationStoreImpl.kt b/...va/net/pantasystem/milktea/data/infrastructure/notification/impl/NotificationStoreImpl.kt
@@ -56,7 +56,7 @@ class NotificationStoreImpl(
     override suspend fun convertAll(list: List<Notification>): List<Notification.Id> {
         return list.map {
             it.id
-        }
+        }.distinct()
     }
 
     override suspend fun loadPrevious(): Result<List<Notification>> = runCancellableCatching {

diff --git a/...ystem/milktea/data/infrastructure/notification/impl/NotificationTimelineRepositoryImpl.kt b/...ystem/milktea/data/infrastructure/notification/impl/NotificationTimelineRepositoryImpl.kt
@@ -86,7 +86,9 @@ class NotificationTimelineRepositoryImpl @Inject constructor(
             lastFetchTimeMap += accountId to now
         }
 
-        fetched
+        fetched.filterNot {
+            it.id.notificationId == untilId
+        }
     }
 
     override suspend fun findLaterTimeline(
@@ -141,7 +143,9 @@ class NotificationTimelineRepositoryImpl @Inject constructor(
             lastFetchTimeMap += accountId to now
         }
 
-        fetched
+        fetched.filterNot {
+            it.id.notificationId == sinceId
+        }
     }
 
     private suspend fun fetch(