From 76087e5f25a1027e9b96b94848091510a9eedbe6 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Mon, 30 Jan 2023 13:51:30 -0300 Subject: [PATCH] Removes new threads, boosts from the Conversations view --- .../amethyst/ui/screen/FeedViewModel.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt index d96b35db4..54d642ab0 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt @@ -54,16 +54,23 @@ class NostrChatroomListNewFeedViewModel: FeedViewModel(NostrChatroomListDataSour } } +fun isNewThread(note: Note): Boolean { + return note.event is RepostEvent || note.replyTo == null || note.replyTo?.size == 0 +} + class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource) { override fun newListFromDataSource(): List { // Filter: no replies - return dataSource.feed().filter { - it.event is RepostEvent || it.replyTo == null || it.replyTo?.size == 0 - }.take(100) + return dataSource.feed().filter { isNewThread(it) }.take(100) } } -class NostrHomeRepliesFeedViewModel: FeedViewModel(NostrHomeDataSource) {} +class NostrHomeRepliesFeedViewModel: FeedViewModel(NostrHomeDataSource) { + override fun newListFromDataSource(): List { + // Filter: only replies + return dataSource.feed().filter {!isNewThread(it) }.take(100) + } +} abstract class FeedViewModel(val dataSource: NostrDataSource): ViewModel() {