From 136a4061d7ddfd686c0298255b9f48f544d52808 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Tue, 15 Apr 2025 20:24:19 +0200
Subject: [PATCH 1/5] prepend clickable user with @ sign

---
 .../vitorpamplona/amethyst/ui/components/ClickableRoute.kt  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
index 5a9a65de3..04eb408b9 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/ClickableRoute.kt
@@ -283,7 +283,7 @@ private fun DisplayAddress(
 }
 
 @Composable
-public fun DisplayUser(
+fun DisplayUser(
     userHex: HexKey,
     originalNip19: String,
     additionalChars: String?,
@@ -320,7 +320,7 @@ public fun DisplayUser(
 }
 
 @Composable
-public fun RenderUserAsClickableText(
+fun RenderUserAsClickableText(
     baseUser: User,
     additionalChars: String?,
     nav: INav,
@@ -328,7 +328,7 @@ public fun RenderUserAsClickableText(
     val userState by observeUserInfo(baseUser)
 
     CreateClickableTextWithEmoji(
-        clickablePart = userState?.bestName() ?: ("@" + baseUser.pubkeyDisplayHex()),
+        clickablePart = "@" + (userState?.bestName() ?: baseUser.pubkeyDisplayHex()),
         suffix = additionalChars?.ifBlank { null },
         maxLines = 1,
         route = remember(baseUser) { routeFor(baseUser) },

From 32439b5feb9f24b359781373b3ac8a1ff3823f59 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Thu, 17 Apr 2025 17:18:40 +0200
Subject: [PATCH 2/5] bugfix: fix typo preventing opening of hashtags from
 markdown notes

---
 .../amethyst/ui/components/markdown/MarkdownMediaRenderer.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
index 33365c39d..b59b41c3b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
@@ -189,7 +189,7 @@ class MarkdownMediaRenderer(
         richTextStringBuilder: RichTextString.Builder,
     ) {
         val tagWithoutHash = tag.removePrefix("#")
-        renderAsCompleteLink(tag, "nostr:nashtag?id=$tagWithoutHash", richTextStringBuilder)
+        renderAsCompleteLink(tag, "nostr:hashtag?id=$tagWithoutHash", richTextStringBuilder)
 
         val hashtagIcon: HashtagIcon? = checkForHashtagWithIcon(tagWithoutHash)
         if (hashtagIcon != null) {

From 67e3a92d685da4180c30eff97f19168bc22b928e Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Thu, 17 Apr 2025 17:41:00 +0200
Subject: [PATCH 3/5] cleanup

---
 .../ui/components/markdown/MarkdownMediaRenderer.kt         | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
index b59b41c3b..5e1e8e4bd 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/components/markdown/MarkdownMediaRenderer.kt
@@ -75,11 +75,7 @@ class MarkdownMediaRenderer(
         uri: String,
     ): Boolean =
         if (canPreview && uri.startsWith("http")) {
-            if (title.isNullOrBlank() || title == uri) {
-                true
-            } else {
-                false
-            }
+            title.isNullOrBlank() || title == uri
         } else {
             false
         }

From bb9435e63724a9100fc1eef345fcb25852aa2a16 Mon Sep 17 00:00:00 2001
From: David Kaspar <david.kaspar@gmail.com>
Date: Fri, 2 May 2025 15:05:20 +0200
Subject: [PATCH 4/5] Remove unused imports

---
 .../src/main/java/com/vitorpamplona/amethyst/model/Account.kt   | 2 --
 .../com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt     | 1 -
 .../amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt      | 1 -
 .../ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt | 1 -
 4 files changed, 5 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
index 848ef6c6c..9089f69b4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
@@ -29,7 +29,6 @@ import com.vitorpamplona.amethyst.Amethyst
 import com.vitorpamplona.amethyst.BuildConfig
 import com.vitorpamplona.amethyst.commons.richtext.MediaUrlImage
 import com.vitorpamplona.amethyst.commons.richtext.RichTextParser
-import com.vitorpamplona.amethyst.model.Account.Companion.APP_SPECIFIC_DATA_D_TAG
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.service.location.LocationState
 import com.vitorpamplona.amethyst.service.ots.OtsResolverBuilder
@@ -196,7 +195,6 @@ import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.toSet
 import kotlinx.coroutines.flow.transformLatest
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
index 4e419bb82..3c4cba49a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/types/Classifieds.kt
@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.amethyst.ui.note.types
 
-import android.R.attr.maxLines
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
index 6f6a77990..096efcdf4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/DiscoverScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.grid.GridCells
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
index 61166421c..2c45f957f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/marketplace/NewProductScreen.kt
@@ -94,7 +94,6 @@ import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapTo
 import com.vitorpamplona.amethyst.ui.note.creators.zapsplits.ForwardZapToButton
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.CloseButton
-import com.vitorpamplona.amethyst.ui.screen.loggedIn.DisplayPreviews
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.PostButton
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.FillWidthQuoteBorderModifier

From 23fbb53c96f8b83d71a984dec94372ff7f13ce87 Mon Sep 17 00:00:00 2001
From: Crowdin Bot <support+bot@crowdin.com>
Date: Fri, 2 May 2025 13:20:35 +0000
Subject: [PATCH 5/5] New Crowdin translations by GitHub Action

---
 amethyst/src/main/res/values-hu-rHU/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/amethyst/src/main/res/values-hu-rHU/strings.xml b/amethyst/src/main/res/values-hu-rHU/strings.xml
index f43bfc6ed..c37ff26a5 100644
--- a/amethyst/src/main/res/values-hu-rHU/strings.xml
+++ b/amethyst/src/main/res/values-hu-rHU/strings.xml
@@ -71,6 +71,8 @@
     <string name="error_parsing_error_message">Hiba a hibaüzenet elemzésekor</string>
     <string name="following">" Követett"</string>
     <string name="followers">" Követő"</string>
+    <string name="number_following">"%1$s követett"</string>
+    <string name="number_followers">"%1$s követő"</string>
     <string name="profile">Profil</string>
     <string name="security_filters">Biztonsági szűrők</string>
     <string name="log_out">Kijelentkezés</string>
@@ -155,6 +157,7 @@
     <string name="gallery">Galéria</string>
     <string name="follows">"Követett"</string>
     <string name="reports">"Bejelentés"</string>
+    <string name="number_reports">"%1$s jelentés"</string>
     <string name="more_options">További beállítások</string>
     <string name="relays">" Átjátszó"</string>
     <string name="website">Weboldal</string>
@@ -795,6 +798,7 @@
     <string name="new_post">Új bejegyzés</string>
     <string name="new_short">Új rövidek: képek vagy videók</string>
     <string name="new_community_note">Új közösségi bejegyzés</string>
+    <string name="new_product">Új termék</string>
     <string name="open_all_reactions_to_this_post">A bejegyzésre adott összes reakció kibontása</string>
     <string name="close_all_reactions_to_this_post">A bejegyzésre adott összes reakció összecsukása</string>
     <string name="reply_description">Válasz</string>