From 16eb6097cef73e573e1ec2b1cdab1c6ea52a405f Mon Sep 17 00:00:00 2001
From: Believethehype <1097224+believethehype@users.noreply.github.com>
Date: Sat, 29 Jun 2024 15:08:58 +0200
Subject: [PATCH] actually use the image from the 10011 event

---
 .../java/com/vitorpamplona/amethyst/model/Note.kt    |  2 ++
 .../amethyst/ui/dal/UserProfileGalleryFeedFilter.kt  | 12 ++++++++++--
 .../amethyst/ui/note/NoteQuickActionMenu.kt          |  6 +++++-
 .../amethyst/ui/screen/loggedIn/ProfileGallery.kt    |  7 ++++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
index 055476c11..acc2ae0ad 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
@@ -139,6 +139,8 @@ open class Note(
     var relays = listOf<RelayBriefInfoCache.RelayBriefInfo>()
         private set
 
+    var headerImage: String? = null
+
     var lastReactionsDownloadTime: Map<String, EOSETime> = emptyMap()
 
     fun id() = Hex.decode(idHex)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileGalleryFeedFilter.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileGalleryFeedFilter.kt
index 8b81e5bde..59faa9376 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileGalleryFeedFilter.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/UserProfileGalleryFeedFilter.kt
@@ -34,7 +34,7 @@ class UserProfileGalleryFeedFilter(val user: User, val account: Account) : FeedF
         val notes =
             user.latestGalleryList
                 ?.taggedGalleryEntries()
-                ?.mapNotNull { LocalCache.checkGetOrCreateNote(it.id) }
+                ?.map { Pair(LocalCache.getOrCreateNote(it.id), it.url) }
                 ?.toSet()
                 ?: emptySet()
 
@@ -46,7 +46,15 @@ class UserProfileGalleryFeedFilter(val user: User, val account: Account) : FeedF
                 ?: emptySet() */
 
         // .sortedWith(DefaultFeedOrder)
-        return (notes)
+
+        var finalnotes = setOf<Note>()
+        for (pair in notes) {
+            pair.first.headerImage = pair.second
+            finalnotes = finalnotes + pair.first
+        }
+        println(finalnotes)
+
+        return (finalnotes)
             .filter { account.isAcceptable(it) }
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
index 957a0e77e..aa442f935 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteQuickActionMenu.kt
@@ -669,7 +669,11 @@ fun DeleteFromGalleryDialog(
         buttonIcon = Icons.Default.Delete,
         buttonText = stringRes(R.string.quick_action_delete_dialog_btn),
         onClickDoOnce = {
-            note.event?.firstTaggedUrl()?.let { accountViewModel.removefromMediaGallery(note, it) }
+            note.headerImage.let {
+                if (it != null) {
+                    accountViewModel.removefromMediaGallery(note, it)
+                }
+            }
             onDismiss()
         },
         onDismiss = onDismiss,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileGallery.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileGallery.kt
index 41850616d..606916fb7 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileGallery.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileGallery.kt
@@ -282,10 +282,9 @@ fun RenderGalleryThumb(
             .metadata
             .map {
                 val noteEvent = baseNote.event as TextNoteEvent
-
                 GalleryThumb(
                     id = "",
-                    image = noteEvent.firstTaggedUrl(),
+                    image = baseNote.headerImage,
                     title = noteEvent.content(),
                     // noteEvent?.title(),
                     // price = noteEvent?.price(),
@@ -294,7 +293,7 @@ fun RenderGalleryThumb(
             .observeAsState(
                 GalleryThumb(
                     id = "",
-                    image = noteEvent.firstTaggedUrl(),
+                    image = baseNote.headerImage,
                     title = noteEvent.content(),
                     // image = noteEvent.image(),
                     // title = noteEvent.title(),
@@ -342,6 +341,8 @@ fun InnerRenderGalleryThumb(
             )
         } ?: run { DisplayGalleryAuthorBanner(note) }
 
+        // TODO what if video?
+
        /* Row(
             Modifier
                 .fillMaxWidth()