From 624cf26c29e00607893dd032a202c15ddfe3e2ba Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Mon, 2 Mar 2026 18:22:45 -0500
Subject: [PATCH] Switches the public message API to use quoted posts on
 replies

---
 .../publicMessages/NewPublicMessageViewModel.kt          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
index dd5a74805..daedcac62 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
@@ -340,11 +340,16 @@ class NewPublicMessageViewModel :
         }
     }
 
-    private suspend fun createTemplate(): EventTemplate<PublicMessageEvent>? {
+    private suspend fun createTemplate(): EventTemplate<PublicMessageEvent> {
         val toUsersTagger = NewMessageTagger(this@NewPublicMessageViewModel.toUsers.text, null, null, accountViewModel)
         toUsersTagger.run()
 
-        val tagger = NewMessageTagger(message.text, null, null, accountViewModel)
+        val msg =
+            replyingTo?.let {
+                it.toNostrUri() + "\n" + message.text
+            } ?: message.text
+
+        val tagger = NewMessageTagger(msg, null, null, accountViewModel)
         tagger.run()
 
         val users = (toUsersTagger.pTags ?: emptyList()) + (tagger.pTags ?: emptyList())