Match remaining "Updated" events with filters and treat failing matches as removals (#131)

gpunto · web-flow · commit 7158fe740f52 · 2025-10-31T09:34:02.000+01:00
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/BookmarkFolderListImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/BookmarkFolderListImpl.kt
@@ -45,7 +45,7 @@ internal class BookmarkFolderListImpl(
 
     private val _state: BookmarkFolderListStateImpl = BookmarkFolderListStateImpl(query)
 
-    private val eventHandler = BookmarkFolderListEventHandler(_state)
+    private val eventHandler = BookmarkFolderListEventHandler(query.filter, _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/BookmarkListImpl.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/BookmarkListImpl.kt
@@ -44,7 +44,7 @@ internal class BookmarkListImpl(
 
     private val _state: BookmarkListStateImpl = BookmarkListStateImpl(query)
 
-    private val eventHandler = BookmarkListEventHandler(_state)
+    private val eventHandler = BookmarkListEventHandler(query.filter, _state)
 
     init {
         subscriptionManager.subscribe(eventHandler)
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityListEventHandler.kt
@@ -38,6 +38,9 @@ internal class ActivityListEventHandler(
             is StateUpdateEvent.ActivityUpdated -> {
                 if (event.activity matches filter) {
                     state.onActivityUpserted(event.activity)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onActivityRemoved(event.activity.id)
                 }
             }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkFolderListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkFolderListEventHandler.kt
@@ -15,18 +15,30 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.feeds.android.client.api.state.query.BookmarkFoldersFilter
 import io.getstream.feeds.android.client.internal.state.BookmarkFolderListStateUpdates
 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 BookmarkFolderListEventHandler(private val state: BookmarkFolderListStateUpdates) :
-    StateUpdateEventListener {
+internal class BookmarkFolderListEventHandler(
+    private val filter: BookmarkFoldersFilter?,
+    private val state: BookmarkFolderListStateUpdates,
+) : StateUpdateEventListener {
 
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
             is StateUpdateEvent.BookmarkFolderDeleted ->
                 state.onBookmarkFolderRemoved(event.folderId)
-            is StateUpdateEvent.BookmarkFolderUpdated -> state.onBookmarkFolderUpdated(event.folder)
+
+            is StateUpdateEvent.BookmarkFolderUpdated -> {
+                if (event.folder matches filter) {
+                    state.onBookmarkFolderUpdated(event.folder)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onBookmarkFolderRemoved(event.folder.id)
+                }
+            }
             else -> {}
         }
     }
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkListEventHandler.kt
@@ -15,22 +15,39 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.feeds.android.client.api.state.query.BookmarksFilter
 import io.getstream.feeds.android.client.internal.state.BookmarkListStateUpdates
 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 BookmarkListEventHandler(private val state: BookmarkListStateUpdates) :
-    StateUpdateEventListener {
+internal class BookmarkListEventHandler(
+    private val filter: BookmarksFilter?,
+    private val state: BookmarkListStateUpdates,
+) : StateUpdateEventListener {
 
     override fun onEvent(event: StateUpdateEvent) {
         when (event) {
             is StateUpdateEvent.BookmarkFolderDeleted ->
                 state.onBookmarkFolderRemoved(event.folderId)
 
             is StateUpdateEvent.BookmarkFolderUpdated -> state.onBookmarkFolderUpdated(event.folder)
-            is StateUpdateEvent.BookmarkAdded -> state.onBookmarkUpserted(event.bookmark)
+            is StateUpdateEvent.BookmarkAdded -> {
+                if (event.bookmark matches filter) {
+                    state.onBookmarkUpserted(event.bookmark)
+                }
+            }
+
             is StateUpdateEvent.BookmarkDeleted -> state.onBookmarkRemoved(event.bookmark)
-            is StateUpdateEvent.BookmarkUpdated -> state.onBookmarkUpserted(event.bookmark)
+            is StateUpdateEvent.BookmarkUpdated -> {
+                if (event.bookmark matches filter) {
+                    state.onBookmarkUpserted(event.bookmark)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onBookmarkRemoved(event.bookmark)
+                }
+            }
+
             else -> {}
         }
     }
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
@@ -35,7 +35,14 @@ internal class CommentListEventHandler(
             }
 
             is StateUpdateEvent.CommentDeleted -> state.onCommentRemoved(event.comment.id)
-            is StateUpdateEvent.CommentUpdated -> state.onCommentUpserted(event.comment)
+            is StateUpdateEvent.CommentUpdated -> {
+                if (event.comment matches filter) {
+                    state.onCommentUpserted(event.comment)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onCommentRemoved(event.comment.id)
+                }
+            }
             is StateUpdateEvent.CommentReactionDeleted ->
                 state.onCommentReactionRemoved(event.comment, event.reaction)
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedEventHandler.kt
@@ -58,8 +58,13 @@ internal class FeedEventHandler(
             }
 
             is StateUpdateEvent.ActivityUpdated -> {
-                if (event.fid == fid.rawValue && event.activity matches activityFilter) {
-                    state.onActivityUpserted(event.activity)
+                if (event.fid == fid.rawValue) {
+                    if (event.activity matches activityFilter) {
+                        state.onActivityUpserted(event.activity)
+                    } else {
+                        // We remove elements that used to match the filter but no longer do
+                        state.onActivityRemoved(event.activity.id)
+                    }
                 }
             }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedListEventHandler.kt
@@ -41,6 +41,9 @@ internal class FeedListEventHandler(
             is StateUpdateEvent.FeedUpdated -> {
                 if (event.feed matches filter) {
                     state.onFeedUpserted(event.feed)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onFeedRemoved(event.feed.fid.rawValue)
                 }
             }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandler.kt
@@ -41,6 +41,9 @@ internal class FollowListEventHandler(
             is StateUpdateEvent.FollowUpdated -> {
                 if (event.follow matches filter) {
                     state.onFollowUpserted(event.follow)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onFollowRemoved(event.follow)
                 }
             }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandler.kt
@@ -42,8 +42,13 @@ internal class MemberListEventHandler(
             }
 
             is StateUpdateEvent.FeedMemberUpdated -> {
-                if (event.fid == fid.rawValue && event.member matches filter) {
-                    state.onMemberUpserted(event.member)
+                if (event.fid == fid.rawValue) {
+                    if (event.member matches filter) {
+                        state.onMemberUpserted(event.member)
+                    } else {
+                        // We remove elements that used to match the filter but no longer do
+                        state.onMemberRemoved(event.member.id)
+                    }
                 }
             }
 
diff --git a/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/PollListEventHandler.kt b/stream-feeds-android-client/src/main/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/PollListEventHandler.kt
@@ -40,6 +40,9 @@ internal class PollListEventHandler(
             is StateUpdateEvent.PollUpdated -> {
                 if (event.poll matches filter) {
                     state.onPollUpdated(event.poll)
+                } else {
+                    // We remove elements that used to match the filter but no longer do
+                    state.onPollDeleted(event.poll.id)
                 }
             }
 
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/ActivityListEventHandlerTest.kt
@@ -91,7 +91,7 @@ internal class ActivityListEventHandlerTest(
                 testParams<ActivityListStateUpdates>(
                     name = "ActivityUpdated with non-matching filter",
                     event = ActivityUpdated("feed-1", activityData("activity-1", type = "story")),
-                    verifyBlock = { state -> state wasNot called },
+                    verifyBlock = { state -> state.onActivityRemoved("activity-1") },
                 ),
                 testParams<ActivityListStateUpdates>(
                     name = "ActivityReactionDeleted",
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkFolderListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkFolderListEventHandlerTest.kt
@@ -15,6 +15,8 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.android.core.api.filter.equal
+import io.getstream.feeds.android.client.api.state.query.BookmarkFoldersFilterField
 import io.getstream.feeds.android.client.internal.state.BookmarkFolderListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.BookmarkFolderDeleted
@@ -31,9 +33,13 @@ internal class BookmarkFolderListEventHandlerTest(
 ) : BaseEventHandlerTest<BookmarkFolderListStateUpdates>(testName, event, verifyBlock) {
 
     override val state: BookmarkFolderListStateUpdates = mockk(relaxed = true)
-    override val handler = BookmarkFolderListEventHandler(state)
+    override val handler = BookmarkFolderListEventHandler(filter, state)
 
     companion object {
+        private val filter = BookmarkFoldersFilterField.folderName.equal("important")
+        private val matchingFolder = bookmarkFolderData(name = "important")
+        private val nonMatchingFolder = bookmarkFolderData(name = "general")
+
         @JvmStatic
         @Parameterized.Parameters(name = "{0}")
         fun data(): List<Array<Any>> =
@@ -44,9 +50,14 @@ internal class BookmarkFolderListEventHandlerTest(
                     verifyBlock = { state -> state.onBookmarkFolderRemoved("folder-123") },
                 ),
                 testParams<BookmarkFolderListStateUpdates>(
-                    name = "BookmarkFolderUpdated calls onBookmarkFolderUpdated",
-                    event = BookmarkFolderUpdated(bookmarkFolderData()),
-                    verifyBlock = { state -> state.onBookmarkFolderUpdated(bookmarkFolderData()) },
+                    name = "BookmarkFolderUpdated matching filter",
+                    event = BookmarkFolderUpdated(matchingFolder),
+                    verifyBlock = { state -> state.onBookmarkFolderUpdated(matchingFolder) },
+                ),
+                testParams<BookmarkFolderListStateUpdates>(
+                    name = "BookmarkFolderUpdated non-matching filter",
+                    event = BookmarkFolderUpdated(nonMatchingFolder),
+                    verifyBlock = { state -> state.onBookmarkFolderRemoved(nonMatchingFolder.id) },
                 ),
             )
     }
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/BookmarkListEventHandlerTest.kt
@@ -15,6 +15,8 @@
  */
 package io.getstream.feeds.android.client.internal.state.event.handler
 
+import io.getstream.android.core.api.filter.equal
+import io.getstream.feeds.android.client.api.state.query.BookmarksFilterField
 import io.getstream.feeds.android.client.internal.state.BookmarkListStateUpdates
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.BookmarkAdded
@@ -23,6 +25,7 @@ import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.B
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.BookmarkFolderUpdated
 import io.getstream.feeds.android.client.internal.state.event.StateUpdateEvent.BookmarkUpdated
 import io.getstream.feeds.android.client.internal.subscribe.StateUpdateEventListener
+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.bookmarkFolderData
 import io.getstream.feeds.android.client.internal.test.TestData.commentData
@@ -38,10 +41,12 @@ internal class BookmarkListEventHandlerTest(
 ) : BaseEventHandlerTest<BookmarkListStateUpdates>(testName, event, verifyBlock) {
 
     override val state: BookmarkListStateUpdates = mockk(relaxed = true)
-    override val handler: StateUpdateEventListener = BookmarkListEventHandler(state)
+    override val handler: StateUpdateEventListener = BookmarkListEventHandler(filter, state)
 
     companion object {
-        private val bookmark = bookmarkData()
+        private val filter = BookmarksFilterField.activityId.equal("activity-1")
+        private val matchingBookmark = bookmarkData(activity = activityData("activity-1"))
+        private val nonMatchingBookmark = bookmarkData(activity = activityData("other-activity"))
         private val folder = bookmarkFolderData()
 
         @JvmStatic
@@ -59,19 +64,29 @@ internal class BookmarkListEventHandlerTest(
                     verifyBlock = { state -> state.onBookmarkFolderUpdated(folder) },
                 ),
                 testParams<BookmarkListStateUpdates>(
-                    name = "BookmarkAdded",
-                    event = BookmarkAdded(bookmark),
-                    verifyBlock = { state -> state.onBookmarkUpserted(bookmark) },
+                    name = "BookmarkAdded matching filter",
+                    event = BookmarkAdded(matchingBookmark),
+                    verifyBlock = { state -> state.onBookmarkUpserted(matchingBookmark) },
+                ),
+                testParams<BookmarkListStateUpdates>(
+                    name = "BookmarkAdded non-matching filter",
+                    event = BookmarkAdded(nonMatchingBookmark),
+                    verifyBlock = { state -> state wasNot called },
                 ),
                 testParams<BookmarkListStateUpdates>(
                     name = "BookmarkDeleted",
-                    event = BookmarkDeleted(bookmark),
-                    verifyBlock = { state -> state.onBookmarkRemoved(bookmark) },
+                    event = BookmarkDeleted(matchingBookmark),
+                    verifyBlock = { state -> state.onBookmarkRemoved(matchingBookmark) },
+                ),
+                testParams<BookmarkListStateUpdates>(
+                    name = "BookmarkUpdated matching filter",
+                    event = BookmarkUpdated(matchingBookmark),
+                    verifyBlock = { state -> state.onBookmarkUpserted(matchingBookmark) },
                 ),
                 testParams<BookmarkListStateUpdates>(
-                    name = "BookmarkUpdated",
-                    event = BookmarkUpdated(bookmark),
-                    verifyBlock = { state -> state.onBookmarkUpserted(bookmark) },
+                    name = "BookmarkUpdated non-matching filter",
+                    event = BookmarkUpdated(nonMatchingBookmark),
+                    verifyBlock = { state -> state.onBookmarkRemoved(nonMatchingBookmark) },
                 ),
                 testParams<BookmarkListStateUpdates>(
                     name = "unknown event",
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
@@ -62,10 +62,15 @@ internal class CommentListEventHandlerTest(
                     verifyBlock = { state -> state wasNot called },
                 ),
                 testParams<CommentListStateUpdates>(
-                    name = "CommentUpdated",
+                    name = "CommentUpdated matching filter",
                     event = CommentUpdated("feed-1", comment),
                     verifyBlock = { state -> state.onCommentUpserted(comment) },
                 ),
+                testParams<CommentListStateUpdates>(
+                    name = "CommentUpdated non-matching filter",
+                    event = CommentUpdated("feed-1", nonMatchingComment),
+                    verifyBlock = { state -> state.onCommentRemoved(nonMatchingComment.id) },
+                ),
                 testParams<CommentListStateUpdates>(
                     name = "CommentDeleted",
                     event = CommentDeleted("feed-1", comment),
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedEventHandlerTest.kt
@@ -183,7 +183,7 @@ internal class FeedEventHandlerTest(
                 testParams<FeedStateUpdates>(
                     name = "ActivityUpdated non-matching filter",
                     event = ActivityUpdated(fid.rawValue, nonMatchingActivity),
-                    verifyBlock = { state -> state wasNot called },
+                    verifyBlock = { state -> state.onActivityRemoved(nonMatchingActivity.id) },
                 ),
                 testParams<FeedStateUpdates>(
                     name = "ActivityPinned matching feed",
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FeedListEventHandlerTest.kt
@@ -71,7 +71,7 @@ internal class FeedListEventHandlerTest(
                 testParams<FeedListStateUpdates>(
                     name = "FeedUpdated with non-matching filter",
                     event = FeedUpdated(feedData(id = "feed-1", groupId = "notifications")),
-                    verifyBlock = { state -> state wasNot called },
+                    verifyBlock = { state -> state.onFeedRemoved("notifications:feed-1") },
                 ),
             )
     }
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/FollowListEventHandlerTest.kt
@@ -73,7 +73,9 @@ internal class FollowListEventHandlerTest(
                 testParams<FollowListStateUpdates>(
                     name = "FollowUpdated non-matching filter",
                     event = FollowUpdated(followData(sourceFid = "user:notifications")),
-                    verifyBlock = { state -> state wasNot called },
+                    verifyBlock = { state ->
+                        state.onFollowRemoved(followData(sourceFid = "user:notifications"))
+                    },
                 ),
             )
     }
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/MemberListEventHandlerTest.kt
diff --git a/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/PollListEventHandlerTest.kt b/stream-feeds-android-client/src/test/kotlin/io/getstream/feeds/android/client/internal/state/event/handler/PollListEventHandlerTest.kt

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ internal class ActivityListEventHandler(`
`38`	`38`	`is StateUpdateEvent.ActivityUpdated -> {`
`39`	`39`	`if (event.activity matches filter) {`
`40`	`40`	`state.onActivityUpserted(event.activity)`
	`41`	`+ } else {`
	`42`	`+ // We remove elements that used to match the filter but no longer do`
	`43`	`+ state.onActivityRemoved(event.activity.id)`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,13 @@ internal class FeedEventHandler(`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`is StateUpdateEvent.ActivityUpdated -> {`
`61`		`- if (event.fid == fid.rawValue && event.activity matches activityFilter) {`
`62`		`- state.onActivityUpserted(event.activity)`
	`61`	`+ if (event.fid == fid.rawValue) {`
	`62`	`+ if (event.activity matches activityFilter) {`
	`63`	`+ state.onActivityUpserted(event.activity)`
	`64`	`+ } else {`
	`65`	`+ // We remove elements that used to match the filter but no longer do`
	`66`	`+ state.onActivityRemoved(event.activity.id)`
	`67`	`+ }`
`63`	`68`	`}`
`64`	`69`	`}`
`65`	`70`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ internal class FeedListEventHandler(`
`41`	`41`	`is StateUpdateEvent.FeedUpdated -> {`
`42`	`42`	`if (event.feed matches filter) {`
`43`	`43`	`state.onFeedUpserted(event.feed)`
	`44`	`+ } else {`
	`45`	`+ // We remove elements that used to match the filter but no longer do`
	`46`	`+ state.onFeedRemoved(event.feed.fid.rawValue)`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ internal class FollowListEventHandler(`
`41`	`41`	`is StateUpdateEvent.FollowUpdated -> {`
`42`	`42`	`if (event.follow matches filter) {`
`43`	`43`	`state.onFollowUpserted(event.follow)`
	`44`	`+ } else {`
	`45`	`+ // We remove elements that used to match the filter but no longer do`
	`46`	`+ state.onFollowRemoved(event.follow)`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,13 @@ internal class MemberListEventHandler(`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`is StateUpdateEvent.FeedMemberUpdated -> {`
`45`		`- if (event.fid == fid.rawValue && event.member matches filter) {`
`46`		`- state.onMemberUpserted(event.member)`
	`45`	`+ if (event.fid == fid.rawValue) {`
	`46`	`+ if (event.member matches filter) {`
	`47`	`+ state.onMemberUpserted(event.member)`
	`48`	`+ } else {`
	`49`	`+ // We remove elements that used to match the filter but no longer do`
	`50`	`+ state.onMemberRemoved(event.member.id)`
	`51`	`+ }`
`47`	`52`	`}`
`48`	`53`	`}`
`49`	`54`