ssb: Fixing private messaging yourself, and delete a failing not-quite-relevant private message test.

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🦀",
-	"previous": "&0+Yt567XQU/ThaPoHxf7gSE9p7//vt+gDNHh9i3a/nU=.sha256"
+	"previous": "&eqeAxU0q6n0RZDSd68j44hQ4UtssESqgohsCXN/otwY=.sha256"
 }

apps/ssb/tf-news.js

@@ -57,6 +57,9 @@ class TfNewsElement extends LitElement {
 		}
 
 		function link_message(message) {
+			if (!message.content) {
+				return;
+			}
 			if (message.content.type === 'vote') {
 				let parent = ensure_message(message.content.vote.link, message.rowid);
 				if (!parent.votes) {

apps/ssb/tf-tab-news.js

@@ -375,6 +375,14 @@ class TfTabNewsElement extends LitElement {
 		`;
 	}
 
+	recipients() {
+		if (this.hash == '#🔐') {
+			return [this.whoami];
+		} else if (this.hash.startsWith('#🔐')) {
+			return this.hash.substring('#🔐'.length).split(',');
+		}
+	}
+
 	render() {
 		let profile =
 			this.hash.startsWith('#@') && this.hash != '#@'
@@ -450,9 +458,7 @@ class TfTabNewsElement extends LitElement {
 							.drafts=${this.drafts}
 							@tf-draft=${this.draft}
 							.channel=${this.channel()}
-							.recipients=${this.hash.startsWith('#🔐')
-								? this.hash.substring('#🔐'.length).split(',')
-								: undefined}
+							.recipients=${this.recipients()}
 						></tf-compose>
 					</div>
 					${profile}

src/ssb.tests.c

@@ -922,45 +922,8 @@ void tf_ssb_test_go_ssb_room(const tf_test_options_t* options)
 }
 
 #if !TARGET_OS_IPHONE
-static void _write_file(const char* path, const char* contents)
-{
-	FILE* file = fopen(path, "w");
-	if (!file)
-	{
-		tf_printf("Unable to write %s: %s.\n", path, strerror(errno));
-		abort();
-	}
-	fputs(contents, file);
-	fclose(file);
-}
-
 #define TEST_ARGS " --args=ssb_port=0,http_port=0"
 
-void tf_ssb_test_encrypt(const tf_test_options_t* options)
-{
-	_write_file("out/test.js",
-		"async function main() {\n"
-		"	let a = await ssb.createIdentity('test');\n"
-		"	let b = await ssb.createIdentity('test');\n"
-		"	let c = await ssb.privateMessageEncrypt('test', a, [a, b], \"{'foo': 1}\");\n"
-		"	if (!c.endsWith('.box')) {\n"
-		"		exit(1);\n"
-		"	}\n"
-		"	print(await ssb.privateMessageDecrypt('test', a, c));\n"
-		"}\n"
-		"main().catch(() => exit(2));\n");
-
-	unlink("out/testdb.sqlite");
-	char command[256];
-	snprintf(command, sizeof(command), "%s run --db-path=out/testdb.sqlite -s out/test.js" TEST_ARGS, options->exe_path);
-	tf_printf("%s\n", command);
-	int result = system(command);
-	(void)result;
-	assert(WIFEXITED(result));
-	tf_printf("returned %d\n", WEXITSTATUS(result));
-	assert(WEXITSTATUS(result) == 0);
-}
-
 static void _count_broadcasts_callback(
 	const char* host, const struct sockaddr_in* addr, tf_ssb_broadcast_origin_t origin, tf_ssb_connection_t* tunnel, const uint8_t* pub, void* user_data)
 {

src/ssb.tests.h

@@ -47,12 +47,6 @@ void tf_ssb_test_bench(const tf_test_options_t* options);
 */
 void tf_ssb_test_go_ssb_room(const tf_test_options_t* options);
 
-/**
-** Test encrypting a private message.
-** @param options The test options.
-*/
-void tf_ssb_test_encrypt(const tf_test_options_t* options);
-
 /**
 ** Test peer exchange.
 ** @param options The test options.

src/tests.c

@@ -997,7 +997,6 @@ void tf_tests(const tf_test_options_t* options)
 	_tf_test_run(options, "rooms", tf_ssb_test_rooms, false);
 	_tf_test_run(options, "bench", tf_ssb_test_bench, false);
 	_tf_test_run(options, "go-ssb-room", tf_ssb_test_go_ssb_room, true);
-	_tf_test_run(options, "encrypt", tf_ssb_test_encrypt, false);
 	_tf_test_run(options, "peer_exchange", tf_ssb_test_peer_exchange, false);
 	_tf_test_run(options, "publish", tf_ssb_test_publish, false);
 	_tf_test_run(options, "replicate", tf_ssb_test_replicate, false);