fix(greader): sync read/starred status when syncing individual feeds

app/src/main/java/me/ash/reader/domain/service/GoogleReaderRssService.kt

@@ -10,6 +10,8 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import java.util.Calendar
 import java.util.Date
 import javax.inject.Inject
+import kotlin.collections.chunked
+import kotlin.collections.toSet
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Deferred
@@ -42,9 +44,11 @@ import me.ash.reader.infrastructure.net.onFailure
 import me.ash.reader.infrastructure.net.onSuccess
 import me.ash.reader.infrastructure.rss.RssHelper
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI
+import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.dbId
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.ofCategoryIdToStreamId
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.ofCategoryStreamIdToId
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.ofFeedStreamIdToId
+import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.remoteId
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderAPI.Companion.shortId
 import me.ash.reader.infrastructure.rss.provider.greader.GoogleReaderDTO
 import me.ash.reader.ui.ext.decodeHTML
@@ -488,12 +492,22 @@ constructor(
         val googleReaderAPI = getGoogleReaderAPI()
 
         val feed = feedDao.queryById(feedId)!!
-        val localUnreadIds = articleDao.queryMetadataByFeedId(accountId, feedId, isUnread = true)
-        val localReadIds = articleDao.queryMetadataByFeedId(accountId, feedId, isUnread = false)
+        val localStarredIds =
+            articleDao.queryMetadataByFeedId(accountId, feedId, isUnread = true).map {
+                it.id.remoteId
+            }
+        val localUnreadIds =
+            articleDao.queryMetadataByFeedId(accountId, feedId, isUnread = true).map {
+                it.id.remoteId
+            }
+        val localReadIds =
+            articleDao.queryMetadataByFeedId(accountId, feedId, isUnread = false).map {
+                it.id.remoteId
+            }
 
-        val localIds = (localReadIds + localUnreadIds).map { it.id.dollarLast() }
+        val localIds = (localReadIds + localUnreadIds)
 
-        val unreadIds = async {
+        val remoteUnreadIds = async {
             fetchItemIdsAndContinue {
                     googleReaderAPI.getItemIdsForFeed(
                         feedId = feedId.dollarLast(),
@@ -505,7 +519,7 @@ constructor(
                 .toSet()
         }
 
-        val allIds = async {
+        val remoteAllIds = async {
             fetchItemIdsAndContinue {
                     googleReaderAPI.getItemIdsForFeed(
                         feedId = feedId.dollarLast(),
@@ -517,21 +531,21 @@ constructor(
                 .toSet()
         }
 
-        val starredIds = async {
+        val remoteStarredIds = async {
             fetchItemIdsAndContinue { googleReaderAPI.getStarredItemIds(continuationId = it) }
                 .map { it.shortId }
                 .toSet()
         }
 
-        val toFetch = allIds.await() - localIds
+        val toFetch = remoteAllIds.await() - localIds
 
         val items =
             fetchItemsContents(
                 itemIds = toFetch,
                 googleReaderAPI = googleReaderAPI,
                 accountId = accountId,
-                unreadIds = unreadIds.await(),
-                starredIds = starredIds.await(),
+                unreadIds = remoteUnreadIds.await(),
+                starredIds = remoteStarredIds.await(),
             )
 
         if (feed.isNotification) {
@@ -539,6 +553,37 @@ constructor(
             notificationHelper.notify(feed, articlesToNotify)
         }
 
+        launch {
+            val remoteReadIds = remoteAllIds.await() - remoteUnreadIds.await()
+            val toBeReadIds = remoteReadIds.intersect(localUnreadIds)
+
+            toBeReadIds
+                .map { it.dbId(accountId) }
+                .chunked(1000)
+                .forEach {
+                    articleDao.markAsReadByIdSet(
+                        accountId = accountId,
+                        ids = it.toSet(),
+                        isUnread = false,
+                    )
+                }
+        }
+
+        launch {
+            val toBeStarred = remoteStarredIds.await().intersect(localIds) - localStarredIds
+
+            toBeStarred
+                .map { it.dbId(accountId) }
+                .chunked(1000)
+                .forEach {
+                    articleDao.markAsStarredByIdSet(
+                        accountId = accountId,
+                        ids = it.toSet(),
+                        isStarred = true,
+                    )
+                }
+        }
+
         articleDao.insert(*items.toTypedArray())
         Timber.i("onCompletion: ${System.currentTimeMillis() - preTime}")
 

app/src/main/java/me/ash/reader/infrastructure/rss/provider/greader/GoogleReaderAPI.kt

@@ -19,6 +19,8 @@ import me.ash.reader.infrastructure.net.onFailure
 import me.ash.reader.infrastructure.net.onSuccess
 import me.ash.reader.infrastructure.net.withRetries
 import me.ash.reader.infrastructure.rss.provider.ProviderAPI
+import me.ash.reader.ui.ext.dollarLast
+import me.ash.reader.ui.ext.spacerDollar
 import okhttp3.FormBody
 import okhttp3.Request
 import okhttp3.executeAsync
@@ -498,6 +500,11 @@ private constructor(
                     this.removePrefix(PREFIX).hexToLong().toString()
                 }
 
+        fun ItemId.dbId(accountId: Int) = accountId spacerDollar this
+
+        val String.remoteId
+            get() = this.dollarLast()
+
         fun String.ofFeedIdToStreamId(): String {
             return "feed/$this"
         }