Fixes: https://github.com/vitorpamplona/amethyst/issues/629

2023-10-28 16:58:17 -04:00
parent 2f2914077b
commit f20fd1aebe
2 changed files with 8 additions and 6 deletions
@@ -283,6 +283,8 @@ open class NewPostViewModel() : ViewModel() {
                    (originalNote?.event as? TextNoteEvent)?.root() // if it has a marker as root
                        ?: originalNote?.replyTo?.firstOrNull { it.event != null && it.replyTo?.isEmpty() == true }?.idHex // if it has loaded events with zero replies in the reply list
                        ?: originalNote?.replyTo?.firstOrNull()?.idHex // old rules, first item is root.
+                        ?: originalNote?.idHex
+
                val replyId = originalNote?.idHex

                account?.sendPost(
@@ -43,10 +43,10 @@ class TextNoteEvent(
        ): TextNoteEvent {
            val tags = mutableListOf<List<String>>()
            replyTos?.forEach {
-                if (it == replyingTo) {
-                    tags.add(listOf("e", it, "", "reply"))
-                } else if (it == root) {
+                if (it == root) {
                    tags.add(listOf("e", it, "", "root"))
+                } else if (it == replyingTo) {
+                    tags.add(listOf("e", it, "", "reply"))
                } else if (it in directMentions) {
                    tags.add(listOf("e", it, "", "mention"))
                } else {
@@ -62,10 +62,10 @@ class TextNoteEvent(
            }
            addresses?.forEach {
                val aTag = it.toTag()
-                if (aTag == replyingTo) {
-                    tags.add(listOf("a", aTag, "", "reply"))
-                } else if (aTag == root) {
+                if (aTag == root) {
                    tags.add(listOf("a", aTag, "", "root"))
+                } else if (aTag == replyingTo) {
+                    tags.add(listOf("a", aTag, "", "reply"))
                } else if (aTag in directMentions) {
                    tags.add(listOf("a", aTag, "", "mention"))
                } else {