send dvm id to render list

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NIP90ContentDiscoveryFilter.kt

@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2024 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.ui.dal
+
+import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.LocalCache
+import com.vitorpamplona.amethyst.model.Note
+
+class NIP90ContentDiscoveryFilter(val account: Account) : FeedFilter<Note>() {
+    override fun feedKey(): String {
+        return account.userProfile().latestBookmarkList?.id ?: ""
+    }
+
+    // TODO
+    override fun feed(): List<Note> {
+        val bookmarks = account.userProfile().latestBookmarkList
+
+        val notes =
+            bookmarks?.taggedEvents()?.mapNotNull { LocalCache.checkGetOrCreateNote(it) } ?: emptyList()
+        val addresses =
+            bookmarks?.taggedAddresses()?.map { LocalCache.getOrCreateAddressableNote(it) } ?: emptyList()
+
+        return notes
+            .plus(addresses)
+            .toSet()
+            .sortedWith(DefaultFeedOrder)
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppNavigation.kt

@@ -68,6 +68,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HiddenUsersScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.HomeScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.LoadRedirectScreen
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.NIP90ContentDiscoveryScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.NotificationScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.ProfileScreen
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchScreen
@@ -218,8 +219,23 @@ fun AppNavigation(
 
         composable(Route.BlockedUsers.route, content = { HiddenUsersScreen(accountViewModel, nav) })
         composable(Route.Bookmarks.route, content = { BookmarkListScreen(accountViewModel, nav) })
+
         composable(Route.Drafts.route, content = { DraftListScreen(accountViewModel, nav) })
 
+        Route.ContentDiscovery.let { route ->
+            composable(
+                route.route,
+                route.arguments,
+                content = {
+                    NIP90ContentDiscoveryScreen(
+                        DVMID = it.arguments?.getString("id"),
+                        accountViewModel = accountViewModel,
+                        nav = nav,
+                    )
+                },
+            )
+        }
+
         Route.Profile.let { route ->
             composable(
                 route.route,

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -188,6 +188,8 @@ private fun RenderTopRouteBar(
         Route.Settings.base -> TopBarWithBackButton(stringResource(id = R.string.application_preferences), navPopBack)
         Route.Bookmarks.base -> TopBarWithBackButton(stringResource(id = R.string.bookmarks), navPopBack)
         Route.Drafts.base -> TopBarWithBackButton(stringResource(id = R.string.drafts), navPopBack)
+        Route.ContentDiscovery.base -> TopBarWithBackButton(stringResource(id = R.string.discover_content), navPopBack)
+
         else -> {
             if (id != null) {
                 when (currentRoute) {

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -148,6 +148,14 @@ sealed class Route(
             contentDescriptor = R.string.route_home,
         )
 
+    object ContentDiscovery :
+        Route(
+            icon = R.drawable.ic_bookmarks,
+            contentDescriptor = R.string.discover_content,
+            route = "ContentDiscovery/{id}",
+            arguments = listOf(navArgument("id") { type = NavType.StringType }).toImmutableList(),
+        )
+
     object Drafts :
         Route(
             route = "Drafts",

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

@@ -398,13 +398,18 @@ fun ClickableNote(
                 .combinedClickable(
                     onClick = {
                         scope.launch {
-                            val redirectToNote =
+                            if (baseNote.event is AppDefinitionEvent) {
-                                if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
+                                // nav(Route.ContentDiscovery.route + "/${(baseNote.event as AppDefinitionEvent).pubKey()}")
-                                    baseNote.replyTo?.lastOrNull() ?: baseNote
+                                nav("ContentDiscovery/${(baseNote.event as AppDefinitionEvent).pubKey()}")
-                                } else {
+                            } else {
-                                    baseNote
+                                val redirectToNote =
-                                }
+                                    if (baseNote.event is RepostEvent || baseNote.event is GenericRepostEvent) {
-                            routeFor(redirectToNote, accountViewModel.userProfile())?.let { nav(it) }
+                                        baseNote.replyTo?.lastOrNull() ?: baseNote
+                                    } else {
+                                        baseNote
+                                    }
+                                routeFor(redirectToNote, accountViewModel.userProfile())?.let { nav(it) }
+                            }
                         }
                     },
                     onLongClick = showPopup,

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt

@@ -281,6 +281,16 @@ class NostrBookmarkPrivateFeedViewModel(val account: Account) :
     }
 }
 
+@Stable
+class NostrNIP90ContentDiscoveryFeedViewModel(val account: Account) :
+    FeedViewModel(BookmarkPrivateFeedFilter(account)) {
+    class Factory(val account: Account) : ViewModelProvider.Factory {
+        override fun <NostrNIP90ContentDiscoveryFeedViewModel : ViewModel> create(modelClass: Class<NostrNIP90ContentDiscoveryFeedViewModel>): NostrNIP90ContentDiscoveryFeedViewModel {
+            return NostrNIP90ContentDiscoveryFeedViewModel(account) as NostrNIP90ContentDiscoveryFeedViewModel
+        }
+    }
+}
+
 @Stable
 class NostrDraftEventsFeedViewModel(val account: Account) :
     FeedViewModel(DraftEventsFeedFilter(account)) {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NIP90ContentDiscoveryScreen.kt

@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2024 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.ui.screen.loggedIn
+
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.livedata.observeAsState
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.vitorpamplona.amethyst.ui.screen.NostrNIP90ContentDiscoveryFeedViewModel
+import com.vitorpamplona.amethyst.ui.screen.RefresheableFeedView
+
+@Composable
+fun NIP90ContentDiscoveryScreen(
+    DVMID: String?,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+) {
+    val resultFeedViewModel: NostrNIP90ContentDiscoveryFeedViewModel =
+        viewModel(
+            key = "NostrNIP90ContentDiscoveryFeedViewModel",
+            factory = NostrNIP90ContentDiscoveryFeedViewModel.Factory(accountViewModel.account),
+        )
+
+    val userState by accountViewModel.account.decryptBookmarks.observeAsState()
+
+    LaunchedEffect(userState) {
+        resultFeedViewModel.invalidateData()
+    }
+
+    RenderNostrNIP90ContentDiscoveryScreen(DVMID, accountViewModel, nav, resultFeedViewModel)
+}
+
+@Composable
+@OptIn(ExperimentalFoundationApi::class)
+private fun RenderNostrNIP90ContentDiscoveryScreen(
+    DVMID: String?,
+    accountViewModel: AccountViewModel,
+    nav: (String) -> Unit,
+    resultFeedViewModel: NostrNIP90ContentDiscoveryFeedViewModel,
+) {
+    Column(Modifier.fillMaxHeight()) {
+        val pagerState = rememberPagerState { 2 }
+        val coroutineScope = rememberCoroutineScope()
+
+        if (DVMID != null) {
+            Text(text = "Debug: DVM KEY:\n " + DVMID)
+        }
+        // TODO Send KIND 5300 Event with p tag = DVMID
+
+        /*note.event?.let {
+            ReactionEvent.create(emojiUrl, it, signer) {
+                Client.send(it)
+                LocalCache.consume(it)
+            }
+        }*/
+
+        // TODO PARSE AND LOAD RESULTS FROM KIND 6300 REPLY to resultfeedmodel (RN this still is the bookmark list)
+        // TODO Render Results
+
+        HorizontalPager(state = pagerState) {
+            RefresheableFeedView(
+                resultFeedViewModel,
+                null,
+                accountViewModel = accountViewModel,
+                nav = nav,
+            )
+        }
+    }
+}