Update feed data on follow added/removed (#140)

gpunto · web-flow · commit b1cdc87f01d1 · 2025-11-05T15:11:27.000+01:00
Breaking change: make FeedResponse.toModel internal
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/model/FeedData.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/api/model/FeedData.kt
@@ -15,9 +15,7 @@
  */
 package io.getstream.feeds.android.client.api.model
 
-import io.getstream.feeds.android.client.internal.model.toModel
 import io.getstream.feeds.android.network.models.FeedOwnCapability
-import io.getstream.feeds.android.network.models.FeedResponse
 import java.util.Date
 
 /**
@@ -60,26 +58,3 @@ public data class FeedData(
     public val updatedAt: Date,
     public val visibility: String?,
 )
-
-/** Converts a [FeedResponse] to a [FeedData] model. */
-public fun FeedResponse.toModel(): FeedData =
-    FeedData(
-        createdAt = createdAt,
-        createdBy = createdBy.toModel(),
-        custom = custom,
-        deletedAt = deletedAt,
-        description = description,
-        fid = FeedId(feed),
-        filterTags = filterTags,
-        followerCount = followerCount,
-        followingCount = followingCount,
-        groupId = groupId,
-        id = id,
-        memberCount = memberCount,
-        ownCapabilities = ownCapabilities.orEmpty(),
-        ownMembership = ownMembership?.toModel(),
-        name = name,
-        pinCount = pinCount,
-        updatedAt = updatedAt,
-        visibility = visibility,
-    )
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/ActivityOperations.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/ActivityOperations.kt
@@ -20,7 +20,6 @@ import io.getstream.feeds.android.client.api.model.ActivityDataVisibility
 import io.getstream.feeds.android.client.api.model.BookmarkData
 import io.getstream.feeds.android.client.api.model.CommentData
 import io.getstream.feeds.android.client.api.model.FeedsReactionData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.internal.utils.updateIf
 import io.getstream.feeds.android.client.internal.utils.upsert
 import io.getstream.feeds.android.network.models.ActivityResponse
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/AppOperations.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/AppOperations.kt
@@ -16,7 +16,6 @@
 package io.getstream.feeds.android.client.internal.model
 
 import io.getstream.feeds.android.client.api.model.AppData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.network.models.AppResponseFields
 
 /**
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/FeedOperations.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/FeedOperations.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-feeds-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.getstream.feeds.android.client.internal.model
+
+import io.getstream.feeds.android.client.api.model.FeedData
+import io.getstream.feeds.android.client.api.model.FeedId
+import io.getstream.feeds.android.network.models.FeedResponse
+
+/** Converts a [FeedResponse] to a [FeedData] model. */
+internal fun FeedResponse.toModel(): FeedData =
+    FeedData(
+        createdAt = createdAt,
+        createdBy = createdBy.toModel(),
+        custom = custom,
+        deletedAt = deletedAt,
+        description = description,
+        fid = FeedId(feed),
+        filterTags = filterTags,
+        followerCount = followerCount,
+        followingCount = followingCount,
+        groupId = groupId,
+        id = id,
+        memberCount = memberCount,
+        ownCapabilities = ownCapabilities.orEmpty(),
+        ownMembership = ownMembership?.toModel(),
+        name = name,
+        pinCount = pinCount,
+        updatedAt = updatedAt,
+        visibility = visibility,
+    )
+
+/**
+ * Extension function to update the feed while preserving own capabilities because "own" data from
+ * WS events is not reliable.
+ */
+internal fun FeedData.update(updated: FeedData): FeedData =
+    updated.copy(ownCapabilities = this.ownCapabilities)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/FollowOperations.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/model/FollowOperations.kt
@@ -18,7 +18,6 @@ package io.getstream.feeds.android.client.internal.model
 import io.getstream.feeds.android.client.api.model.FeedId
 import io.getstream.feeds.android.client.api.model.FollowData
 import io.getstream.feeds.android.client.api.model.FollowStatus
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.network.models.FollowResponse
 
 internal val FollowData.isFollower: Boolean
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/ActivitiesRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/ActivitiesRepositoryImpl.kt
@@ -23,7 +23,6 @@ import io.getstream.feeds.android.client.api.model.FeedAddActivityRequest
 import io.getstream.feeds.android.client.api.model.FeedId
 import io.getstream.feeds.android.client.api.model.FeedsReactionData
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivitiesQuery
 import io.getstream.feeds.android.client.internal.file.uploadAll
 import io.getstream.feeds.android.client.internal.model.PaginationResult
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/AppRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/AppRepositoryImpl.kt
@@ -17,7 +17,6 @@ package io.getstream.feeds.android.client.internal.repository
 
 import io.getstream.android.core.result.runSafely
 import io.getstream.feeds.android.client.api.model.AppData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.internal.model.toModel
 import io.getstream.feeds.android.network.apis.FeedsApi
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/BookmarksRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/BookmarksRepositoryImpl.kt
@@ -19,7 +19,6 @@ import io.getstream.android.core.result.runSafely
 import io.getstream.feeds.android.client.api.model.BookmarkData
 import io.getstream.feeds.android.client.api.model.BookmarkFolderData
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.BookmarkFoldersQuery
 import io.getstream.feeds.android.client.api.state.query.BookmarksQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/CommentsRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/CommentsRepositoryImpl.kt
@@ -24,7 +24,6 @@ import io.getstream.feeds.android.client.api.model.FeedsReactionData
 import io.getstream.feeds.android.client.api.model.PaginationData
 import io.getstream.feeds.android.client.api.model.ThreadedCommentData
 import io.getstream.feeds.android.client.api.model.request.ActivityAddCommentRequest
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivityCommentsQuery
 import io.getstream.feeds.android.client.api.state.query.CommentReactionsQuery
 import io.getstream.feeds.android.client.api.state.query.CommentRepliesQuery
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImpl.kt
@@ -24,7 +24,6 @@ import io.getstream.feeds.android.client.api.model.FeedSuggestionData
 import io.getstream.feeds.android.client.api.model.FollowData
 import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivitiesSort
 import io.getstream.feeds.android.client.api.state.query.FeedQuery
 import io.getstream.feeds.android.client.api.state.query.FeedsQuery
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/ModerationRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/ModerationRepositoryImpl.kt
@@ -18,7 +18,6 @@ package io.getstream.feeds.android.client.internal.repository
 import io.getstream.android.core.result.runSafely
 import io.getstream.feeds.android.client.api.model.ModerationConfigData
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ModerationConfigsQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
 import io.getstream.feeds.android.client.internal.model.toModel
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/PollsRepositoryImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/repository/PollsRepositoryImpl.kt
@@ -20,7 +20,6 @@ import io.getstream.feeds.android.client.api.model.PaginationData
 import io.getstream.feeds.android.client.api.model.PollData
 import io.getstream.feeds.android.client.api.model.PollOptionData
 import io.getstream.feeds.android.client.api.model.PollVoteData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.PollVotesQuery
 import io.getstream.feeds.android.client.api.state.query.PollsQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImpl.kt
@@ -338,12 +338,28 @@ internal class FeedStateImpl(
             _followers.update { it.upsert(follow, FollowData::id) }
             _followRequests.update { current -> current.filter { it.id != follow.id } }
         }
+
+        updateFeedOnFollowChanged(follow)
     }
 
     private fun removeFollow(follow: FollowData) {
         _following.update { current -> current.filter { it.id != follow.id } }
         _followers.update { current -> current.filter { it.id != follow.id } }
         _followRequests.update { current -> current.filter { it.id != follow.id } }
+
+        updateFeedOnFollowChanged(follow)
+    }
+
+    private fun updateFeedOnFollowChanged(follow: FollowData) {
+        val updated =
+            when (fid) {
+                follow.targetFeed.fid -> follow.targetFeed
+                follow.sourceFeed.fid -> follow.sourceFeed
+                else -> null
+            }
+        if (updated != null) {
+            _feed.update { current -> current?.update(updated) ?: updated }
+        }
     }
 
     private fun updateFollow(follow: FollowData) {
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/StateUpdateEvent.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/StateUpdateEvent.kt
@@ -28,7 +28,6 @@ import io.getstream.feeds.android.client.api.model.FollowData
 import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.model.PollData
 import io.getstream.feeds.android.client.api.model.PollVoteData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.internal.model.toModel
 import io.getstream.feeds.android.network.models.ActivityAddedEvent
 import io.getstream.feeds.android.network.models.ActivityDeletedEvent
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/model/FeedOperationsTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/model/FeedOperationsTest.kt
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2014-2025 Stream.io Inc. All rights reserved.
+ *
+ * Licensed under the Stream License;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    https://github.com/GetStream/stream-feeds-android/blob/main/LICENSE
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.getstream.feeds.android.client.internal.model
+
+import io.getstream.feeds.android.client.internal.test.TestData.feedData
+import io.getstream.feeds.android.network.models.FeedOwnCapability
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+internal class FeedOperationsTest {
+
+    @Test
+    fun `on update with different ownCapabilities, then preserve original ownCapabilities`() {
+        val originalCapabilities =
+            listOf(FeedOwnCapability.AddActivity, FeedOwnCapability.DeleteFeed)
+        val originalFeed = feedData().copy(ownCapabilities = originalCapabilities)
+
+        val newCapabilities = listOf(FeedOwnCapability.UpdateFeed)
+        val updatedFeed = feedData().copy(ownCapabilities = newCapabilities, name = "Updated Name")
+
+        val result = originalFeed.update(updatedFeed)
+
+        val expected = updatedFeed.copy(ownCapabilities = originalCapabilities)
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `on update, then apply all other field changes`() {
+        val originalFeed =
+            feedData(id = "feed-1", name = "Original Name", description = "Original Description")
+                .copy(
+                    ownCapabilities = listOf(FeedOwnCapability.AddActivity),
+                    followerCount = 10,
+                    followingCount = 20,
+                    memberCount = 5,
+                    pinCount = 2,
+                )
+
+        val updatedFeed =
+            feedData(id = "feed-1", name = "Updated Name", description = "Updated Description")
+                .copy(
+                    ownCapabilities = emptyList(),
+                    followerCount = 15,
+                    followingCount = 25,
+                    memberCount = 8,
+                    pinCount = 3,
+                )
+
+        val result = originalFeed.update(updatedFeed)
+
+        val expected = updatedFeed.copy(ownCapabilities = listOf(FeedOwnCapability.AddActivity))
+        assertEquals(expected, result)
+    }
+
+    @Test
+    fun `on update with no ownCapabilities in original, then use empty list`() {
+        val originalFeed = feedData().copy(ownCapabilities = emptyList())
+        val updatedFeed =
+            feedData()
+                .copy(ownCapabilities = listOf(FeedOwnCapability.AddActivity), name = "Updated")
+
+        val result = originalFeed.update(updatedFeed)
+
+        val expected = updatedFeed.copy(ownCapabilities = emptyList())
+        assertEquals(expected, result)
+    }
+}
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/ActivitiesRepositoryImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/ActivitiesRepositoryImplTest.kt
@@ -23,7 +23,6 @@ import io.getstream.feeds.android.client.api.model.ActivityData
 import io.getstream.feeds.android.client.api.model.FeedAddActivityRequest
 import io.getstream.feeds.android.client.api.model.FeedId
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivitiesQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
 import io.getstream.feeds.android.client.internal.model.toModel
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/BookmarksRepositoryImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/BookmarksRepositoryImplTest.kt
@@ -16,7 +16,6 @@
 package io.getstream.feeds.android.client.internal.repository
 
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.BookmarkFoldersQuery
 import io.getstream.feeds.android.client.api.state.query.BookmarksQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/CommentsRepositoryImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/CommentsRepositoryImplTest.kt
@@ -21,7 +21,6 @@ import io.getstream.feeds.android.client.api.file.FileType
 import io.getstream.feeds.android.client.api.file.UploadedFile
 import io.getstream.feeds.android.client.api.model.PaginationData
 import io.getstream.feeds.android.client.api.model.request.ActivityAddCommentRequest
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivityCommentsQuery
 import io.getstream.feeds.android.client.api.state.query.CommentReactionsQuery
 import io.getstream.feeds.android.client.api.state.query.CommentRepliesQuery
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/FeedsRepositoryImplTest.kt
@@ -19,7 +19,6 @@ import io.getstream.feeds.android.client.api.model.FeedId
 import io.getstream.feeds.android.client.api.model.FeedMemberData
 import io.getstream.feeds.android.client.api.model.ModelUpdates
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.ActivitiesSort
 import io.getstream.feeds.android.client.api.state.query.FeedQuery
 import io.getstream.feeds.android.client.api.state.query.FeedsQuery
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/PollsRepositoryImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/repository/PollsRepositoryImplTest.kt
@@ -16,7 +16,6 @@
 package io.getstream.feeds.android.client.internal.repository
 
 import io.getstream.feeds.android.client.api.model.PaginationData
-import io.getstream.feeds.android.client.api.model.toModel
 import io.getstream.feeds.android.client.api.state.query.PollVotesQuery
 import io.getstream.feeds.android.client.api.state.query.PollsQuery
 import io.getstream.feeds.android.client.internal.model.PaginationResult
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/FeedStateImplTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/test/TestData.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/test/TestData.kt
