highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-20 14:01:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removes the otsFinding method from accountViewModel, since it is not account dependent.

Browse Source
This commit is contained in:
Vitor Pamplona
2025-09-11 11:19:27 -04:00
parent 05c364eff4
commit 825d890921
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Loaders.kt
View File

@@ -31,7 +31,9 @@ import androidx.compose.runtime.produceState
import androidx.compose.runtime.remember import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.vitorpamplona.amethyst.Amethyst
import com.vitorpamplona.amethyst.model.AddressableNote import com.vitorpamplona.amethyst.model.AddressableNote
import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.model.User import com.vitorpamplona.amethyst.model.User
import com.vitorpamplona.amethyst.model.emphChat.EphemeralChatChannel import com.vitorpamplona.amethyst.model.emphChat.EphemeralChatChannel
@@ -44,7 +46,9 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId import com.vitorpamplona.quartz.experimental.ephemChat.chat.RoomId
import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
import kotlinx.collections.immutable.ImmutableList import kotlinx.collections.immutable.ImmutableList
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.suspendCancellableCoroutine
import kotlinx.coroutines.withContext
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
@Composable @Composable
@@ -129,7 +133,14 @@ fun LoadOts(
val noteStatus by observeNoteOts(note, accountViewModel) val noteStatus by observeNoteOts(note, accountViewModel)
LaunchedEffect(key1 = noteStatus) { LaunchedEffect(key1 = noteStatus) {
val newOts = accountViewModel.findOtsEventsForNote(noteStatus?.note ?: note) val newOts =
withContext(Dispatchers.Default) {
LocalCache.findEarliestOtsForNote(
note = noteStatus?.note ?: note,
otsVerifCache = Amethyst.instance.otsVerifCache,
)
}
earliestDate = earliestDate =
if (newOts == null) { if (newOts == null) {
GenericLoadable.Empty() GenericLoadable.Empty()

10
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/AccountViewModel.kt
View File

@@ -1010,16 +1010,6 @@ class AccountViewModel(
fun getAddressableNoteIfExists(key: Address): AddressableNote? = LocalCache.getAddressableNoteIfExists(key) fun getAddressableNoteIfExists(key: Address): AddressableNote? = LocalCache.getAddressableNoteIfExists(key)
suspend fun findStatusesForUser(myUser: User) =
withContext(Dispatchers.IO) {
LocalCache.findStatusesForUser(myUser)
}
suspend fun findOtsEventsForNote(note: Note) =
withContext(Dispatchers.Default) {
LocalCache.findEarliestOtsForNote(note, account.otsResolverBuilder)
}
fun cachedModificationEventsForNote(note: Note) = LocalCache.cachedModificationEventsForNote(note) fun cachedModificationEventsForNote(note: Note) = LocalCache.cachedModificationEventsForNote(note)
suspend fun findModificationEventsForNote(note: Note): List<Note> = suspend fun findModificationEventsForNote(note: Note): List<Note> =