From 0263c11a94615882eb5e5111a8a6c45ee0ca6f03 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sat, 22 Jul 2023 07:40:20 -0700 Subject: [PATCH] ndb: add content and owned_size --- nostrdb/NdbNote.swift | 8 ++++++++ nostrdb/Test/NdbTests.swift | 2 +- nostrdb/nostrdb.c | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nostrdb/NdbNote.swift b/nostrdb/NdbNote.swift index 317a9643..f594d074 100644 --- a/nostrdb/NdbNote.swift +++ b/nostrdb/NdbNote.swift @@ -17,6 +17,14 @@ struct NdbNote { self.owned = data } + var owned_size: Int? { + return owned?.count + } + + var content: String { + String(cString: ndb_note_content(note), encoding: .utf8) ?? "" + } + var id: Data { Data(buffer: UnsafeBufferPointer(start: ndb_note_id(note), count: 32)) } diff --git a/nostrdb/Test/NdbTests.swift b/nostrdb/Test/NdbTests.swift index 3c16c6d3..bf1b1131 100644 --- a/nostrdb/Test/NdbTests.swift +++ b/nostrdb/Test/NdbTests.swift @@ -28,7 +28,7 @@ final class NdbTests: XCTestCase { XCTAssertEqual(hex_encode(note.id), id) XCTAssertEqual(hex_encode(note.pubkey), pubkey) - XCTAssertEqual(note.tags().reduce(0, { sum, _ in sum + 1 }), 786) + XCTAssertEqual(note.owned_size, 59106) XCTAssertEqual(note.tags().reduce(0, { sum, _ in sum + 1 }), 786) //let tags = note.tags() diff --git a/nostrdb/nostrdb.c b/nostrdb/nostrdb.c index 98f312c9..f0315cd0 100644 --- a/nostrdb/nostrdb.c +++ b/nostrdb/nostrdb.c @@ -409,7 +409,6 @@ static int parse_unsigned_int(const char *start, int len, unsigned int *num) } - int ndb_note_from_json(const char *json, int len, struct ndb_note **note, unsigned char *buf, int bufsize) {