nip10: marker replies

This should drastically increase compatibility for damus replies in
other clients.

Also filter non-pubkey references when replying so we don't run into the
q-tag bug.

Changelog-Added: Added nip10 marker replies
Changelog-Fixed: Fixed issue where some replies were including the q tag
Fixes: https://github.com/damus-io/damus/issues/2239
Fixes: https://github.com/damus-io/damus/issues/2233
Signed-off-by: William Casarin <jb55@jb55.com>

damusTests/NIP10Tests.swift

@@ -127,9 +127,92 @@ final class NIP10Tests: XCTestCase {
         XCTAssertEqual(refs.reduce(into: Array<NoteId>(), { xs, r in
             if let note_id = r.is_reply?.note_id { xs.append(note_id) }
         }), [root_note_id])
+
+        let nip10 = note.thread_reply(test_keypair)!
+        XCTAssertEqual(nip10.is_reply_to_root, true)
+        XCTAssertEqual(nip10.root.note_id, root_note_id)
+        XCTAssertEqual(nip10.reply!.note_id, root_note_id)
+    }
+    
+    // seen in the wild by the gleasonator
+    func test_single_marker() {
+        let root_note_id_hex = "7c7d37bc8c04d2ec65cbc7d9275253e6b5cc34b5d10439f158194a3feefa8d52"
+        let tags = [
+            ["e", root_note_id_hex, "", "reply"],
+        ]
+        
+        let root_note_id = NoteId(hex: root_note_id_hex)!
+        let note = NdbNote(content: "hi", keypair: test_keypair, kind: 1, tags: tags)!
+        let refs = interp_event_refs_without_mentions_ndb(note.referenced_noterefs)
+        let thread_reply = ThreadReply(event_refs: refs)!
+
+        XCTAssertEqual(refs.reduce(into: Array<NoteId>(), { xs, r in
+            if let note_id = r.is_thread_id?.note_id { xs.append(note_id) }
+        }), [root_note_id])
+        
+        XCTAssertEqual(refs.reduce(into: Array<NoteId>(), { xs, r in
+            if let note_id = r.is_direct_reply?.note_id { xs.append(note_id) }
+        }), [root_note_id])
+
+        XCTAssertEqual(refs.reduce(into: Array<NoteId>(), { xs, r in
+            if let note_id = r.is_reply?.note_id { xs.append(note_id) }
+        }), [root_note_id])
+        
+        XCTAssertEqual(thread_reply.mention, nil)
+        XCTAssertEqual(thread_reply.root.note_id, root_note_id)
+        XCTAssertEqual(thread_reply.reply!.note_id, root_note_id)
+        XCTAssertEqual(thread_reply.is_reply_to_root, true)
+    }
+
+    func test_marker_reply() {
+        let note_json = """
+        {
+          "pubkey": "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e",
+          "content": "Can’t zap you btw",
+          "id": "a8dc8b74852d7ad114d5d650b2125459c0cba3c1fdcaaf527e03f24082e11ab3",
+          "created_at": 1715275773,
+          "sig": "4ee5d8f954c6c087ce51ad02d30dd226eea939cd9ef4e8a8ce4bfaf3aba0a852316cfda83ce3fc9a3d98392a738e7c6b036a3b2aced1392db1be3ca190835a17",
+          "kind": 1,
+          "tags": [
+            [
+              "e",
+              "1bb940ce0ba0d4a3b2a589355d908498dcd7452f941cf520072218f7e6ede75e",
+              "wss://relay.nostrplebs.com",
+              "reply"
+            ],
+            [
+              "p",
+              "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e"
+            ],
+            [
+              "e",
+              "00152d2945459fb394fed2ea95af879c903c4ec42d96327a739fa27c023f20e0",
+              "wss://nostr.mutinywallet.com/",
+              "root"
+            ]
+          ]
+        }
+        """;
+
+        let replying_to_hex = "a8dc8b74852d7ad114d5d650b2125459c0cba3c1fdcaaf527e03f24082e11ab3"
+        let pk = Pubkey(hex: "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e")!
+        let last_reply_hex = "1bb940ce0ba0d4a3b2a589355d908498dcd7452f941cf520072218f7e6ede75e"
+        let note = decode_nostr_event_json(json: note_json)!
+        let reply = build_post(state: test_damus_state, post: .init(string: "hello"), action: .replying_to(note), uploadedMedias: [], pubkeys: [pk] + note.referenced_pubkeys.map({pk in pk}))
+        let root_hex = "00152d2945459fb394fed2ea95af879c903c4ec42d96327a739fa27c023f20e0"
+
+        XCTAssertEqual(reply.tags,
+            [
+                ["e", root_hex, "wss://nostr.mutinywallet.com/", "root"],
+                ["e", replying_to_hex, "", "reply"],
+                ["e", last_reply_hex, "wss://relay.nostrplebs.com"],
+                ["p", "5b0183ab6c3e322bf4d41c6b3aef98562a144847b7499543727c5539a114563e"],
+                ["p", "6e75f7972397ca3295e0f4ca0fbc6eb9cc79be85bafdd56bd378220ca8eee74e"],
+            ])
     }
 
     func test_mixed_nip10() {
+
         let root_note_id_hex = "27e71cf53299dafb5dc7bcc0a078357418a4375cb1097bf5184662493f79a627"
         let reply_hex = "1a616998552cf76e9786f76ac68f6104cdae46377330735c68bfe0b9426d2fa8"
 

damusTests/ReplyTests.swift

@@ -123,7 +123,7 @@ class ReplyTests: XCTestCase {
         post.append(user_tag_attr_string(profile: profile, pubkey: pk))
         post.append(.init(string: "\n"))
 
-        let post_note = build_post(state: test_damus_state, post: post, action: .posting(.none), uploadedMedias: [], references: [.pubkey(pk)])
+        let post_note = build_post(state: test_damus_state, post: post, action: .posting(.none), uploadedMedias: [], pubkeys: [pk])
 
         let expected_render = "nostr:\(pk.npub)\nnostr:\(pk.npub)"
         XCTAssertEqual(post_note.content, expected_render)
@@ -315,7 +315,7 @@ class ReplyTests: XCTestCase {
         let pk = Pubkey(hex: "32e1827635450ebb3c5a7d12c1f8e7b2b514439ac10a67eef3d9fd9c5c68e245")!
         let content = "this is a @\(pk.npub) mention"
         let blocks = parse_post_blocks(content: content)
-        let post = NostrPost(content: content, references: [.event(evid)])
+        let post = NostrPost(content: content, tags: [["e", evid.hex()]])
         let ev = post_to_event(post: post, keypair: test_keypair_full)!
 
         XCTAssertEqual(ev.tags.count, 2)
@@ -330,7 +330,7 @@ class ReplyTests: XCTestCase {
         let nsec = "nsec1jmzdz7d0ldqctdxwm5fzue277ttng2pk28n2u8wntc2r4a0w96ssnyukg7"
         let content = "this is a @\(nsec) mention"
         let blocks = parse_post_blocks(content: content)
-        let post = NostrPost(content: content, references: [.event(evid)])
+        let post = NostrPost(content: content, tags: [["e", evid.hex()]])
         let ev = post_to_event(post: post, keypair: test_keypair_full)!
 
         XCTAssertEqual(ev.tags.count, 2)
@@ -344,13 +344,13 @@ class ReplyTests: XCTestCase {
         let thread_id = NoteId(hex: "a250fc93570c3e87f9c9b08d6b3ef7b8e05d346df8a52c69e30ffecdb178fb9e")!
         let reply_id = NoteId(hex: "9a180a10f16dac9566543ad1fc29616aab272b0cf123ab5d58843e16f4ef03a3")!
 
-        let refs: [RefId]  = [
-            .event(thread_id),
-            .event(reply_id),
-            .pubkey(pubkey)
+        let tags = [
+            ["e", thread_id.hex()],
+            ["e", reply_id.hex()],
+            ["p", pubkey.hex()]
         ]
 
-        let post = NostrPost(content: "this is a (@\(pubkey.npub)) mention", references: refs)
+        let post = NostrPost(content: "this is a (@\(pubkey.npub)) mention", tags: tags)
         let ev = post_to_event(post: post, keypair: test_keypair_full)!
         
         XCTAssertEqual(ev.content, "this is a (nostr:\(pubkey.npub)) mention")

damusTests/damusTests.swift

@@ -192,7 +192,7 @@ class damusTests: XCTestCase {
      */
 
     func testMakeHashtagPost() {
-        let post = NostrPost(content: "#damus some content #bitcoin derp #かっこいい wow", references: [])
+        let post = NostrPost(content: "#damus some content #bitcoin derp #かっこいい wow", tags: [])
         let ev = post_to_event(post: post, keypair: test_keypair_full)!
 
         XCTAssertEqual(ev.tags.count, 3)
@@ -269,7 +269,7 @@ class damusTests: XCTestCase {
 }
 
 private func createEventFromContentString(_ content: String) -> NostrEvent {
-    let post = NostrPost(content: content, references: [])
+    let post = NostrPost(content: content, tags: [])
     guard let ev = post_to_event(post: post, keypair: test_keypair_full) else {
         XCTFail("Could not create event")
         return test_note