fixes

Signed-off-by: William Casarin <[email protected]>

Author: jb55

damus.xcodeproj/project.pbxproj

@@ -93,8 +93,10 @@ class DraftArtifacts: Equatable {
     ///   - draft_id: The unique ID of this draft, used for keeping draft identities stable. UUIDs are recommended but not required.
     ///   - damus_state: The user's Damus state, used for fetching profiles in NostrDB
     /// - Returns: The draft that can be loaded into `PostView`.
-    static func from(event: NostrEvent, draft_id: String, damus_state: DamusState) -> DraftArtifacts {
-        let parsed_blocks = parse_note_content(content: .init(note: event, keypair: damus_state.keypair))
+    static func from(event: NostrEvent, draft_id: String, damus_state: DamusState) -> DraftArtifacts? {
+        guard let parsed_blocks = parse_note_content(content: .init(note: event, keypair: damus_state.keypair)) else {
+            return nil
+        }
         return Self.from(parsed_blocks: parsed_blocks, references: Array(event.references), draft_id: draft_id, damus_state: damus_state)
     }
 
@@ -112,7 +114,7 @@ class DraftArtifacts: Equatable {
         for block in parsed_blocks.blocks {
             switch block {
             case .mention(let mention):
-                if case .pubkey(let pubkey) = mention.ref {
+                if let pubkey = mention.ref.nip19.pubkey() {
                     // A profile reference, format things properly.
                     let profile = damus_state.ndb.lookup_profile(pubkey)?.unsafeUnownedValue?.profile
                     let profile_name = parse_display_name(profile: profile, pubkey: pubkey).username
@@ -128,12 +130,10 @@ class DraftArtifacts: Equatable {
                         ]
                     )
                     rich_text_content.append(attributed_string)
-                }
-                else if case .note(_) = mention.ref {
+                } else if case .note(_) = mention.ref.nip19 {
                     // These note references occur when we quote a note, and since that is tracked via `PostAction` in `PostView`, ignore it here to avoid attaching the same event twice in a note
                     continue
-                }
-                else {
+                } else {
                     // Other references
                     rich_text_content.append(.init(string: block.asString))
                 }
@@ -195,7 +195,10 @@ class Drafts: ObservableObject {
         ) else { return }
 
         // Find out where to place these drafts
-        let blocks = parse_note_content(content: .note(nip37_draft.unwrapped_note))
+        guard let blocks = parse_note_content(content: .note(nip37_draft.unwrapped_note)) else {
+            return
+        }
+
         switch known_kind {
         case .text:
             if let replied_to_note_id = nip37_draft.unwrapped_note.direct_replies() {
@@ -204,7 +207,7 @@ class Drafts: ObservableObject {
             else {
                 for block in blocks.blocks {
                     if case .mention(let mention) = block {
-                        if case .note(let note_id) = mention.ref {
+                        if case .note(let note_id) = mention.ref.nip19 {
                             self.quotes[note_id] = draft_artifacts
                             return
                         }

damus/Models/DraftsModel.swift

@@ -115,11 +115,26 @@ fileprivate extension Block {
 fileprivate extension Block {
     /// Failable initializer for the C-backed type `invoice_block_t`.
     init?(invoice: ndb_invoice_block) {
-        guard let invoice = invoice.as_invoice() else { return nil }
+
+        guard let invoice = invoice_block_as_invoice(invoice) else { return nil }
         self = .invoice(invoice)
     }
 }
 
+func invoice_block_as_invoice(_ invoice: ndb_invoice_block) -> Invoice? {
+    let invstr = invoice.invstr.as_str()
+    let b11 = invoice.invoice
+
+    guard let description = convert_invoice_description(b11: b11) else {
+        return nil
+    }
+
+    let amount: Amount = b11.amount == 0 ? .any : .specific(Int64(b11.amount))
+
+    return Invoice(description: description, amount: amount, string: invstr, expiry: b11.expiry, created_at: b11.timestamp)
+
+}
+
 fileprivate extension Block {
     /// Failable initializer for the C-backed type `mention_bech32_block_t`. This initializer will inspect the
     /// bech32 type code and build the appropriate enum type.

damus/Types/Block.swift

@@ -98,6 +98,19 @@ enum Bech32Object : Equatable, Hashable {
     case nrelay(String)
     case naddr(NAddr)
 
+    func pubkey() -> Pubkey? {
+        switch self {
+        case .nprofile(let nprofile): return nprofile.author
+        case .npub(let pubkey): return pubkey
+        case .nevent(let ev): return ev.author
+        case .naddr(let naddr): return naddr.author
+        case .nscript: return nil
+        case .nsec: return nil // TODO privkey_to_pubkey ?
+        case .note: return nil
+        case .nrelay: return nil
+        }
+    }
+
     init?(block: ndb_mention_bech32_block) {
         let b32 = block.bech32
         switch block.bech32_type {
@@ -120,7 +133,7 @@ enum Bech32Object : Equatable, Hashable {
                 author = Pubkey(nevent.pubkey.as_data(size: 32))
             }
             var kind: UInt32? = nil
-            if nevent.has_kind != 0 {
+            if nevent.has_kind {
                 kind = nevent.kind
             }
 
@@ -195,7 +208,7 @@ func decodeCBech32(_ b: nostr_bech32_t) -> Bech32Object? {
     case NOSTR_BECH32_NEVENT:
         let note_id = NoteId(Data(bytes: b.nevent.event_id, count: 32))
         let pubkey = b.nevent.pubkey != nil ? Pubkey(Data(bytes: b.nevent.pubkey, count: 32)) : nil
-        let kind: UInt32? = b.nevent.has_kind == 0 ? nil : b.nevent.kind
+        let kind: UInt32? = !b.nevent.has_kind ? nil : b.nevent.kind
         let relays = b.nevent.relays.as_urls()
         return .nevent(NEvent(noteid: note_id, relays: relays, author: pubkey, kind: kind))
     case NOSTR_BECH32_NPUB:

damus/Util/Bech32Object.swift

@@ -144,7 +144,7 @@ struct ChatEventView: View {
                 let blur_images = should_blur_images(settings: damus_state.settings, contacts: damus_state.contacts, ev: event, our_pubkey: damus_state.pubkey)
                 NoteContentView(damus_state: damus_state, event: event, blur_images: blur_images, size: .normal, options: [.truncate_content])
                     .padding(2)
-                if let mention = first_eref_mention(ev: event, keypair: damus_state.keypair) {
+                if let mention = first_eref_mention(ndb: damus_state.ndb, ev: event, keypair: damus_state.keypair) {
                     MentionView(damus_state: damus_state, mention: mention)
                         .background(DamusColors.adaptableWhite)
                         .clipShape(RoundedRectangle(cornerSize: CGSize(width: 10, height: 10)))

damus/Views/Chat/ChatEventView.swift

@@ -112,7 +112,7 @@ class Ndb {
             while !ok && mapsize > 1024 * 1024 * 700 {
                 var cfg = ndb_config(flags: 0, ingester_threads: ingest_threads, mapsize: mapsize, filter_context: nil, ingest_filter: nil, sub_cb_ctx: nil, sub_cb: nil)
                 let res = ndb_init(&ndb_p, testdir, &cfg);
-                let ok = res != 0;
+                ok = res != 0;
                 if !ok {
                     Log.error("ndb_init failed: %d, reducing mapsize from %d to %d", for: .storage, res, mapsize, mapsize / 2)
                     mapsize /= 2

nostrdb/Ndb.swift

@@ -390,7 +390,7 @@ struct bech32_nrelay {
 	struct ndb_str_block relay;
 };
 
-struct nostr_bech32 {
+typedef struct nostr_bech32 {
 	enum nostr_bech32_type type;
 
 	union {
@@ -402,7 +402,7 @@ struct nostr_bech32 {
 		struct bech32_naddr naddr;
 		struct bech32_nrelay nrelay;
 	};
-};
+} nostr_bech32_t;
 
 
 struct ndb_mention_bech32_block {