Fixing Public chat's event order.

2025-09-19 09:41:09 +02:00 · 2023-01-18 18:59:18 -05:00
parent ce4e3e6589
commit 0e3b007730
12 changed files with 39 additions and 19 deletions
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrChannelDataSource.kt
@@ -10,22 +10,28 @@ object NostrChannelDataSource: NostrDataSource<Note>("ChatroomFeed") {

  fun loadMessagesBetween(channelId: String) {
    channel = LocalCache.channels[channelId]
+    resetFilters()
  }

-  fun createMessagesToChannelFilter() = JsonFilter(
-    kinds = listOf(ChannelMessageEvent.kind),
-    tags = mapOf("e" to listOf(channel?.idHex).filterNotNull()),
-    limit = 100
-  )
+  fun createMessagesToChannelFilter(): JsonFilter? {
+    if (channel != null) {
+      return JsonFilter(
+        kinds = listOf(ChannelMessageEvent.kind),
+        tags = mapOf("e" to listOfNotNull(channel?.idHex)),
+        since = System.currentTimeMillis() / 1000 - (60 * 60 * 24 * 1), // 24 hours
+      )
+    }
+    return null
+  }

  val messagesChannel = requestNewChannel()

  // returns the last Note of each user.
  override fun feed(): List<Note> {
-    return channel?.notes?.values?.sortedBy { it.event!!.createdAt } ?: emptyList()
+    return channel?.notes?.values?.sortedBy { it.event?.createdAt } ?: emptyList()
  }

  override fun updateChannelFilters() {
-    messagesChannel.filter = listOf(createMessagesToChannelFilter()).ifEmpty { null }
+    messagesChannel.filter = listOfNotNull(createMessagesToChannelFilter()).ifEmpty { null }
  }
 }
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrDataSource.kt
@@ -114,7 +114,6 @@ abstract class NostrDataSource<T>(val debugName: String) {
    }
  }

-  @OptIn(ExperimentalTime::class)
  fun loadTop(): List<T> {
    val returningList = feed().take(100)

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt
@@ -71,7 +71,6 @@ class AccountStateViewModel(private val encryptedPreferences: EncryptedSharedPre
    NostrNotificationDataSource.account = account
    NostrChatroomListDataSource.account = account

-    NostrChannelDataSource.start()
    NostrAccountDataSource.start()
    NostrGlobalDataSource.start()
    NostrHomeDataSource.start()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
@@ -7,7 +7,16 @@ import androidx.lifecycle.viewModelScope
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.LocalCacheState
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.NostrChannelDataSource
+import com.vitorpamplona.amethyst.service.NostrChatRoomDataSource
+import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.service.NostrDataSource
+import com.vitorpamplona.amethyst.service.NostrGlobalDataSource
+import com.vitorpamplona.amethyst.service.NostrHomeDataSource
+import com.vitorpamplona.amethyst.service.NostrThreadDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowersDataSource
+import com.vitorpamplona.amethyst.service.NostrUserProfileFollowsDataSource
 import kotlin.time.ExperimentalTime
 import kotlin.time.measureTimedValue
 import kotlinx.coroutines.CoroutineScope
@@ -19,8 +28,16 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch

+class NostrChannelFeedViewModel: FeedViewModel(NostrChannelDataSource)
+class NostrChatroomListFeedViewModel: FeedViewModel(NostrChatroomListDataSource)
+class NostrChatRoomFeedViewModel: FeedViewModel(NostrChatRoomDataSource)
+class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource)
+class NostrGlobalFeedViewModel: FeedViewModel(NostrGlobalDataSource)
+class NostrThreadFeedViewModel: FeedViewModel(NostrThreadDataSource)
+class NostrUserProfileFeedViewModel: FeedViewModel(NostrUserProfileDataSource)

-class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
+
+abstract class FeedViewModel(val dataSource: NostrDataSource<Note>): ViewModel() {
    private val _feedContent = MutableStateFlow<FeedState>(FeedState.Loading)
    val feedContent = _feedContent.asStateFlow()

--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChannelScreen.kt
@@ -50,7 +50,7 @@ fun ChannelScreen(channelId: String?, accountViewModel: AccountViewModel, navCon
        val channelState by NostrChannelDataSource.channel!!.live.observeAsState()
        val channel = channelState?.channel ?: return

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChannelDataSource ) }
+        val feedViewModel: NostrChannelFeedViewModel = viewModel()

        LaunchedEffect(Unit) {
            feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt
@@ -19,7 +19,7 @@ fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavCon
    val account by accountViewModel.accountLiveData.observeAsState()

    if (account != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatroomListDataSource ) }
+        val feedViewModel: NostrChatroomListFeedViewModel = viewModel()

        LaunchedEffect(Unit) {
            feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomScreen.kt
@@ -46,7 +46,7 @@ fun ChatroomScreen(userId: String?, accountViewModel: AccountViewModel, navContr

        NostrChatRoomDataSource.loadMessagesBetween(account, userId)

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrChatRoomDataSource ) }
+        val feedViewModel: NostrChatRoomFeedViewModel = viewModel()

        LaunchedEffect(Unit) {
            feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt
@@ -25,7 +25,7 @@ fun HomeScreen(accountViewModel: AccountViewModel, navController: NavController)
    val accountState by accountViewModel.accountLiveData.observeAsState()

    if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrHomeDataSource ) }
+        val feedViewModel: NostrHomeFeedViewModel = viewModel()

        LaunchedEffect(Unit) {
            feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt
@@ -19,8 +19,7 @@ fun NotificationScreen(accountViewModel: AccountViewModel, navController: NavCon
    val account by accountViewModel.accountLiveData.observeAsState()

    if (account != null) {
-        val feedViewModel: CardFeedViewModel =
-            viewModel { CardFeedViewModel( NostrNotificationDataSource ) }
+        val feedViewModel: CardFeedViewModel = viewModel { CardFeedViewModel( NostrNotificationDataSource ) }

        LaunchedEffect(Unit) {
            feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt
@@ -222,7 +222,7 @@ fun ProfileScreen(userId: String?, accountViewModel: AccountViewModel, navContro
 fun TabNotes(user: User, accountViewModel: AccountViewModel, navController: NavController) {
    val accountState by accountViewModel.accountLiveData.observeAsState()
    if (accountState != null) {
-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrUserProfileDataSource ) }
+        val feedViewModel: NostrUserProfileFeedViewModel = viewModel()

        Column(Modifier.fillMaxHeight()) {
            Column(
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/SearchScreen.kt
@@ -56,7 +56,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

@Composable
 fun SearchScreen(accountViewModel: AccountViewModel, navController: NavController) {
-    val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrGlobalDataSource ) }
+    val feedViewModel: NostrGlobalFeedViewModel = viewModel()

    LaunchedEffect(Unit) {
        feedViewModel.refresh()
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ThreadScreen.kt
@@ -27,7 +27,7 @@ fun ThreadScreen(noteId: String?, accountViewModel: AccountViewModel, navControl
    if (account != null && noteId != null) {
        NostrThreadDataSource.loadThread(noteId)

-        val feedViewModel: FeedViewModel = viewModel { FeedViewModel( NostrThreadDataSource ) }
+        val feedViewModel: NostrThreadFeedViewModel = viewModel()

        Column(Modifier.fillMaxHeight()) {
            Column(