Moves the new observables to commons

2026-02-07 18:20:50 -05:00
parent 7813d20f8e
commit 571fb6af4b
7 changed files with 56 additions and 31 deletions
@@ -28,13 +28,14 @@ import com.vitorpamplona.amethyst.commons.model.cache.ICacheProvider
 import com.vitorpamplona.amethyst.commons.model.emphChat.EphemeralChatChannel
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatChannel
 import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.commons.model.observables.CreatedAtIdHexComparator
+import com.vitorpamplona.amethyst.commons.model.observables.EventListMatchingFilter
+import com.vitorpamplona.amethyst.commons.model.observables.NoteListMatchingFilter
+import com.vitorpamplona.amethyst.commons.model.observables.Observable
 import com.vitorpamplona.amethyst.commons.model.privateChats.ChatroomList
 import com.vitorpamplona.amethyst.commons.services.nwc.NwcPaymentTracker
 import com.vitorpamplona.amethyst.isDebug
 import com.vitorpamplona.amethyst.model.nip51Lists.HiddenUsersState
-import com.vitorpamplona.amethyst.model.observables.CreatedAtIdHexComparator
-import com.vitorpamplona.amethyst.model.observables.EventListMatchingFilter
-import com.vitorpamplona.amethyst.model.observables.NoteListMatchingFilter
 import com.vitorpamplona.amethyst.service.BundledInsert
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.dateFormatter
@@ -221,15 +222,6 @@ interface ILocalCache {
    ) {}
 }

-interface Observable {
-    fun new(
-        event: Event,
-        note: Note,
-    )
-
-    fun remove(note: Note)
-}
-
 object LocalCache : ILocalCache, ICacheProvider {
    val antiSpam = AntiSpamFilter()

@@ -313,7 +305,7 @@ object LocalCache : ILocalCache, ICacheProvider {
    fun observeNotes(filter: Filter): Flow<List<Note>> =
        callbackFlow {
            val newFilter =
-                NoteListMatchingFilter(filter, this@LocalCache) {
+                NoteListMatchingFilter(filter, this@LocalCache::filter) {
                    trySend(it)
                }

@@ -329,7 +321,7 @@ object LocalCache : ILocalCache, ICacheProvider {
    fun observeEvents(filter: Filter): Flow<List<Event>> =
        callbackFlow {
            val cachedFilter =
-                EventListMatchingFilter(filter, this@LocalCache) {
+                EventListMatchingFilter(filter, this@LocalCache::filter) {
                    trySend(it)
                }

@@ -43,6 +43,7 @@ import com.vitorpamplona.amethyst.commons.model.LiveHiddenUsers
 import com.vitorpamplona.amethyst.commons.model.emphChat.EphemeralChatChannel
 import com.vitorpamplona.amethyst.commons.model.nip28PublicChats.PublicChatChannel
 import com.vitorpamplona.amethyst.commons.model.nip53LiveActivities.LiveActivitiesChannel
+import com.vitorpamplona.amethyst.commons.model.observables.CreatedAtComparator
 import com.vitorpamplona.amethyst.commons.ui.feeds.FeedState
 import com.vitorpamplona.amethyst.commons.ui.notifications.CardFeedState
 import com.vitorpamplona.amethyst.logTime
@@ -54,7 +55,6 @@ import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.UiSettingsFlow
 import com.vitorpamplona.amethyst.model.UrlCachedPreviewer
 import com.vitorpamplona.amethyst.model.User
-import com.vitorpamplona.amethyst.model.observables.CreatedAtComparator
 import com.vitorpamplona.amethyst.model.privacyOptions.EmptyRoleBasedHttpClientBuilder
 import com.vitorpamplona.amethyst.model.privacyOptions.IRoleBasedHttpClientBuilder
 import com.vitorpamplona.amethyst.model.privacyOptions.RoleBasedHttpClientBuilder
@@ -20,10 +20,10 @@
 */
 package com.vitorpamplona.amethyst.ui.screen.loggedIn.dvms.dal

+import com.vitorpamplona.amethyst.commons.model.observables.CreatedAtComparator
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.observables.CreatedAtComparator
 import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.FilterByListParams
 import com.vitorpamplona.quartz.nip01Core.tags.events.isTaggedEvent
@@ -18,10 +18,10 @@
 * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-package com.vitorpamplona.amethyst.model.observables
+package com.vitorpamplona.amethyst.commons.model.observables

-import com.vitorpamplona.amethyst.model.AddressableNote
-import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.commons.model.AddressableNote
+import com.vitorpamplona.amethyst.commons.model.Note

 val CreatedAtIdHexComparator: Comparator<Note> =
    Comparator { note1, note2 ->
@@ -18,14 +18,14 @@
 * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-package com.vitorpamplona.amethyst.model.observables
+package com.vitorpamplona.amethyst.commons.model.observables

-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.Observable
+import com.vitorpamplona.amethyst.commons.model.Note
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
+import java.util.SortedSet
 import java.util.concurrent.ConcurrentSkipListSet
+import kotlin.collections.mapNotNull

 /**
 * Creates a list of events (regular and addressable)
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentSkipListSet
 */
 class EventListMatchingFilter(
    private val filter: Filter,
-    private val cache: LocalCache,
+    private val atOnce: (filter: Filter) -> SortedSet<Note>,
    private val update: (List<Event>) -> Unit,
 ) : Observable {
    // Keeping this here blocks it from being cleared from memory
@@ -62,7 +62,7 @@ class EventListMatchingFilter(
    }

    fun init() {
-        currentResults = ConcurrentSkipListSet(cache.filter(filter))
+        currentResults = ConcurrentSkipListSet(atOnce(filter))
        update(currentResults.mapNotNull { it.event })
    }
 }
@@ -18,14 +18,14 @@
 * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-package com.vitorpamplona.amethyst.model.observables
+package com.vitorpamplona.amethyst.commons.model.observables

-import com.vitorpamplona.amethyst.model.LocalCache
-import com.vitorpamplona.amethyst.model.Note
-import com.vitorpamplona.amethyst.model.Observable
+import com.vitorpamplona.amethyst.commons.model.Note
 import com.vitorpamplona.quartz.nip01Core.core.Event
 import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
+import java.util.SortedSet
 import java.util.concurrent.ConcurrentSkipListSet
+import kotlin.collections.toList

 /**
 * Creates a list of notes (regular and addressable)
@@ -35,7 +35,7 @@ import java.util.concurrent.ConcurrentSkipListSet
 */
 class NoteListMatchingFilter(
    private val filter: Filter,
-    private val cache: LocalCache,
+    private val atOnce: (filter: Filter) -> SortedSet<Note>,
    private val update: (List<Note>) -> Unit,
 ) : Observable {
    var currentResults: ConcurrentSkipListSet<Note> = ConcurrentSkipListSet(CreatedAtIdHexComparator)
@@ -63,7 +63,7 @@ class NoteListMatchingFilter(
    }

    fun init() {
-        currentResults = ConcurrentSkipListSet(cache.filter(filter))
+        currentResults = ConcurrentSkipListSet(atOnce(filter))
        update(currentResults.toList())
    }
 }
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2025 Vitor Pamplona
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
+ * Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+package com.vitorpamplona.amethyst.commons.model.observables
+
+import com.vitorpamplona.amethyst.commons.model.Note
+import com.vitorpamplona.quartz.nip01Core.core.Event
+
+interface Observable {
+    fun new(
+        event: Event,
+        note: Note,
+    )
+
+    fun remove(note: Note)
+}