highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-03-18 05:41:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Activates the top nav list building when deletion events are received as well

Browse Source
This commit is contained in:
Vitor Pamplona 2024-07-11 11:34:40 -04:00
parent 31e2fcdc21
commit ad449ba239
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt
View File

@ -141,6 +141,7 @@ import com.vitorpamplona.ammolite.relays.Client
import com.vitorpamplona.ammolite.relays.RelayPool
import com.vitorpamplona.quartz.events.ChatroomKey
import com.vitorpamplona.quartz.events.ContactListEvent
import com.vitorpamplona.quartz.events.DeletionEvent
import com.vitorpamplona.quartz.events.MuteListEvent
import com.vitorpamplona.quartz.events.PeopleListEvent
import kotlinx.collections.immutable.ImmutableList
@ -325,7 +326,10 @@ private fun DvmTopBar(
model = it,
contentDescription = null,
contentScale = ContentScale.Crop,
modifier = Modifier.size(Size34dp).clip(shape = CircleShape),
modifier =
Modifier
.size(Size34dp)
.clip(shape = CircleShape),
)
} ?: run { NoteAuthorPicture(baseNote = appDefinitionNote, size = Size34dp, accountViewModel = accountViewModel) }
@ -700,11 +704,26 @@ class FollowListViewModel(
LocalCache.live.newEventBundles.transformLatest { newNotes ->
val hasNewList =
newNotes.any {
it.event?.pubKey() == account.userProfile().pubkeyHex &&
val noteEvent = it.event
noteEvent?.pubKey() == account.userProfile().pubkeyHex &&
(
it.event is PeopleListEvent ||
it.event is MuteListEvent ||
it.event is ContactListEvent
(
noteEvent is PeopleListEvent ||
noteEvent is MuteListEvent ||
noteEvent is ContactListEvent
) ||
(
noteEvent is DeletionEvent &&
(
noteEvent.deleteEvents().any {
LocalCache.getNoteIfExists(it)?.event is PeopleListEvent
} ||
noteEvent.deleteAddresses().any {
it.kind == PeopleListEvent.KIND
}
)
)
)
}