Add more handling of comment events (#126)

gpunto · web-flow · commit 6857dfb77e6f · 2025-10-28T10:54:15.000+01:00
* Handle CommentDeleted for CommentReactionList

* Handle CommentDeleted for CommentReplyList

* Handle CommentAdded for CommentList

* Handle comment events for Activity
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
@@ -112,11 +112,11 @@ internal fun ActivityData.upsertComment(comment: CommentData): ActivityData {
 /**
  * Removes a comment from the activity, updating the comment count and the list of comments.
  *
- * @param comment The comment to be removed.
+ * @param commentId The ID of the comment to be removed.
  * @return A new [ActivityData] instance with the updated comments and comment count.
  */
-internal fun ActivityData.removeComment(comment: CommentData): ActivityData {
-    val updatedComments = this.comments.filter { it.id != comment.id }
+internal fun ActivityData.removeComment(commentId: String): ActivityData {
+    val updatedComments = this.comments.filter { it.id != commentId }
     return this.copy(comments = updatedComments, commentCount = max(0, this.commentCount - 1))
 }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/ActivityListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/ActivityListStateImpl.kt
@@ -128,7 +128,7 @@ internal class ActivityListStateImpl(
         _activities.update { current ->
             current.map { activity ->
                 if (activity.id == comment.objectId) {
-                    activity.removeComment(comment)
+                    activity.removeComment(comment.id)
                 } else {
                     activity
                 }
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/ActivityStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/ActivityStateImpl.kt
@@ -17,17 +17,22 @@ package io.getstream.feeds.android.client.internal.state
 
 import io.getstream.feeds.android.client.api.model.ActivityData
 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.PollData
 import io.getstream.feeds.android.client.api.model.PollVoteData
 import io.getstream.feeds.android.client.api.model.ThreadedCommentData
 import io.getstream.feeds.android.client.api.state.ActivityCommentListState
 import io.getstream.feeds.android.client.api.state.ActivityState
 import io.getstream.feeds.android.client.internal.model.deleteBookmark
+import io.getstream.feeds.android.client.internal.model.removeComment
+import io.getstream.feeds.android.client.internal.model.removeCommentReaction
 import io.getstream.feeds.android.client.internal.model.removeReaction
 import io.getstream.feeds.android.client.internal.model.removeVote
 import io.getstream.feeds.android.client.internal.model.update
 import io.getstream.feeds.android.client.internal.model.upsertBookmark
+import io.getstream.feeds.android.client.internal.model.upsertComment
+import io.getstream.feeds.android.client.internal.model.upsertCommentReaction
 import io.getstream.feeds.android.client.internal.model.upsertReaction
 import io.getstream.feeds.android.client.internal.model.upsertVote
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -94,6 +99,26 @@ internal class ActivityStateImpl(
         _activity.update { current -> current?.upsertBookmark(bookmark, currentUserId) }
     }
 
+    override fun onCommentRemoved(commentId: String) {
+        _activity.update { current -> current?.removeComment(commentId) }
+    }
+
+    override fun onCommentUpserted(comment: CommentData) {
+        _activity.update { current -> current?.upsertComment(comment) }
+    }
+
+    override fun onCommentReactionRemoved(comment: CommentData, reaction: FeedsReactionData) {
+        _activity.update { current ->
+            current?.removeCommentReaction(comment, reaction, currentUserId)
+        }
+    }
+
+    override fun onCommentReactionUpserted(comment: CommentData, reaction: FeedsReactionData) {
+        _activity.update { current ->
+            current?.upsertCommentReaction(comment, reaction, currentUserId)
+        }
+    }
+
     override fun onPollDeleted(pollId: String) {
         updatePoll(pollId) { null }
     }
@@ -175,6 +200,36 @@ internal interface ActivityStateUpdates {
      */
     fun onBookmarkUpserted(bookmark: BookmarkData)
 
+    /**
+     * Called when a comment is removed from the activity.
+     *
+     * @param commentId The ID of the comment that was removed.
+     */
+    fun onCommentRemoved(commentId: String)
+
+    /**
+     * Called when a comment is added to or updated in the activity.
+     *
+     * @param comment The comment that was added or updated.
+     */
+    fun onCommentUpserted(comment: CommentData)
+
+    /**
+     * Called when a reaction is removed from a comment.
+     *
+     * @param comment The comment from which the reaction was removed.
+     * @param reaction The reaction that was removed.
+     */
+    fun onCommentReactionRemoved(comment: CommentData, reaction: FeedsReactionData)
+
+    /**
+     * Called when a reaction is added to or updated in a comment.
+     *
+     * @param comment The comment to which the reaction was added or updated.
+     * @param reaction The reaction that was added or updated.
+     */
+    fun onCommentReactionUpserted(comment: CommentData, reaction: FeedsReactionData)
+
     /**
      * Called when the associated poll is deleted.
      *
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentListImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentListImpl.kt
@@ -45,7 +45,7 @@ internal class CommentListImpl(
 
     private val _state: CommentListStateImpl = CommentListStateImpl(query, currentUserId)
 
-    private val eventHandler = CommentListEventHandler(_state)
+    private val eventHandler = CommentListEventHandler(query.filter, _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentListStateImpl.kt
@@ -73,7 +73,7 @@ internal class CommentListStateImpl(
         }
     }
 
-    override fun onCommentUpdated(comment: CommentData) {
+    override fun onCommentUpserted(comment: CommentData) {
         _comments.update { current ->
             current.upsertSorted(
                 element = comment,
@@ -120,11 +120,11 @@ internal interface CommentListStateUpdates {
     fun onQueryMoreComments(result: PaginationResult<CommentData>)
 
     /**
-     * Handles the update of a comment in the list.
+     * Handles the addition or update of a comment in the list.
      *
-     * @param comment The updated comment data.
+     * @param comment The comment data.
      */
-    fun onCommentUpdated(comment: CommentData)
+    fun onCommentUpserted(comment: CommentData)
 
     /**
      * Handles the removal of a comment from the list.
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentReactionListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentReactionListStateImpl.kt
@@ -56,6 +56,10 @@ internal class CommentReactionListStateImpl(override val query: CommentReactions
     override val pagination: PaginationData?
         get() = _pagination
 
+    override fun onCommentRemoved() {
+        _reactions.update { emptyList() }
+    }
+
     override fun onQueryMoreReactions(
         result: PaginationResult<FeedsReactionData>,
         queryConfig: CommentReactionsQueryConfig,
@@ -83,6 +87,9 @@ internal interface CommentReactionListMutableState :
 
 internal interface CommentReactionListStateUpdates {
 
+    /** Handles the deletion of the parent comment. */
+    fun onCommentRemoved()
+
     /**
      * Handles the successful loading of reactions.
      *
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentReplyListStateImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/CommentReplyListStateImpl.kt
@@ -75,6 +75,15 @@ internal class CommentReplyListStateImpl(
     }
 
     override fun onCommentRemoved(commentId: String) {
+        if (commentId == query.commentId) {
+            // If the deleted comment is the parent comment, we clear the entire state
+            _replies.update { emptyList() }
+        } else {
+            onReplyRemoved(commentId)
+        }
+    }
+
+    private fun onReplyRemoved(commentId: String) {
         _replies.update { current ->
             val filteredTopLevel = current.filter { it.id != commentId }
             if (filteredTopLevel.size != current.size) {
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
@@ -203,7 +203,7 @@ internal class FeedStateImpl(
 
     override fun onCommentRemoved(comment: CommentData) {
         updateActivitiesWhere({ it.id == comment.objectId }) { activity ->
-            activity.removeComment(comment)
+            activity.removeComment(comment.id)
         }
     }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityEventHandler.kt
@@ -84,6 +84,36 @@ internal class ActivityEventHandler(
                 state.onBookmarkUpserted(event.bookmark)
             }
 
+            is StateUpdateEvent.CommentAdded -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentUpserted(event.comment)
+            }
+
+            is StateUpdateEvent.CommentDeleted -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentRemoved(event.comment.id)
+            }
+
+            is StateUpdateEvent.CommentUpdated -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentUpserted(event.comment)
+            }
+
+            is StateUpdateEvent.CommentReactionAdded -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentReactionUpserted(event.comment, event.reaction)
+            }
+
+            is StateUpdateEvent.CommentReactionDeleted -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentReactionRemoved(event.comment, event.reaction)
+            }
+
+            is StateUpdateEvent.CommentReactionUpdated -> {
+                if (fid.rawValue != event.fid || event.comment.objectId != activityId) return
+                state.onCommentReactionUpserted(event.comment, event.reaction)
+            }
+
             is StateUpdateEvent.PollDeleted -> {
                 if (event.fid != fid.rawValue) return
                 state.onPollDeleted(event.pollId)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentListEventHandler.kt
@@ -15,17 +15,27 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.feeds.android.client.api.state.query.CommentsFilter
 import io.getstream.feeds.android.client.internal.state.CommentListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
+import io.getstream.feeds.android.client.internal.state.query.matches
 import io.getstream.feeds.android.client.internal.subscribe.StateUpdateEventListener
 
-internal class CommentListEventHandler(private val state: CommentListStateUpdates) :
-    StateUpdateEventListener {
+internal class CommentListEventHandler(
+    private val filter: CommentsFilter?,
+    private val state: CommentListStateUpdates,
+) : StateUpdateEventListener {
 
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
+            is StateUpdateEvent.CommentAdded -> {
+                if (event.comment matches filter) {
+                    state.onCommentUpserted(event.comment)
+                }
+            }
+
             is StateUpdateEvent.CommentDeleted -> state.onCommentRemoved(event.comment.id)
-            is StateUpdateEvent.CommentUpdated -> state.onCommentUpdated(event.comment)
+            is StateUpdateEvent.CommentUpdated -> state.onCommentUpserted(event.comment)
             is StateUpdateEvent.CommentReactionAdded ->
                 state.onCommentReactionUpserted(event.comment, event.reaction)
 
@@ -34,6 +44,7 @@ internal class CommentListEventHandler(private val state: CommentListStateUpdate
 
             is StateUpdateEvent.CommentReactionUpdated ->
                 state.onCommentReactionUpserted(event.comment, event.reaction)
+
             else -> Unit
         }
     }
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentReactionListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentReactionListEventHandler.kt
@@ -25,6 +25,12 @@ internal class CommentReactionListEventHandler(
 ) : StateUpdateEventListener {
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
+            is StateUpdateEvent.CommentDeleted -> {
+                if (event.comment.id == commentId) {
+                    state.onCommentRemoved()
+                }
+            }
+
             is StateUpdateEvent.CommentReactionAdded -> {
                 if (event.comment.id == commentId) {
                     state.onReactionUpserted(event.reaction)
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/ActivityStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/ActivityStateImplTest.kt
@@ -20,6 +20,7 @@ import io.getstream.feeds.android.client.api.model.PollData
 import io.getstream.feeds.android.client.api.state.ActivityCommentListState
 import io.getstream.feeds.android.client.internal.test.TestData.activityData
 import io.getstream.feeds.android.client.internal.test.TestData.bookmarkData
+import io.getstream.feeds.android.client.internal.test.TestData.commentData
 import io.getstream.feeds.android.client.internal.test.TestData.feedsReactionData
 import io.getstream.feeds.android.client.internal.test.TestData.pollData
 import io.getstream.feeds.android.client.internal.test.TestData.pollVoteData
@@ -434,6 +435,72 @@ internal class ActivityStateImplTest {
         assertEquals(expectedPoll, activityState.poll.value)
     }
 
+    @Test
+    fun `on onCommentUpserted, add comment to activity`() = runTest {
+        val initialActivity = activityData("activity-1", comments = emptyList())
+        setupInitialActivity(initialActivity)
+
+        val comment = commentData("comment-1", objectId = "activity-1")
+        activityState.onCommentUpserted(comment)
+
+        val expectedActivity = initialActivity.copy(commentCount = 1, comments = listOf(comment))
+        assertEquals(expectedActivity, activityState.activity.value)
+    }
+
+    @Test
+    fun `on onCommentUpserted, update existing comment in activity`() = runTest {
+        val originalComment = commentData("comment-1", text = "Original", objectId = "activity-1")
+        val initialActivity = activityData("activity-1", comments = listOf(originalComment))
+        setupInitialActivity(initialActivity)
+
+        val updatedComment = commentData("comment-1", text = "Updated", objectId = "activity-1")
+        activityState.onCommentUpserted(updatedComment)
+
+        val expectedActivity = initialActivity.copy(comments = listOf(updatedComment))
+        assertEquals(expectedActivity, activityState.activity.value)
+    }
+
+    @Test
+    fun `on onCommentRemoved, remove comment from activity`() = runTest {
+        val comment = commentData("comment-1", objectId = "activity-1")
+        val initialActivity = activityData("activity-1", comments = listOf(comment))
+        setupInitialActivity(initialActivity)
+
+        activityState.onCommentRemoved("comment-1")
+
+        val expectedActivity = initialActivity.copy(commentCount = 0, comments = emptyList())
+        assertEquals(expectedActivity, activityState.activity.value)
+    }
+
+    @Test
+    fun `on onCommentReactionUpserted, add reaction to comment in activity`() = runTest {
+        val comment = commentData("comment-1", objectId = "activity-1", ownReactions = emptyList())
+        val initialActivity = activityData("activity-1", comments = listOf(comment))
+        setupInitialActivity(initialActivity)
+
+        val reaction = feedsReactionData("comment-1", "like", currentUserId)
+        activityState.onCommentReactionUpserted(comment, reaction)
+
+        val expectedComment = comment.copy(ownReactions = listOf(reaction))
+        val expectedActivity = initialActivity.copy(comments = listOf(expectedComment))
+        assertEquals(expectedActivity, activityState.activity.value)
+    }
+
+    @Test
+    fun `on onCommentReactionRemoved, remove reaction from comment in activity`() = runTest {
+        val reaction = feedsReactionData("comment-1", "like", currentUserId)
+        val comment =
+            commentData("comment-1", objectId = "activity-1", ownReactions = listOf(reaction))
+        val initialActivity = activityData("activity-1", comments = listOf(comment))
+        setupInitialActivity(initialActivity)
+
+        activityState.onCommentReactionRemoved(comment, reaction)
+
+        val expectedComment = comment.copy(ownReactions = emptyList())
+        val expectedActivity = initialActivity.copy(comments = listOf(expectedComment))
+        assertEquals(expectedActivity, activityState.activity.value)
+    }
+
     private fun setupInitialActivity(activity: ActivityData) {
         activityState.onActivityUpdated(activity)
     }
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentListStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentListStateImplTest.kt
@@ -56,7 +56,7 @@ internal class CommentListStateImplTest {
         val updatedComment2 = comment2.copy(text = "Updated Second", createdAt = Date(2))
         setupInitialComments(comment1, comment2)
 
-        state.onCommentUpdated(updatedComment2)
+        state.onCommentUpserted(updatedComment2)
 
         assertEquals(listOf(updatedComment2, comment1), state.comments.value)
     }
@@ -69,7 +69,7 @@ internal class CommentListStateImplTest {
         val updatedComment = commentData("comment-1", "Updated text", ownReactions = emptyList())
         setupInitialComments(originalComment)
 
-        state.onCommentUpdated(updatedComment)
+        state.onCommentUpserted(updatedComment)
 
         val expectedComment = updatedComment.copy(ownReactions = listOf(ownReaction))
         assertEquals(listOf(expectedComment), state.comments.value)
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentReactionListStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentReactionListStateImplTest.kt
@@ -74,6 +74,18 @@ internal class CommentReactionListStateImplTest {
         assertEquals(listOf(initialReaction, newReaction), commentReactionListState.reactions.value)
     }
 
+    @Test
+    fun `on onCommentRemoved, clear all reactions`() = runTest {
+        val reactions =
+            listOf(feedsReactionData(), feedsReactionData("reaction-2", "comment-1", "user-2"))
+        val paginationResult = defaultPaginationResult(reactions)
+
+        commentReactionListState.onQueryMoreReactions(paginationResult, queryConfig)
+        commentReactionListState.onCommentRemoved()
+
+        assertEquals(emptyList<FeedsReactionData>(), commentReactionListState.reactions.value)
+    }
+
     companion object {
         private val queryConfig =
             CommentReactionsQueryConfig(filter = null, sort = CommentReactionsSort.Default)
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentReplyListStateImplTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/CommentReplyListStateImplTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityEventHandlerTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentListEventHandlerTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentReactionListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/CommentReactionListEventHandlerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,11 @@ internal fun ActivityData.upsertComment(comment: CommentData): ActivityData {`
`112`	`112`	`/**`
`113`	`113`	`* Removes a comment from the activity, updating the comment count and the list of comments.`
`114`	`114`	`*`
`115`		`- * @param comment The comment to be removed.`
	`115`	`+ * @param commentId The ID of the comment to be removed.`
`116`	`116`	`* @return A new [ActivityData] instance with the updated comments and comment count.`
`117`	`117`	`*/`
`118`		`-internal fun ActivityData.removeComment(comment: CommentData): ActivityData {`
`119`		`- val updatedComments = this.comments.filter { it.id != comment.id }`
	`118`	`+internal fun ActivityData.removeComment(commentId: String): ActivityData {`
	`119`	`+ val updatedComments = this.comments.filter { it.id != commentId }`
`120`	`120`	`return this.copy(comments = updatedComments, commentCount = max(0, this.commentCount - 1))`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ internal class ActivityListStateImpl(`
`128`	`128`	`_activities.update { current ->`
`129`	`129`	`current.map { activity ->`
`130`	`130`	`if (activity.id == comment.objectId) {`
`131`		`- activity.removeComment(comment)`
	`131`	`+ activity.removeComment(comment.id)`
`132`	`132`	`} else {`
`133`	`133`	`activity`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ internal class FeedStateImpl(`
`203`	`203`
`204`	`204`	`override fun onCommentRemoved(comment: CommentData) {`
`205`	`205`	`updateActivitiesWhere({ it.id == comment.objectId }) { activity ->`
`206`		`- activity.removeComment(comment)`
	`206`	`+ activity.removeComment(comment.id)`
`207`	`207`	`}`
`208`	`208`	`}`
`209`	`209`