From 0c673e91c6dd8f5930015d20bb58ecb10da15b19 Mon Sep 17 00:00:00 2001 From: Vitor Pamplona Date: Fri, 5 May 2023 18:49:13 -0400 Subject: [PATCH] BugFix for displaying other people's list after loading them from their profile --- .../com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index 5aeb3a5f9..3cc324086 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -88,7 +88,7 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac @Composable fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultStoriesFollowList, account.userProfile(),true) { listName -> + FollowList(account.defaultStoriesFollowList, account.userProfile(), true) { listName -> account.changeDefaultStoriesFollowList(listName) } } @@ -97,7 +97,7 @@ fun StoriesTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewMod @Composable fun HomeTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { GenericTopBar(scaffoldState, accountViewModel) { account -> - FollowList(account.defaultHomeFollowList, account.userProfile(),false) { listName -> + FollowList(account.defaultHomeFollowList, account.userProfile(), false) { listName -> account.changeDefaultHomeFollowList(listName) } } @@ -245,7 +245,7 @@ fun FollowList(listName: String, loggedIn: User, withGlobal: Boolean, onChange: followLists = defaultOptions + LocalCache.addressables.mapNotNull { val event = (it.value.event as? PeopleListEvent) // Has to have an list - if (event != null && (event.tags.size > 1 || event.content.length > 50)) { + if (event != null && event.pubKey == loggedIn.pubkeyHex && (event.tags.size > 1 || event.content.length > 50)) { Pair(event.dTag(), event.dTag()) } else { null