highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-27 18:36:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moves isAcceptableNote calculations to viewModel

Browse Source
This commit is contained in:
Vitor Pamplona
2023-08-25 17:32:19 -04:00
parent 6c09e47e4f
commit 53b0db61ea
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
View File

@@ -441,9 +441,7 @@ fun WatchForReports(
val noteReportsState by note.live().reports.observeAsState() val noteReportsState by note.live().reports.observeAsState()
LaunchedEffect(key1 = noteReportsState, key2 = userFollowsState) { LaunchedEffect(key1 = noteReportsState, key2 = userFollowsState) {
launch(Dispatchers.Default) { accountViewModel.isNoteAcceptable(note, onChange)
accountViewModel.isNoteAcceptable(note, onChange)
}
} }
} }

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

@@ -411,24 +411,26 @@ class AccountViewModel(val account: Account) : ViewModel() {
} }
fun isNoteAcceptable(note: Note, onReady: (Boolean, Boolean, ImmutableSet<Note>) -> Unit) { fun isNoteAcceptable(note: Note, onReady: (Boolean, Boolean, ImmutableSet<Note>) -> Unit) {
val isFromLoggedIn = note.author?.pubkeyHex == userProfile().pubkeyHex viewModelScope.launch {
val isFromLoggedInFollow = note.author?.let { userProfile().isFollowingCached(it) } ?: true val isFromLoggedIn = note.author?.pubkeyHex == userProfile().pubkeyHex
val isFromLoggedInFollow = note.author?.let { userProfile().isFollowingCached(it) } ?: true
if (isFromLoggedIn || isFromLoggedInFollow) { if (isFromLoggedIn || isFromLoggedInFollow) {
// No need to process if from trusted people // No need to process if from trusted people
onReady(true, true, persistentSetOf())
} else {
val newCanPreview = !note.hasAnyReports()
val newIsAcceptable = account.isAcceptable(note)
if (newCanPreview && newIsAcceptable) {
// No need to process reports if nothing is wrong
onReady(true, true, persistentSetOf()) onReady(true, true, persistentSetOf())
} else { } else {
val newRelevantReports = account.getRelevantReports(note) val newCanPreview = !note.hasAnyReports()
onReady(newIsAcceptable, newCanPreview, newRelevantReports.toImmutableSet()) val newIsAcceptable = account.isAcceptable(note)
if (newCanPreview && newIsAcceptable) {
// No need to process reports if nothing is wrong
onReady(true, true, persistentSetOf())
} else {
val newRelevantReports = account.getRelevantReports(note)
onReady(newIsAcceptable, newCanPreview, newRelevantReports.toImmutableSet())
}
} }
} }
} }