nostrdb

commit d481dcd8e264dbb8697f90c9516965b09f84f298
parent fa3657aa3b066bb491ab2691962b8d3527511737
Author: William Casarin <jb55@jb55.com>
Date:   Wed, 26 Jul 2023 12:27:47 -0700

fix command result messages

Diffstat:
M
nostrdb.c
 | 
8
++++++++
M
test.c
 | 
17
+++++++++++++++++

2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/nostrdb.c b/nostrdb.c
@@ -715,6 +715,14 @@ int ndb_ws_event_from_json(const char *json, int len, struct ndb_tce *tce,
 			return 0;
 
 		cr->ok = (json + tok->start)[0] == 't';
+
+		tok = &parser.toks[parser.i++];
+		if (tok->type != JSMN_STRING)
+			return 0;
+
+		tce->command_result.msg = json + tok->start;
+		tce->command_result.msglen = toksize(tok);
+
 		return 1;
 	}
 
diff --git a/test.c b/test.c
@@ -293,6 +293,22 @@ static void test_tce_command_result() {
 	assert(!memcmp(tce.subid, "", 0));
 }
 
+static void test_tce_command_result_empty_msg() {
+	unsigned char buf[1024];
+	const char json[] = "[\"OK\",\"b1d8f68d39c07ce5c5ea10c235100d529b2ed2250140b36a35d940b712dc6eff\",true,\"\"]";
+	struct ndb_tce tce;
+	int ok;
+
+	ok = ndb_ws_event_from_json(json, sizeof(json), &tce, buf, sizeof(buf));
+	assert(ok);
+
+	assert(tce.evtype == NDB_TCE_OK);
+	assert(tce.subid_len == 64);
+	assert(tce.command_result.ok == 1);
+	assert(tce.command_result.msglen == 0);
+	assert(!memcmp(tce.subid, "b1d8f68d39c07ce5c5ea10c235100d529b2ed2250140b36a35d940b712dc6eff", 0));
+}
+
 // test to-client event
 static void test_tce() {
 
@@ -325,4 +341,5 @@ int main(int argc, const char *argv[]) {
 	test_tce();
 	test_tce_command_result();
 	test_tce_eose();
+	test_tce_command_result_empty_msg();
 }