prevent previous commits from appearing in git blame

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4859 ed5197a5-7fde-0310-b194-c3ffbd925b24

.clang-format

@@ -0,0 +1,20 @@
+# Format Style Options - Created with Clang Power Tools
+---
+BasedOnStyle: WebKit
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Allman
+ColumnLimit: 180
+ContinuationIndentWidth: 4
+IndentCaseBlocks: true
+IndentWidth: 4
+MaxEmptyLinesToKeep: 1
+ObjCBlockIndentWidth: 4
+ObjCBreakBeforeNestedBlockParam: false
+SortIncludes: false
+TabWidth: 4
+UseTab: Always
+...

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Add prettier to the project
+41024ddb7961b04a5688bbc997cb74de6fab4763

.gitignore

@@ -0,0 +1,2 @@
+.keys
+out

.prettierignore

@@ -0,0 +1,14 @@
+node_modules
+src
+deps
+.clang-format
+
+# Minified files
+**/*.min.css
+**/*.min.js
+**/leaflet.*
+**/commonmark*
+**/w3.css
+apps/ssb/tribute.esm.js
+apps/api/app.js
+**/emojis.json

.prettierrc.yaml

@@ -0,0 +1,10 @@
+trailingComma: 'es5'
+useTabs: true
+semi: true
+singleQuote: true
+bracketSpacing: false
+# overrides:
+#   - files: '**/*.json'
+#     options:
+#       useTabs: false
+#       tabWidth: 2

GNUmakefile

@@ -3,9 +3,9 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 14
+VERSION_CODE := 16
-VERSION_NUMBER := 0.0.14
+VERSION_NUMBER := 0.0.16-wip
-VERSION_NAME := Served on apple cider dressed winter greens.
+VERSION_NAME := Medium English breakfast tea.
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -47,14 +47,15 @@ CFLAGS += \
 	-Wextra \
 	-Wno-unused-parameter \
 	-MMD \
+	-MP \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-exceptions \
 	-g
 
 ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
-ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-33
+ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-34
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.0.10792818
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.1.10909125
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
 
@@ -159,7 +160,7 @@ $(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt
 $(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
 $(RELEASE_TARGETS): CFLAGS += -DNDEBUG
 $(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
-$(ANDROID_RELEASE_TARGETS): CFLAGS += -Os
+$(ANDROID_RELEASE_TARGETS): CFLAGS += -Oz
 $(WINDOWS_TARGETS): CC = x86_64-w64-mingw32-gcc-win32
 $(WINDOWS_TARGETS): AS = $(CC)
 $(WINDOWS_TARGETS): CFLAGS += \
@@ -213,6 +214,11 @@ debug: LDFLAGS += -fsanitize=address -fsanitize=undefined
 endif
 endif
 
+ifeq ($(UNAME_M),aarch64)
+debug: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+debug: LDFLAGS += -fsanitize=address -fsanitize=undefined
+endif
+
 get_objs = \
 	$(foreach build_type,$(BUILD_TYPES),$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)))))) \
 	$(foreach build_type,debug release,$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)_unix))))) \
@@ -500,7 +506,8 @@ $(filter $(BUILD_DIR)/win%,$(XOPT_OBJS)): CFLAGS += \
 	-DHAVE_VASPRINTF \
 	-Dvsnprintf=rpl_vsnprintf
 $(XOPT_OBJS): CFLAGS += \
-	-Wno-implicit-const-int-float-conversion
+	-Wno-implicit-const-int-float-conversion \
+	-Wno-pointer-to-int-cast
 
 QUICKJS_SOURCES := \
 	deps/quickjs/cutils.c \
@@ -521,6 +528,12 @@ $(QUICKJS_OBJS): CFLAGS += \
 	-Wno-unused-variable
 $(NONANDROID_TARGETS): CFLAGS += -DDUMP_LEAKS
 
+ifeq ($(UNAME_S),Haiku)
+$(QUICKJS_OBJS): CFLAGS += "-Dmalloc_usable_size(x)=0"
+else ifeq ($(UNAME_S),OpenBSD)
+$(QUICKJS_OBJS): CFLAGS += "-Dmalloc_usable_size(x)=0"
+endif
+
 LIBBACKTRACE_SOURCES := \
 	deps/libbacktrace/atomic.c \
 	deps/libbacktrace/backtrace.c \
@@ -635,34 +648,34 @@ $(1): $(BUILD_DIR)/$(1)/$(PROJECT)$(if $(filter win%,$(1)),.exe)
 .PHONY: $(1)
 
 $(BUILD_DIR)/$(1)/$(PROJECT)$(if $(filter win%,$(1)),.exe): $(filter $(BUILD_DIR)/$(1)/%,$(ALL_APP_OBJS))
-	@echo [link] $$@
+	@echo "[link] $$@"
 	@$$(CC) -o $$@ $$^ $$(LDFLAGS)
 
 $(BUILD_DIR)/$(1)/%.o: %.c
 	@mkdir -p $$(dir $$@)
-	@echo [c] $$@
+	@echo "[c] $$@"
 	@$$(CC) $$(CFLAGS) -c $$< -o $$@
 
 $(BUILD_DIR)/$(1)/%.o: %.m
 	@mkdir -p $$(dir $$@)
-	@echo [m] $$@
+	@echo "[m] $$@"
 	@$$(CC) $$(CFLAGS) -c $$< -o $$@
 
 $(BUILD_DIR)/$(1)/%.o: %.S
 	@mkdir -p $$(dir $$@)
-	@echo [as] $$@
+	@echo "[as] $$@"
 	@$$(AS) -c $$< -o $$@
 endef
 
 $(foreach build_type,$(BUILD_TYPES),$(eval $(call build_rules,$(build_type))))
 
 src/version.h : $(firstword $(MAKEFILE_LIST))
-	@echo [version] $@
+	@echo "[version] $@"
 	@echo "#define VERSION_NUMBER \"$(VERSION_NUMBER)\"" > $@
 	@echo "#define VERSION_NAME \"$(VERSION_NAME)\"" >> $@
 
 src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST))
-	@echo [android_version] $@
+	@echo "[android_version] $@"
 	@sed -i \
 		-e 's/versionCode=".*"/versionCode="$(VERSION_CODE)"/' \
 		-e 's/versionName=".*"/versionName="$(VERSION_NUMBER)"/' \
@@ -673,12 +686,12 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST))
 # Android support.
 out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml
 	@mkdir -p $(dir $@)
-	@echo [aapt2] $@
+	@echo "[aapt2] $@"
 	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/layout/activity_main.xml
 
 out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml
 	@mkdir -p $(dir $@)
-	@echo [aapt2] $@
+	@echo "[aapt2] $@"
 	@$(ANDROID_BUILD_TOOLS)/aapt2 compile -o out/res/ src/android/res/drawable/icon.xml
 
 out/apk/res.apk out/gen/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
@@ -689,18 +702,19 @@ JAVA_FILES := out/gen/com/unprompted/tildefriends/R.java $(wildcard src/android/
 CLASS_FILES := $(foreach src,$(JAVA_FILES),out/classes/com/unprompted/tildefriends/$(notdir $(src:.java=.class)))
 
 $(CLASS_FILES) &: $(JAVA_FILES)
-	@echo [javac] $(CLASS_FILES)
+	@echo "[javac] $(CLASS_FILES)"
 	@javac --release 8 -Xlint:deprecation -classpath $(ANDROID_PLATFORM)/android.jar -d out/classes $(JAVA_FILES)
 
 out/apk/classes.dex: $(CLASS_FILES)
 	@mkdir -p $(dir $@)
-	@echo [d8] $@
+	@echo "[d8] $@"
 	@$(ANDROID_BUILD_TOOLS)/d8 --$(BUILD_TYPE) --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
 
 PACKAGE_DIRS := \
 	apps/ \
 	core/ \
 	deps/codemirror/ \
+	deps/prettier/ \
 	deps/lit/
 
 RAW_FILES := $(filter-out apps/blog% apps/gg% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))
@@ -717,7 +731,7 @@ out/apk/TildeFriends-x86-release.unsigned.apk: out/apk/classes.dex out/androidre
 
 out/apk/TildeFriends-arm-%.unsigned.apk:
 	@mkdir -p $(dir $@) out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/ out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/
-	@echo [aapt] $@
+	@echo "[aapt] $@"
 	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/tildefriends.so
 	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/tildefriends.so
 	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/tildefriends.so
@@ -729,7 +743,7 @@ out/apk/TildeFriends-arm-%.unsigned.apk:
 
 out/apk/TildeFriends-x86-%.unsigned.apk:
 	@mkdir -p $(dir $@) out/apk-x86-$(BUILD_TYPE)/lib/x86_64/ out/apk-x86-$(BUILD_TYPE)/lib/x86/
-	@echo [aapt] $@
+	@echo "[aapt] $@"
 	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86_64/tildefriends.so
 	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86/tildefriends.so
 	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86_64/tildefriends.so
@@ -740,7 +754,7 @@ out/apk/TildeFriends-x86-%.unsigned.apk:
 	@zip -u $@ -q -9 $(RAW_FILES)
 
 out/%.apk: out/apk/%.unsigned.apk
-	@echo [apksigner] $(notdir $@)
+	@echo "[apksigner] $(notdir $@)"
 	@$(ANDROID_BUILD_TOOLS)/apksigner sign --ks .keys/android.jks --ks-key-alias androidKey --ks-pass pass:android --key-pass pass:android --out $@ $<
 
 release-apk: out/TildeFriends-arm-release.apk out/TildeFriends-x86-release.apk
@@ -770,7 +784,7 @@ ifeq ($(HAVE_LINUX_IOS),1)
 endif
 .SECONDARY:
 out/tildefriends-%.ipa: out/tildefriends-ios%.app/tildefriends
-	@echo [ipa] $@
+	@echo "[ipa] $@"
 	@rm -rf $@.tmp $@
 	@mkdir -p $@.tmp/Payload/tildefriends.app/
 	@cp -R $(dir $<)/* $@.tmp/Payload/tildefriends.app/
@@ -798,6 +812,20 @@ apklog:
 	@adb logcat *:S tildefriends
 .PHONY: apklog
 
+fetchdeps:
+	@echo "[fetch] libuv"
+	@test -f out/deps/libuv.tar.gz || (mkdir -p out/deps/ && curl -q https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz -o out/deps/libuv.tar.gz)
+	@test -d deps/libuv/ || (mkdir -p deps/libuv/ && tar -C deps/libuv/ -m --strip=1 -xf out/deps/libuv.tar.gz)
+	@echo "[fetch] sqlite"
+	@test -f out/deps/sqlite.zip || (mkdir -p out/deps/ && curl -q https://www.sqlite.org/2024/sqlite-amalgamation-3450100.zip -o out/deps/sqlite.zip)
+	@test -d deps/sqlite/ || (mkdir -p deps/sqlite/ && unzip -qDj -d deps/sqlite/ out/deps/sqlite.zip)
+	@echo "[fetch] prettier"
+	@test -f deps/prettier/standalone.mjs || curl -q --create-dirs -O --output-dir deps/prettier/ https://cdn.jsdelivr.net/npm/prettier@3.2.5/standalone.mjs
+	@test -f deps/prettier/html.mjs || curl -q --create-dirs -O --output-dir deps/prettier/ https://cdn.jsdelivr.net/npm/prettier@3.2.5/plugins/html.mjs
+	@test -f deps/prettier/babel.mjs || curl -q --create-dirs -O --output-dir deps/prettier/ https://cdn.jsdelivr.net/npm/prettier@3.2.5/plugins/babel.mjs
+	@test -f deps/prettier/estree.mjs || curl -q --create-dirs -O --output-dir deps/prettier/ https://cdn.jsdelivr.net/npm/prettier@3.2.5/plugins/estree.mjs
+.PHONE: fetchdeps
+
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
@@ -840,3 +868,7 @@ dist-test: dist
 	@docker build tildefriends-$(VERSION_NUMBER)/
 	@rm -rf tildefriends-$(VERSION_NUMBER)
 .PHONY: dist-test
+
+format:
+	@clang-format -i $(wildcard src/*.c src/*.h src/*.m)
+.PHONY: format

README.md

@@ -1,37 +1,37 @@
 # Tilde Friends
+
 Tilde Friends is a tool for making and sharing.
 
-It is both a peer-to-peer social network client, participating in Secure
+A public instance lives at https://www.tildefriends.net/.
-Scuttlebutt, as well as a platform for writing and running web applications.
+
+It is both a peer-to-peer social network client, participating in Secure Scuttlebutt, as well as a platform for writing and running web applications.
 
 ## Goals
+
 1. Make it easy and fun to run all sorts of web applications.
 2. Provide security that is easy to understand and protects your data.
-3. Make creating and sharing web applications accessible to anyone with a
+3. Make creating and sharing web applications accessible to anyone with a browser.
-   browser.
 
 ## Building
-1. Requires openssl (`libssl-dev`, in debian-speak).  All other dependencies
+
-   are kept up to date in the tree.
+Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. Builds for all of those host platforms plus mingw64, iOS, and android.
-2. To build, run `make debug` or `make release`.  An executable will be
+
-   generated in a subdirectory of `out/`.
+1. Requires openssl (`libssl-dev`, in debian-speak). All other dependencies are kept up to date in the tree.
-3. It's possible to build for Android, iOS, and Windows on Linux, if you have
+2. To build, run `make debug` or `make release`. An executable will be generated in a subdirectory of `out/`.
-   the right dependencies in the right places.  `make windebug winrelease
+3. It's possible to build for Android, iOS, and Windows on Linux, if you have the right dependencies in the right places. `make windebug winrelease iosdebug-ipa iosrelease-ipa release-apk`.
-   iosdebug-ipa iosrelease-ipa release-apk`.
 4. To build in docker, `docker build .`.
+5. `make format` will normalize formatting to the coding standard.
 
 ## Running
-By default, running the built `tildefriends` executable will start a web server
-at <http://localhost:12345/>.  `tildefriends -h` lists further options.
 
-The first user to create an account and log in will be granted administrative
+By default, running the built `tildefriends` executable will start a web server at <http://localhost:12345/>. `tildefriends -h` lists further options.
-privileges.  Further administration can be done at
+
-<http://localhost:12345/~core/admin/`>.
+The first user to create an account and log in will be granted administrative privileges. Further administration can be done at <http://localhost:12345/~core/admin/>.
 
 ## Documentation
-There are the very beginnings of developer documentation in `apps/docs/`
+
-that can be read in-place or at <http://localhost:12345/~core/docs/>.
+Docs are a work in progress: <https://www.tildefriends.net/~cory/wiki/#test-wiki/tf-app-quick-reference>.
 
 ## License
-All code unless otherwise noted in is provided under the
+
-[MIT](https://opensource.org/licenses/MIT) license.
+All code unless otherwise noted in is provided under the [MIT](https://opensource.org/licenses/MIT) license.

apps/admin/app.js

@@ -18,9 +18,13 @@ async function main() {
 		for (let user of await core.users()) {
 			data.users[user] = await core.permissionsForUser(user);
 		}
-		await app.setDocument(utf8Decode(getFile('index.html')).replace('$data', JSON.stringify(data)));
+		await app.setDocument(
+			utf8Decode(getFile('index.html')).replace('$data', JSON.stringify(data))
+		);
 	} catch {
-		await app.setDocument('<span style="color: #f00">Only an administrator can modify these settings.</span>');
+		await app.setDocument(
+			'<span style="color: #f00">Only an administrator can modify these settings.</span>'
+		);
 	}
 }
 main();

apps/admin/index.html

@@ -1,7 +1,9 @@
-<!DOCTYPE html>
+<!doctype html>
 <html style="width: 100%">
 	<head>
-		<script>const g_data = $data;</script>
+		<script>
+			const g_data = $data;
+		</script>
 	</head>
 	<body style="color: #fff; width: 100%">
 		<h1>Tilde Friends Administration</h1>

apps/admin/script.js

@@ -3,25 +3,32 @@ import * as tfrpc from '/static/tfrpc.js';
 
 function delete_user(user) {
 	if (confirm(`Are you sure you want to delete the user "${user}"?`)) {
-		tfrpc.rpc.delete_user(user).then(function() {
+		tfrpc.rpc
+			.delete_user(user)
+			.then(function () {
 				alert(`User "${user}" deleted successfully.`);
-		}).catch(function(error) {
+			})
-			alert(`Failed to delete user "${user}": ${JSON.stringify(error, null, 2)}.`);
+			.catch(function (error) {
+				alert(
+					`Failed to delete user "${user}": ${JSON.stringify(error, null, 2)}.`
+				);
 			});
 	}
 }
 
 function global_settings_set(key, value) {
-	tfrpc.rpc.global_settings_set(key, value).then(function() {
+	tfrpc.rpc
+		.global_settings_set(key, value)
+		.then(function () {
 			alert(`Set "${key}" to "${value}".`);
-	}).catch(function(error) {
+		})
+		.catch(function (error) {
 			alert(`Failed to set "${key}": ${JSON.stringify(error, null, 2)}.`);
 		});
 }
 
 window.addEventListener('load', function () {
-	const permission_template = (permission) =>
+	const permission_template = (permission) => html` <code>${permission}</code>`;
-		html` <code>${permission}</code>`;
 	function input_template(key, description) {
 		if (description.type === 'boolean') {
 			return html`
@@ -62,26 +69,24 @@ window.addEventListener('load', function() {
 	}
 	const user_template = (user, permissions) => html`
 		<li>
-			<button @click=${(e) => delete_user(user)}>
+			<button @click=${(e) => delete_user(user)}>Delete</button>
-				Delete
+			${user}: ${permissions.map((x) => permission_template(x))}
-			</button>
-			${user}:
-			${permissions.map(x => permission_template(x))}
 		</li>
 	`;
 	const users_template = (users) =>
 		html`<h2>Users</h2>
 			<ul>
-			${Object.entries(users).map(u => user_template(u[0], u[1]))}
+				${Object.entries(users).map((u) => user_template(u[0], u[1]))}
 			</ul>`;
 	const page_template = (data) =>
 		html`<div style="padding: 0; margin: 0; width: 100%; max-width: 100%">
 			<h2>Global Settings</h2>
 			<div>
-			${Object.keys(data.settings).sort().map(x => html`${input_template(x, data.settings[x])}`)}
+				${Object.keys(data.settings)
+					.sort()
+					.map((x) => html`${input_template(x, data.settings[x])}`)}
 			</div>
 			${users_template(data.users)}
-		</div>
+		</div>`;
-		`;
 	render(page_template(g_data), document.body);
 });

apps/apps.json

@@ -1,4 +1,5 @@
 {
 	"type": "tildefriends-app",
-  "emoji": "💻"
+	"emoji": "💻",
+	"previous": "&RdVEsVscZm3aWzcMrEZS8mskO5tUmvaEUihex2MMfZQ=.sha256"
 }

apps/apps/app.js

@@ -1,25 +1,87 @@
+/**
+ * Fetches information about the applications
+ * @param apps Record<appName, blobId>
+ * @returns an object including the apps' name, emoji, and blobs ids
+ */
 async function fetch_info(apps) {
 	let result = {};
+
+	// For each app
 	for (let [key, value] of Object.entries(apps)) {
+		// Get it's blob and parse it
 		let blob = await ssb.blobGet(value);
 		blob = blob ? utf8Decode(blob) : '{}';
+
+		// Add it to the result object
 		result[key] = JSON.parse(blob);
 	}
+
+	return result;
+}
+
+/**
+ *
+ *
+ */
+async function fetch_shared_apps() {
+	let messages = {};
+
+	await ssb.sqlAsync(
+		`
+				SELECT messages.*
+				FROM messages_fts('"application/tildefriends"')
+				JOIN messages ON messages.rowid = messages_fts.rowid
+				ORDER BY timestamp
+		`,
+		[],
+		function (row) {
+			let content = JSON.parse(row.content);
+			for (let mention of content.mentions) {
+				if (mention?.type === 'application/tildefriends') {
+					messages[JSON.stringify([row.author, mention.name])] = {
+						message: row,
+						blob: mention.link,
+						name: mention.name,
+					};
+				}
+			}
+		}
+	);
+
+	let result = {};
+	for (let app of Object.values(messages).sort(
+		(x, y) => y.message.timestamp - x.message.timestamp
+	)) {
+		let app_object = JSON.parse(utf8Decode(await ssb.blobGet(app.blob)));
+		if (app_object) {
+			app_object.blob_id = app.blob;
+			result[app.name] = app_object;
+		}
+	}
 	return result;
 }
 
 async function main() {
-	var apps = await fetch_info(await core.apps());
+	const apps = await fetch_info(await core.apps());
-	var core_apps = await fetch_info(await core.apps('core'));
+	const core_apps = await fetch_info(await core.apps('core'));
-	var doc = `<!DOCTYPE html>
+	const shared_apps = await fetch_shared_apps();
-<html>
+
-<head>
+	const stylesheet = `
-	<style>
+		body {
+			color: whitesmoke;
+			font-family: sans-serif;
+			margin: 16px;
+		}
 		.container {
 			display: grid;
 			grid-template-columns: repeat(auto-fill, 64px);
+			gap: 1em;
 			justify-content: space-around;
+			background-color: #ffffff10;
+			border: 2px solid #073642;
+			border-radius: 8px;
 		}
+
 		.app {
 			height: 96px;
 			width: 64px;
@@ -34,44 +96,87 @@ async function main() {
 			max-width: 64px;
 			text-overflow: ellipsis ellipsis;
 			overflow: hidden;
+			color: whitesmoke;
 		}
-	</style>
+	`;
-</head>
+
-<body style="background: #888">
+	const body = `
-<h1 id="apps_title">Apps</h1>
+		<h1 style="text-shadow: #808080 0 0 10px;">Welcome to Tilde Friends.</h1>
+
+		<h2>your apps</h2>
 		<div id="apps" class="container"></div>
-<h1>Core Apps</h1>
+
+		<h2>shared apps</h2>
+		<div id="shared_apps" class="container"></div>
+
+		<h2>core apps</h2>
 		<div id="core_apps" class="container"></div>
-</body>
+	`;
-<script>
+
+	const script = `
+		/*
+		 * Creates a list of apps
+		 * @param id the id of the element to populate
+		 * @param name (a username, 'core' or undefined)
+		 * @param apps Object, a list of apps
+		 */
 		function populate_apps(id, name, apps) {
+			// Our target
 			var list = document.getElementById(id);
+
+			// For each app in the provided list
 			for (let app of Object.keys(apps).sort()) {
+
+				// Create the item
 				let div = list.appendChild(document.createElement('div'));
 				div.classList.add('app');
 
+				// The app's icon
+				let href = name ? '/~' + name + '/' + app + '/' : ('/' + apps[app].blob_id + '/');
 				let icon_a = document.createElement('a');
 				let icon = document.createElement('div');
 				icon.appendChild(document.createTextNode(apps[app].emoji || '📦'));
 				icon.style.fontSize = 'xxx-large';
 				icon_a.appendChild(icon);
-			icon_a.href = '/~' + name + '/' + app + '/';
+				icon_a.href = href;
 				icon_a.target = '_top';
 				div.appendChild(icon_a);
 
+				// The app's name
 				let a = document.createElement('a');
 				a.appendChild(document.createTextNode(app));
-			a.href = '/~' + name + '/' + app + '/';
+				a.href = href;
 				a.target = '_top';
 				div.appendChild(a);
 			}
 		}
-	document.getElementById('apps_title').innerText = "~${escape(core.user.credentials?.session?.name || 'guest')}'s Apps";
+
 		populate_apps('apps', '${core.user.credentials?.session?.name}', ${JSON.stringify(apps)});
 		populate_apps('core_apps', 'core', ${JSON.stringify(core_apps)});
+		populate_apps('shared_apps', undefined, ${JSON.stringify(shared_apps)});
+	`;
+
+	// Build the document
+	const document = `
+	<!DOCTYPE html>
+	<html>
+		<head>
+			<style>
+				${stylesheet}
+			</style>
+		</head>
+
+		<body>
+			${body}
+		</body>
+
+		<script>
+			${script}
 		</script>
 	</html>`;
-	app.setDocument(doc);
+
+	// Send it to the browser
+	app.setDocument(document);
 }
 
 main();

apps/appstore.json

@@ -1,4 +0,0 @@
-{
-  "type": "tildefriends-app",
-  "emoji": "🛍"
-}

apps/appstore/app.js

@@ -1,55 +0,0 @@
-async function get_apps() {
-	let results = {};
-	await ssb.sqlAsync(`
-				SELECT messages.*
-				FROM messages_fts('"application/tildefriends"')
-				JOIN messages ON messages.rowid = messages_fts.rowid
-				ORDER BY timestamp
-		`,
-		[],
-		function(row) {
-			let content = JSON.parse(row.content);
-			for (let mention of content.mentions) {
-				if (mention?.type === 'application/tildefriends') {
-					results[JSON.stringify([row.author, mention.name])] = {
-						message: row,
-						blob: mention.link,
-						name: mention.name,
-					};
-				}
-			}
-		});
-	return Object.values(results).sort((x, y) => y.message.timestamp - x.message.timestamp);
-}
-
-function render_app(app) {
-	return `
-		<div style="border: 2px solid white; display: inline-block; margin: 8px; padding: 8px">
-			<a href="/~cory/ssb/#${app.message.author}">@</a>
-			<a href="/~cory/ssb/#${app.message.id}">%</a>
-			<a href="/${app.blob}/">${app.name}</a>
-		</div>
-	`;
-}
-
-async function main() {
-	let apps = await get_apps();
-	app.setDocument(`
-		<html>
-			<head>
-				<base target="_top">
-				<style>
-					a:link { color: #bbf; }
-					a:visited { color: #ddd; }
-					a:hover { color: #ddf; }
-				</style>
-			</head>
-			<body style="color: #fff">
-				<h1>${apps.length} apps</h1>
-				${apps.map(render_app).join('\n')}
-			</body>
-		</html>
-	`);
-}
-
-main();

apps/blog.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🪵",
-  "previous": "&YHBylHM7DlDDiGfuNj+g95Bf7NFxTZs/IKG14TbWnhs=.sha256"
+	"previous": "&TIrBnpN3iz3O9L9MCCteAcVJZjA83EKdcfu4SCM76VE=.sha256"
 }

apps/blog/blog.js

@@ -1,14 +1,57 @@
 import * as commonmark from './commonmark.min.js';
 
 function escape(text) {
-	return (text ?? '').replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+	return (text ?? '')
+		.replaceAll('&', '&amp;')
+		.replaceAll('<', '&lt;')
+		.replaceAll('>', '&gt;');
 }
 
 function escapeAttribute(text) {
-	return (text ?? '').replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;').replaceAll("'", '&#39;');
+	return (text ?? '')
+		.replaceAll('&', '&amp;')
+		.replaceAll('<', '&lt;')
+		.replaceAll('>', '&gt;')
+		.replaceAll('"', '&quot;')
+		.replaceAll("'", '&#39;');
 }
 
-function markdown(md) {
+export async function get_blog_message(id) {
+	let message;
+	await ssb.sqlAsync(
+		'SELECT author, timestamp, content FROM messages WHERE id = ?',
+		[id],
+		function (row) {
+			let content = JSON.parse(row.content);
+			message = {
+				author: row.author,
+				timestamp: row.timestamp,
+				blog: content?.blog,
+				title: content?.title,
+			};
+		}
+	);
+	if (message) {
+		await ssb.sqlAsync(
+			`
+				SELECT json_extract(content, '$.name') AS name
+				FROM messages
+				WHERE author = ?
+				AND json_extract(content, '$.type') = 'about'
+				AND json_extract(content, '$.about') = author
+				AND name IS NOT NULL
+				ORDER BY sequence DESC LIMIT 1
+			`,
+			[message.author],
+			function (row) {
+				message.name = row.name;
+			}
+		);
+	}
+	return message;
+}
+
+export function markdown(md) {
 	let reader = new commonmark.Parser({safe: true});
 	let writer = new commonmark.HtmlRenderer();
 	let parsed = reader.parse(md || '');
@@ -17,10 +60,14 @@ function markdown(md) {
 	while ((event = walker.next())) {
 		node = event.node;
 		if (event.entering) {
-			if (node.type == 'image') {
+			if (node.destination?.startsWith('&')) {
-				if (node.destination.startsWith('&')) {
+				node.destination =
-					node.destination = '/' + node.destination + '/view';
+					'/' + node.destination + '/view?filename=' + node.firstChild?.literal;
-				}
+			} else if (
+				node.destination?.startsWith('@') ||
+				node.destination?.startsWith('%')
+			) {
+				node.destination = '/~core/ssb/#' + escape(node.destination);
 			}
 		}
 	}
@@ -31,7 +78,12 @@ export async function render_blog_post_html(blog_post) {
 	let blob = utf8Decode(await ssb.blobGet(blog_post.blog));
 	return `<!DOCTYPE html>
 		<html>
+			<head>
+				<title>🪵Tilde Friends Blog - ${markdown(blog_post.title)}</title>
+				<base target="_top">
+			</head>
 			<body>
+				<h1><a href="./">🪵Tilde Friends Blog</a></h1>
 				<div>
 					<div><a href="../ssb/#${escapeAttribute(blog_post.author)}">${escape(blog_post.name)}</a> ${escape(new Date(blog_post.timestamp).toString())}</div>
 					<div>${markdown(blob)}</div>
@@ -44,7 +96,7 @@ export async function render_blog_post_html(blog_post) {
 function render_blog_post(blog_post) {
 	return `
 		<div>
-			<h2><a href="../ssb/#${escapeAttribute(blog_post.id)}">${escape(blog_post.title)}</a></h2>
+			<h2><a href="/~${core.app.owner}/${core.app.name}/${escapeAttribute(blog_post.id)}">${escape(blog_post.title)}</a></h2>
 			<div><a href="../ssb/#${escapeAttribute(blog_post.author)}">${escape(blog_post.name)}</a> ${escape(new Date(blog_post.timestamp).toString())}</div>
 			<div>${markdown(blog_post.summary)}</div>
 		</div>
@@ -55,21 +107,21 @@ export function render_html(blogs) {
 	return `<!DOCTYPE html>
 		<html>
 			<head>
-				<title>🪵Tilde Blog</title>
+				<title>🪵Tilde Friends Blog</title>
 				<link href="./atom" type="application/atom+xml" rel="alternate" title="🪵Tilde Blog"/>
 				<style>
 					html {
 						background-color: #ccc;
 					}
 				</style>
-				<base target="_blank">
+				<base target="_top">
 			</head>
 			<body>
 				<div style="display: flex; flex-direction: row; align-items: center; gap: 1em">
-					<h1>🪵Tilde Blog</h1>
+					<h1>🪵Tilde Friends Blog</h1>
 					<div style="font-size: xx-small; vertical-align: middle"><a href="/~cory/blog/atom">atom feed</a></div>
 				</div>
-				${blogs.map(blog_post => render_blog_post(blog_post)).join('\n')}
+				${blogs.map((blog_post) => render_blog_post(blog_post)).join('\n')}
 			</body>
 		</html>`;
 }
@@ -77,7 +129,7 @@ export function render_html(blogs) {
 function render_blog_post_atom(blog_post) {
 	return `<entry>
 		<title>${escape(blog_post.title)}</title>
-		<link href="https://tildefriends.net/~cory/ssb/#${blog_post.id}" />
+		<link href="/~cory/ssb/#${blog_post.id}" />
 		<id>${blog_post.id}</id>
 		<published>${escape(new Date(blog_post.timestamp).toString())}</published>
 		<summary>${escape(blog_post.summary)}</summary>
@@ -93,17 +145,19 @@ export function render_atom(blogs) {
 <feed xmlns="http://www.w3.org/2005/Atom">
 	<title>🪵Tilde Blog</title>
 	<subtitle>A subtitle.</subtitle>
-	<link href="https://tildefriends.net/~cory/blog/atom" rel="self"/>
+	<link href="${core.url}/atom" rel="self"/>
-	<link href="https://tildefriends.net/~cory/blog/"/>
+	<link href="${core.url}"/>
-	<id>https://www.tildefriends.net/~cory/blog/</id>
+	<id>${core.url}</id>
 	<updated>${new Date().toString()}</updated>
-	${blogs.map(blog_post => render_blog_post_atom(blog_post)).join('\n')}
+	${blogs.map((blog_post) => render_blog_post_atom(blog_post)).join('\n')}
 </feed>`;
 }
 
 export async function get_posts() {
 	let blogs = [];
-	await ssb.sqlAsync(`
+	let ids = await ssb.getIdentities();
+	await ssb.sqlAsync(
+		`
 		WITH
 			blogs AS (
 				SELECT
@@ -139,11 +193,15 @@ export async function get_posts() {
 						name IS NOT NULL)
 				WHERE author_rank = 1)
 		SELECT blogs.*, names.name FROM blogs
+		JOIN json_each(?) AS self ON self.value = blogs.author
 		JOIN public ON public.author = blogs.author
 		LEFT OUTER JOIN names ON names.author = blogs.author
 		ORDER BY blogs.timestamp DESC LIMIT 20
-	`, [], function(row) {
+	`,
+		[JSON.stringify(ids)],
+		function (row) {
 			blogs.push(row);
-	});
+		}
+	);
 	return blogs;
 }

apps/blog/handler.js

@@ -1,22 +1,51 @@
 import * as blog from './blog.js';
 
 async function main() {
+	if (request.path.startsWith('%') && request.path.endsWith('.sha256')) {
+		let id = request.path.startsWith('%25')
+			? '%' + request.path.substring(3)
+			: request.path;
+		let message = await blog.get_blog_message(id);
+		if (message) {
+			respond({
+				data: await blog.render_blog_post_html(message),
+				content_type: 'text/html; charset=utf-8',
+			});
+		} else {
+			respond({
+				data: `Message ${id} not found.`,
+				content_type: 'text/html; charset=utf-8',
+			});
+		}
+	} else if (request.path == 'atom') {
+		let blogs = await blog.get_posts();
+		respond({
+			data: blog.render_atom(blogs),
+			content_type: 'application/atom+xml',
+		});
+	} else {
 		let blogs = await blog.get_posts();
 		for (let blog_post of blogs) {
 			let title = (blog_post.title || '').replaceAll(/\W/g, '_').toLowerCase();
 			if (request.path === title) {
-			respond({data: await blog.render_blog_post_html(blog_post), content_type: 'text/html; charset=utf-8'});
+				respond({
+					data: await blog.render_blog_post_html(blog_post),
+					content_type: 'text/html; charset=utf-8',
+				});
 				return;
 			}
 		}
-	if (request.path == 'atom') {
+		respond({
-		respond({data: blog.render_atom(blogs), content_type: 'application/atom+xml'});
+			data: blog.render_html(blogs),
-	} else {
+			content_type: 'text/html; charset=utf-8',
-		respond({data: blog.render_html(blogs), content_type: 'text/html; charset=utf-8'});
+		});
 	}
 }
 
 main().catch(function (error) {
-	respond({data: `<!DOCTYPE html>
+	respond({
-	<pre style="color: #f00">${error.message}\n${error.stack}</pre>`, content_type: 'text/html'});
+		data: `<!DOCTYPE html>
+	<pre style="color: #f00">${error.message}\n${error.stack}</pre>`,
+		content_type: 'text/html',
+	});
 });

apps/docs.json

@@ -1,4 +0,0 @@
-{
-  "type": "tildefriends-app",
-  "emoji": "📚"
-}

apps/docs/guide.md

@@ -1,16 +0,0 @@
-# Tilde Friends Developer's Guide
-[Back to index](#index)
-
-A Tilde Friends application runs on the server.  To make an interesting
-application that interacts with the client, it's necessary to understand
-how the parts work together.
-
-## Hello, world!
-
-A simple starting point.  Presents `Hello, world!` in the browser when
-visited.
-
-**app.js**:
-```
-app.setDocument('<h1>Hello, world!</h1>');
-```

apps/docs/index.md

@@ -1,12 +0,0 @@
-# Tilde Friends Documentation
-
-Tilde Friends is a participating member of a greater social
-network, [Secure Scuttlebutt](https://scuttlebutt.nz/),
-adding a way to safely and securely write, share,
-and run code in the form of server-side web applications.
-
-- [Tilde Friends Vision](#vision)
-- [Secure Scuttlebutt from Scratch](#ssb)
-- [Structure](#structure)
-- [Guide](#guide)
-- [TODO](#todo)

apps/docs/ssb.md

@@ -1,41 +0,0 @@
-# Secure Scuttlebutt from Scratch
-[Back to index](#index)
-
-This aims to be the missing reference for those who wish to create a Secure
-Scuttlebutt client from scratch.
-
-## Discovery
-A good way to get started is to participate in local network discovery with a known working
-client on the same network.  The
-[Scuttlebutt Programming Guide](https://ssbc.github.io/scuttlebutt-protocol-guide/#local-network)
-is a good start, here, with a few things to note:
-
-1. Some clients advertise multiple addresses separated by semicolons (`;`).
-2. Some clients advertise alternative protocols than `shs` and use hostnames instead of
-IPv4 addresses.
-
-So be prepared to accept variations.
-
-There also an undocumented "new" style of discovery message.
-
-## Secret Handshake, Box Stream, and RPC Protocol
-Now that two clients are aware of eachother, they need to complete a secret handshake.
-The [programming guide](https://ssbc.github.io/scuttlebutt-protocol-guide/#handshake)
-is once again a good reference.
-
-The box stream and RPC protocol can both be implemented from the
-[same documentation](https://ssbc.github.io/scuttlebutt-protocol-guide/#box-stream)
-without surprises.
-
-## Synchronizing Data
-
-... `ebt.replicate` or `createHistoryStream` ...
-
-## Rooms
-
-TODO
-
-## References
-* [https://ssbc.github.io/scuttlebutt-protocol-guide/](https://ssbc.github.io/scuttlebutt-protocol-guide/)
-* [https://dev.planetary.social/](https://dev.planetary.social/)
-* [https://dev.scuttlebutt.nz/#/golang/?id=muxrpc-endpoints](https://dev.scuttlebutt.nz/#/golang/?id=muxrpc-endpoints)

apps/docs/structure.md

@@ -1,65 +0,0 @@
-# Tilde Friends Structure
-[Back to index](#index)
-
-Tilde Friends is a mostly-self-contained executable written in C.
-
-In combines the following key components:
-- A Secure Scuttlebutt (SSB) client/server.  This talks with other SSB
-  instances, storing messages and blobs for anyone visible to local
-  users as they are encountered and sharing anything published locally
-  as appropriate.
-- An sqlite database.  This is where the SSB instance stores its data.
-  The general schema involves a `messages` table, storing mostly JSON,
-  a `blobs` table storing arbitrary blob data, and a `properties` table,
-  storing arbitrary state gleaned from `messages` and `blobs`, generally
-  updated on demand and incrementally.
-- A QuickJS runtime.  The core process runs stock scripts and has access
-  and permission to use all resources.  All other processes, which
-  includes everything which runs untrusted code created by Tilde Friends
-  users, are strictly sandboxed in ways similar to how web browsers run
-  untrusted code.  All attempts to access potentially sensitive resources
-  are mediated through the core process.
-
-When run with no arguments, it starts a web server on
-[http://localhost:12345/](http://localhost:12345/) and an SSB node.
-
-## Web Interface
-The Tilde Friends web server provides access to Tilde Friends applications,
-which are arbitrary user-defined web applications.
-
-At the top left, in addition to some basic navigation links, is an `edit`
-link.  Anyone can view, modify, and run in-place the code to any Tilde
-Friends application by using the in-browser editor.
-
-At the top right, one can `login` (to save work in their own space)
-or `logout` (proceeding as a guest).
-
-The rest of the page is an iframe belonging to the application.
-
-## Special Paths
-
-- `/~user/app/` - Tilde Friends application paths take the form `/~user/app/`, where `user`
-is a username of a Tilde Friends account, and `app` is an arbitrary name
-of an application saved by the given user.
-- `/~user/app/file` - A raw file in an app.
-- `/&blobid.ed25519` - A raw blob.  Content-Type is inferred for at least
-	a few common image types.
-
-## Communication Channels
-Web Browser <-> Core <-> Sandbox
-
-Visiting an application path delivers stock HTML and JavaScript which
-establishes a WebSocket connection back to the server.
-
-At this point, a new sandbox process is started in Tilde Friends, much
-as a new sandboxed process might be started for a new tab in a web
-browser.  This process has a custom RPC connection to the core process
-which holds the WebSocket connection to the browser.
-
-The custom RPC communication between the sandbox process and the core
-process facilitates passing and calling functions remotely.  Calling a
-function in another process returns a `Promise`.
-
-An application will typically call `app.setDocument()` at startup to
-populate the app's iframe in the web browser with its own client web
-application resources.

apps/docs/todo.md

@@ -1,63 +0,0 @@
-# Tilde Friends TODO
-[Back to index](#index)
-
-## MVP3
-- Sync status (problem feeds, messages/seconds stats, ...)
-- app: wiki
-- app: public blog
-- Content-Disposition: download
-- remove SSB credentials
-- export SSB credentials
-- initial: better empty news screen
-- initial: remembered wrong user across login/logout
-- initial: bad experience when following nobody
-- make a cool independent app
-- indicate when workspace differs from installed
-- / => Something good.
-- update docs
-- audit + document API exposed to apps
-- fix weird HTTP warnings
-- channels
-- placeholder/missing images
-- no denial of service
-- package standalone executable
-- editor without app iframe
-- sequence_before_author -> flags
-- linkify ssb: links
-- perfect rooms support
-- connections 2.0
-- make a better connections API
-
-## Maybe Done
-- blob_wants 2.0
-- image downsample
-- app: todo
-- app: build archive
-- update README
-- administrators config
-- apps name characters
-- initial: can't switch to account when there is only one
-- get tarball under 5MB
-- rooms
-- initial: doesn't refresh when create identity
-- tf account timeout why
-- ssb don't overflow boxes
-- jwt for session tokens
-- linkify https://...
-- emoji reaction picker
-- expose loads of stats
-- confirm posting all new messages
-- multiple identities per user, in database
-- auto-populate data on initial launch
-- make the docker image good / test it / use it
-- leaking imports / exports
-- file upload widget
-- keep working on good error feedback
-- build for windows
-- installable apps (bring back an app message?)
-- sqlStream => sqlExec or something
-- !ssb from child process?
-
-## Done
-- update LICENSE
-- logging to browser

apps/docs/vision.md

@@ -1,62 +0,0 @@
-# Tilde Friends Vision
-[Back to index](#index)
-
-Tilde Friends is a tool for making and sharing.
-
-It is both a peer-to-peer social network client, participating in Secure
-Scuttlebutt, and an environment for creating and running web applications.
-
-## Why
-
-This is a thing that I wanted to exist and wanted to work on.  No other reason.
-There is not a business model.  I believe it is interesting and unique.
-
-## Goals
-1. Make it **easy and fun** to run all sorts of web applications.
-
-2. Provide **security** that is easy to understand and protects your data.
-
-3. Make **creating and sharing** web applications accessible to anyone with a
-   browser.
-
-## Ways to Use Tilde Friends
-1. **Social Network User**: This is a social network first.  You are just here,
-   because your friends are.  Or you like how we limit your message length or
-   short videos or whatever the trend is.  If you are ambitious, you click links
-   and see interactive experiences (apps) that you wouldn't see elsewhere.
-
-2. **Web Visitor**: You get links from a friend to meeting invites, polls, games,
-   lists, wiki pages, ..., and you interact with them as though they were
-   cloud-hosted by a megacorporation.  They just work, and you don't think twice.
-
-3. **Group leader**: You host or use a small public instance, installing apps for
-   a group of friends to use as web visitors.
-
-4. **Developer**: You like to write code and make or improve apps for fun or to
-   solve problems.  When you encounter a Tilde Friends app on a strange server,
-   you know you can trivially modify it or download it to your own instance.
-
-## Future Goals / Endgame
-1. Mobile apps.  This can run on your old phone.  Maybe you won't be hosting
-   the web interface publicly, but you can sync, install and edit apps, and
-   otherwise get the full experience from a tiny touch screen.
-
-2. The universal application runtime.  The web browser is the universal
-   platform, but even for the simplest application that you might want to host
-   for your friends, cloud hosting, containers, and complicated dependencies might
-   all enter the mix.  Tilde Friends, though it is yet another thing to host,
-   includes everything you need out of the box to run a vast variety of interesting
-   apps.
-
-   Tilde Friends will be built out, gradually providing safe access to host
-   resources and client resources the same way web browsers extended access to
-   resources like GPU, persistent storage, cameras, ... over the years.
-
-   Not much effort has been put forward yet to having a robust, long-lasting API,
-   but since the client side longevity is already handled by web browsers, it
-   seems possible that the server-side API can be managed in a similar way.
-
-3. An awesome development environment.  Right now it runs JavaScript from the
-   first embeddable text editor I could poorly configure enough to edit code,
-   but it could incorporate a debugger, source control integration a la ssb-git,
-   merge tools, and transpiling from all sorts of different languages.

apps/follow/app.js

@@ -21,7 +21,8 @@ async function contacts_internal(id, last_row_id, following, max_row_id) {
 				json_extract(content, '$.type') = 'contact'
 				ORDER BY sequence
 			`,
-		[id, last_row_id, max_row_id]);
+		[id, last_row_id, max_row_id]
+	);
 	for (let row of contacts) {
 		let contact = JSON.parse(row.content);
 		if (contact.following === true) {
@@ -42,15 +43,34 @@ async function contact(id, last_row_id, following, max_row_id) {
 	return await contacts_internal(id, last_row_id, following, max_row_id);
 }
 
-async function following_deep_internal(ids, depth, blocking, last_row_id, following, max_row_id) {
+async function following_deep_internal(
-	let contacts = await Promise.all([...new Set(ids)].map(x => contact(x, last_row_id, following, max_row_id)));
+	ids,
+	depth,
+	blocking,
+	last_row_id,
+	following,
+	max_row_id
+) {
+	let contacts = await Promise.all(
+		[...new Set(ids)].map((x) => contact(x, last_row_id, following, max_row_id))
+	);
 	let result = {};
 	for (let i = 0; i < ids.length; i++) {
 		let id = ids[i];
 		let contact = contacts[i];
 		let all_blocking = Object.assign({}, contact.blocking, blocking);
-		let found = Object.keys(contact.following).filter(y => !all_blocking[y]);
+		let found = Object.keys(contact.following).filter((y) => !all_blocking[y]);
-		let deeper = depth > 1 ? await following_deep_internal(found, depth - 1, all_blocking, last_row_id, following, max_row_id) : [];
+		let deeper =
+			depth > 1
+				? await following_deep_internal(
+						found,
+						depth - 1,
+						all_blocking,
+						last_row_id,
+						following,
+						max_row_id
+					)
+				: [];
 		result[id] = [id, ...found, ...deeper];
 	}
 	return [...new Set(Object.values(result).flat())];
@@ -68,10 +88,22 @@ async function following_deep(ids, depth, blocking) {
 			last_row_id: 0,
 		};
 	}
-	let max_row_id = (await query(`
+	let max_row_id = (
+		await query(
+			`
 			SELECT MAX(rowid) AS max_row_id FROM messages
-		`, []))[0].max_row_id;
+		`,
-	let result = await following_deep_internal(ids, depth, blocking, cache.last_row_id, cache.following, max_row_id);
+			[]
+		)
+	)[0].max_row_id;
+	let result = await following_deep_internal(
+		ids,
+		depth,
+		blocking,
+		cache.last_row_id,
+		cache.following,
+		max_row_id
+	);
 	cache.last_row_id = max_row_id;
 	let store = JSON.stringify(cache);
 	await db.set('following', store);
@@ -90,13 +122,15 @@ async function fetch_about(db, ids, users) {
 		};
 	}
 	let max_row_id = 0;
-	await ssb.sqlAsync(`
+	await ssb.sqlAsync(
+		`
 			SELECT MAX(rowid) AS max_row_id FROM messages
 		`,
 		[],
 		function (row) {
 			max_row_id = row.max_row_id;
-		});
+		}
+	);
 	for (let id of Object.keys(cache.about)) {
 		if (ids.indexOf(id) == -1) {
 			delete cache.about[id];
@@ -129,17 +163,21 @@ async function fetch_about(db, ids, users) {
 				ORDER BY messages.author, messages.sequence
 			`,
 		[
-			JSON.stringify(ids.filter(id => cache.about[id])),
+			JSON.stringify(ids.filter((id) => cache.about[id])),
-			JSON.stringify(ids.filter(id => !cache.about[id])),
+			JSON.stringify(ids.filter((id) => !cache.about[id])),
 			cache.last_row_id,
 			max_row_id,
-		]);
+		]
+	);
 	for (let about of abouts) {
 		let content = JSON.parse(about.content);
 		if (content.about === about.author) {
 			delete content.type;
 			delete content.about;
-			cache.about[about.author] = Object.assign(cache.about[about.author] || {}, content);
+			cache.about[about.author] = Object.assign(
+				cache.about[about.author] || {},
+				content
+			);
 		}
 	}
 	cache.last_row_id = max_row_id;
@@ -155,24 +193,24 @@ async function getAbout(db, id) {
 	if (g_about_cache[id]) {
 		return g_about_cache[id];
 	}
-	let o = await db.get(id + ":about");
+	let o = await db.get(id + ':about');
 	const k_version = 4;
 	let f = o ? JSON.parse(o) : o;
 	if (!f || f.version != k_version) {
 		f = {about: {}, sequence: 0, version: k_version};
 	}
 	await ssb.sqlAsync(
-		"SELECT "+
+		'SELECT ' +
-		"  sequence, "+
+			'  sequence, ' +
-		"  content "+
+			'  content ' +
-		"FROM messages "+
+			'FROM messages ' +
-		"WHERE "+
+			'WHERE ' +
-		"  author = ?1 AND "+
+			'  author = ?1 AND ' +
-		"  sequence > ?2 AND "+
+			'  sequence > ?2 AND ' +
 			"  json_extract(content, '$.type') = 'about' AND " +
 			"  json_extract(content, '$.about') = ?1 " +
-		"UNION SELECT MAX(sequence) as sequence, NULL FROM messages WHERE author = ?1 "+
+			'UNION SELECT MAX(sequence) as sequence, NULL FROM messages WHERE author = ?1 ' +
-		"ORDER BY sequence",
+			'ORDER BY sequence',
 		[id, f.sequence],
 		function (row) {
 			f.sequence = row.sequence;
@@ -180,16 +218,16 @@ async function getAbout(db, id) {
 				let about = {};
 				try {
 					about = JSON.parse(row.content);
-				} catch {
+				} catch {}
-				}
 				delete about.about;
 				delete about.type;
 				f.about = Object.assign(f.about, about);
 			}
-		});
+		}
+	);
 	let j = JSON.stringify(f);
 	if (o != j) {
-		await db.set(id + ":about", j);
+		await db.set(id + ':about', j);
 	}
 	g_about_cache[id] = f.about;
 	return f.about;
@@ -198,15 +236,15 @@ async function getAbout(db, id) {
 async function getSize(db, id) {
 	let size = 0;
 	await ssb.sqlAsync(
-		"SELECT (LENGTH(author) * COUNT(*) + SUM(LENGTH(content)) + SUM(LENGTH(id))) AS size FROM messages WHERE author = ?1",
+		'SELECT (LENGTH(author) * COUNT(*) + SUM(LENGTH(content)) + SUM(LENGTH(id))) AS size FROM messages WHERE author = ?1',
 		[id],
 		function (row) {
 			size += row.size;
-		});
+		}
+	);
 	return size;
 }
 
-
 async function getSizes(ids) {
 	let sizes = {};
 	await ssb.sqlAsync(
@@ -221,7 +259,8 @@ async function getSizes(ids) {
 		[JSON.stringify(ids)],
 		function (row) {
 			sizes[row.author] = row.size;
-		});
+		}
+	);
 	return sizes;
 }
 
@@ -241,7 +280,10 @@ function niceSize(bytes) {
 }
 
 function escape(value) {
-	return value.replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+	return value
+		.replaceAll('&', '&amp;')
+		.replaceAll('<', '&lt;')
+		.replaceAll('>', '&gt;');
 }
 
 async function main() {
@@ -249,19 +291,27 @@ async function main() {
 	let db = await database('ssb');
 	let whoami = await ssb.getIdentities();
 	let tree = '';
-	await app.setDocument(`<pre style="color: #fff">Enumerating followed users...</pre>`);
+	await app.setDocument(
+		`<pre style="color: #fff">Enumerating followed users...</pre>`
+	);
 	let following = await following_deep(whoami, 2, {});
-	await app.setDocument(`<pre style="color: #fff">Getting names and sizes...</pre>`);
+	await app.setDocument(
+		`<pre style="color: #fff">Getting names and sizes...</pre>`
+	);
 	let [about, sizes] = await Promise.all([
 		fetch_about(db, following, {}),
 		getSizes(following),
 	]);
 	await app.setDocument(`<pre style="color: #fff">Finishing...</pre>`);
-	following.sort((a, b) => ((sizes[b] ?? 0) - (sizes[a] ?? 0)));
+	following.sort((a, b) => (sizes[b] ?? 0) - (sizes[a] ?? 0));
 	for (let id of following) {
 		tree += `<li><a href="/~core/ssb/#${id}">${escape(about[id]?.name ?? id)}</a> ${niceSize(sizes[id] ?? 0)}</li>\n`;
 	}
-	await app.setDocument('<!DOCTYPE html>\n<html>\n<body style="color: #fff"><h1>Following</h1>\n<ul>' + tree + '</ul>\n</body>\n</html>');
+	await app.setDocument(
+		'<!DOCTYPE html>\n<html>\n<body style="color: #fff"><h1>Following</h1>\n<ul>' +
+			tree +
+			'</ul>\n</body>\n</html>'
+	);
 }
 
 main();

apps/gg/app.js

@@ -46,7 +46,7 @@ tfrpc.register(async function query(sql, args) {
 	return result;
 });
 tfrpc.register(async function store_blob(blob) {
-	if (typeof(blob) == 'string') {
+	if (typeof blob == 'string') {
 		blob = utf8Encode(blob);
 	}
 	if (Array.isArray(blob)) {
@@ -71,10 +71,15 @@ async function main() {
 		let shared_db = await shared_database('state');
 		attempt = await shared_db.get(core.user.credentials.session.name);
 	}
-	app.setDocument(utf8Decode(getFile('index.html')).replace('${data}', JSON.stringify({
+	app.setDocument(
+		utf8Decode(getFile('index.html')).replace(
+			'${data}',
+			JSON.stringify({
 				attempt: attempt,
 				state: core.user?.credentials?.session?.name,
-	})));
+			})
+		)
+	);
 }
 
 main();

apps/gg/gpx.js

@@ -63,7 +63,10 @@ export function gpx_parse(xml) {
 			for (let trkseg of xml_each(trk, 'trkseg')) {
 				let segment = [];
 				for (let trkpt of xml_each(trkseg, 'trkpt')) {
-					segment.push({lat: parseFloat(trkpt.attributes.lat), lon: parseFloat(trkpt.attributes.lon)});
+					segment.push({
+						lat: parseFloat(trkpt.attributes.lat),
+						lon: parseFloat(trkpt.attributes.lon),
+					});
 				}
 				result.segments.push(segment);
 			}

apps/gg/index.html

@@ -1,14 +1,26 @@
-<!DOCTYPE html>
+<!doctype html>
 <html style="width: 100%; height: 100%; margin: 0; padding: 0">
 	<head>
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script>
 			let g_data = ${data};
 		</script>
 		<script src="script.js" type="module"></script>
 		<script src="leaflet.js"></script>
 	</head>
-	<body style="color: #fff; display: flex; flex-flow: column; height: 100%; width: 100%; margin: 0; padding: 0">
+	<body
+		style="
+			color: #fff;
+			display: flex;
+			flex-flow: column;
+			height: 100%;
+			width: 100%;
+			margin: 0;
+			padding: 0;
+		"
+	>
 		<gg-app style="width: 100%; height: 100%" id="ggapp"></gg-app>
 	</body>
 </html>

apps/gg/polyline.js

@@ -19,7 +19,7 @@ function encode(current, previous, factor) {
 	previous = py2_round(previous * factor);
 	var coordinate = (current - previous) * 2;
 	if (coordinate < 0) {
-        coordinate = -coordinate - 1
+		coordinate = -coordinate - 1;
 	}
 	var output = '';
 	while (coordinate >= 0x20) {
@@ -57,7 +57,6 @@ polyline.decode = function(str, precision) {
 	// track of whether we've hit the end of the string. In each
 	// loop iteration, a single coordinate is decoded.
 	while (index < str.length) {
-
 		// Reset shift, result, and byte
 		byte = null;
 		shift = 1;
@@ -69,7 +68,7 @@ polyline.decode = function(str, precision) {
 			shift *= 32;
 		} while (byte >= 0x20);
 
-        latitude_change = (result & 1) ? ((-result - 1) / 2) : (result / 2);
+		latitude_change = result & 1 ? (-result - 1) / 2 : result / 2;
 
 		shift = 1;
 		result = 0;
@@ -80,7 +79,7 @@ polyline.decode = function(str, precision) {
 			shift *= 32;
 		} while (byte >= 0x20);
 
-        longitude_change = (result & 1) ? ((-result - 1) / 2) : (result / 2);
+		longitude_change = result & 1 ? (-result - 1) / 2 : result / 2;
 
 		lat += latitude_change;
 		lng += longitude_change;
@@ -99,13 +98,18 @@ polyline.decode = function(str, precision) {
  * @returns {String}
  */
 polyline.encode = function (coordinates, precision) {
-    if (!coordinates.length) { return ''; }
+	if (!coordinates.length) {
+		return '';
+	}
 
 	var factor = Math.pow(10, Number.isInteger(precision) ? precision : 5),
-        output = encode(coordinates[0][0], 0, factor) + encode(coordinates[0][1], 0, factor);
+		output =
+			encode(coordinates[0][0], 0, factor) +
+			encode(coordinates[0][1], 0, factor);
 
 	for (var i = 1; i < coordinates.length; i++) {
-        var a = coordinates[i], b = coordinates[i - 1];
+		var a = coordinates[i],
+			b = coordinates[i - 1];
 		output += encode(a[0], b[0], factor);
 		output += encode(a[1], b[1], factor);
 	}
@@ -150,7 +154,7 @@ polyline.toGeoJSON = function(str, precision) {
 	var coords = polyline.decode(str, precision);
 	return {
 		type: 'LineString',
-        coordinates: flipped(coords)
+		coordinates: flipped(coords),
 	};
 };
 

apps/gg/script.js

@@ -1,4 +1,11 @@
-import {LitElement, html, unsafeHTML, css, guard, until} from './lit-all.min.js';
+import {
+	LitElement,
+	html,
+	unsafeHTML,
+	css,
+	guard,
+	until,
+} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
 import * as polyline from './polyline.js';
 import {gpx_parse} from './gpx.js';
@@ -65,9 +72,12 @@ class GgAppElement extends LitElement {
 	async load() {
 		console.log('load');
 		let emojis = await (await fetch('emojis.json')).json();
-		emojis = Object.values(emojis).map(x => Object.values(x)).flat();
+		emojis = Object.values(emojis)
+			.map((x) => Object.values(x))
+			.flat();
 		let today = new Date();
-		let date_index = today.getYear() * 356 + today.getMonth() * 31 + today.getDate();
+		let date_index =
+			today.getYear() * 356 + today.getMonth() * 31 + today.getDate();
 		this.emoji_of_the_day = emojis[(date_index * 123457) % emojis.length];
 		this.user = await tfrpc.rpc.getUser();
 		this.url = (await tfrpc.rpc.url()).split('?')[0];
@@ -109,7 +119,8 @@ class GgAppElement extends LitElement {
 	async get_activities_from_ssb() {
 		this.status = {text: 'loading activities'};
 		this.loaded_activities = [];
-		let rows = await tfrpc.rpc.query(`
+		let rows = await tfrpc.rpc.query(
+			`
 			SELECT messages.author, json_extract(mention.value, '$.link') AS blob_id
 			FROM messages_fts('"gg-activity"')
 			JOIN messages ON messages.rowid = messages_fts.rowid,
@@ -117,10 +128,15 @@ class GgAppElement extends LitElement {
 			WHERE json_extract(messages.content, '$.type') = 'gg-activity' AND
 			json_extract(mention.value, '$.name') = 'activity_data'
 			ORDER BY messages.timestamp DESC
-		`, []);
+		`,
+			[]
+		);
 		this.status = {text: 'loading activity data'};
-		let authors = rows.map(x => x.author);
+		let authors = rows.map((x) => x.author);
-		let blobs = await this.promise_all(rows.map(x => tfrpc.rpc.get_blob(x.blob_id)), 8);
+		let blobs = await this.promise_all(
+			rows.map((x) => tfrpc.rpc.get_blob(x.blob_id)),
+			8
+		);
 		this.status = {text: 'processing activity data'};
 		for (let [index, blob] of blobs.entries()) {
 			let activity;
@@ -135,13 +151,19 @@ class GgAppElement extends LitElement {
 			}
 		}
 		this.status = {text: 'calculating balance'};
-		rows = await tfrpc.rpc.query(`
+		rows = await tfrpc.rpc.query(
+			`
 			SELECT count(*) AS currency FROM messages WHERE author = ? AND json_extract(content, '$.type') = 'gg-activity'
-		`, [this.whoami]);
+		`,
+			[this.whoami]
+		);
 		let currency = rows[0].currency;
-		rows = await tfrpc.rpc.query(`
+		rows = await tfrpc.rpc.query(
+			`
 			SELECT SUM(json_extract(content, '$.cost')) AS cost FROM messages WHERE author = ? AND json_extract(content, '$.type') = 'gg-place'
-		`, [this.whoami]);
+		`,
+			[this.whoami]
+		);
 		let spent = rows[0].cost;
 		this.currency = currency - spent;
 		this.status = {text: 'getting placed emojis'};
@@ -166,8 +188,11 @@ class GgAppElement extends LitElement {
 	}
 
 	async sync_activities() {
-		let ids = this.activities.map(x => `https://www.strava.com/activities/${x.id}`);
+		let ids = this.activities.map(
-		let missing = await tfrpc.rpc.query(`
+			(x) => `https://www.strava.com/activities/${x.id}`
+		);
+		let missing = await tfrpc.rpc.query(
+			`
 			WITH my_activities AS (
 				SELECT json_extract(mention.value, '$.link') AS url
 				FROM messages, json_each(messages.content, '$.mentions') AS mention
@@ -178,17 +203,26 @@ class GgAppElement extends LitElement {
 			SELECT from_strava.value FROM json_each(?) AS from_strava
 			LEFT OUTER JOIN my_activities ON from_strava.value = my_activities.url
 			WHERE my_activities.url IS NULL
-			`, [this.whoami, JSON.stringify(ids)]);
+			`,
+			[this.whoami, JSON.stringify(ids)]
+		);
 		console.log('missing = ', missing);
 		for (let [index, row] of missing.entries()) {
-			this.status = {text: 'syncing from strava', value: index, max: missing.length};
+			this.status = {
+				text: 'syncing from strava',
+				value: index,
+				max: missing.length,
+			};
 			let url = row.value;
 			let id = url.match(/.*\/(\d+)/)[1];
-			let response = await fetch(`https://www.strava.com/api/v3/activities/${id}`, {
+			let response = await fetch(
+				`https://www.strava.com/api/v3/activities/${id}`,
+				{
 					headers: {
-					'Authorization': `Bearer ${this.strava.access_token}`,
+						Authorization: `Bearer ${this.strava.access_token}`,
 					},
-			});
+				}
+			);
 			let activity = await response.json();
 			let blob_id = await tfrpc.rpc.store_blob(JSON.stringify(activity));
 			let message = {
@@ -201,7 +235,7 @@ class GgAppElement extends LitElement {
 					{
 						link: blob_id,
 						name: 'activity_data',
-					}
+					},
 				],
 			};
 			await tfrpc.rpc.appendMessage(this.whoami, message);
@@ -215,13 +249,20 @@ class GgAppElement extends LitElement {
 			return;
 		}
 		let ids = await tfrpc.rpc.getIdentities();
-		let players = ids.length ? (await tfrpc.rpc.query(`
+		let players = ids.length
+			? (
+					await tfrpc.rpc.query(
+						`
 			SELECT author FROM messages JOIN json_each(?) ON messages.author = json_each.value
 			WHERE
 				json_extract(messages.content, '$.type') = 'gg-player' AND
 				json_extract(messages.content, '$.active')
 			ORDER BY timestamp DESC limit 1
-			`, [JSON.stringify(ids)])).map(row => row.author) : [];
+			`,
+						[JSON.stringify(ids)]
+					)
+				).map((row) => row.author)
+			: [];
 		if (!players.length) {
 			this.whoami = await tfrpc.rpc.createIdentity();
 			if (this.whoami) {
@@ -246,9 +287,14 @@ class GgAppElement extends LitElement {
 			await tfrpc.rpc.databaseSet('strava', shared);
 			await tfrpc.rpc.sharedDatabaseRemove(name);
 		}
-		this.strava = JSON.parse(await tfrpc.rpc.databaseGet('strava') || '{}');
+		this.strava = JSON.parse((await tfrpc.rpc.databaseGet('strava')) || '{}');
 		if (new Date().valueOf() / 1000 > this.strava.expires_at) {
-			console.log('this looks expired', new Date().valueOf() / 1000, '>', this.strava.expires_at);
+			console.log(
+				'this looks expired',
+				new Date().valueOf() / 1000,
+				'>',
+				this.strava.expires_at
+			);
 			let x = await tfrpc.rpc.refresh_token(this.strava);
 			if (x) {
 				this.strava = x;
@@ -261,13 +307,16 @@ class GgAppElement extends LitElement {
 
 	async update_activities() {
 		if (this?.strava?.access_token) {
-			let response = await fetch('https://www.strava.com/api/v3/athlete/activities', {
+			let response = await fetch(
+				'https://www.strava.com/api/v3/athlete/activities',
+				{
 					headers: {
-					'Authorization': `Bearer ${this.strava.access_token}`,
+						Authorization: `Bearer ${this.strava.access_token}`,
 					},
-			});
+				}
+			);
 			this.activities = await response.json();
-			this.activities.sort((a, b) => (a.id - b.id));
+			this.activities.sort((a, b) => a.id - b.id);
 		}
 	}
 
@@ -282,10 +331,12 @@ class GgAppElement extends LitElement {
 			[k_color_default, '🟧'],
 		];
 		for (let m of k_map) {
-			if (m[0][0] == color[0] &&
+			if (
+				m[0][0] == color[0] &&
 				m[0][1] == color[1] &&
 				m[0][2] == color[2] &&
-				m[0][3] == color[3]) {
+				m[0][3] == color[3]
+			) {
 				return m[1];
 			}
 		}
@@ -329,9 +380,11 @@ class GgAppElement extends LitElement {
 	on_click(event) {
 		let popup = L.popup()
 			.setLatLng(event.latlng)
-			.setContent(`
+			.setContent(
+				`
 				<div><a target="_top" href="https://www.google.com/maps/search/?api=1&query=${event.latlng.lat},${event.latlng.lng}">${event.latlng.lat}, ${event.latlng.lng}</a></div>
-			`)
+			`
+			)
 			.openOn(this.leaflet);
 	}
 
@@ -368,31 +421,43 @@ class GgAppElement extends LitElement {
 	on_marker_click(event) {
 		this.popup = L.popup()
 			.setLatLng(event.latlng)
-			.setContent(`
+			.setContent(
+				`
 				${this.to_build} (-${k_store[this.to_build]}) <input type="button" value="Build" onclick="document.getElementById('ggapp').build()"></input>
-			`)
+			`
+			)
 			.openOn(this.leaflet);
 	}
 
 	snap_to_grid(latlng, fudge, zoom) {
-		let position = this.leaflet.options.crs.latLngToPoint(latlng, zoom ?? this.leaflet.getZoom());
+		let position = this.leaflet.options.crs.latLngToPoint(
+			latlng,
+			zoom ?? this.leaflet.getZoom()
+		);
 		position.x = Math.round(position.x / 16) * 16 + (fudge?.x ?? 0);
 		position.y = Math.round(position.y / 16) * 16 + (fudge?.y ?? 0);
-		position = this.leaflet.options.crs.pointToLatLng(position, zoom ?? this.leaflet.getZoom());
+		position = this.leaflet.options.crs.pointToLatLng(
+			position,
+			zoom ?? this.leaflet.getZoom()
+		);
 		return position;
 	}
 
 	on_marker_move(event) {
 		if (!this.no_snap && this.marker) {
 			this.no_snap = true;
-			this.marker.setLatLng(this.snap_to_grid(this.marker.getLatLng(), k_marker_snap));
+			this.marker.setLatLng(
+				this.snap_to_grid(this.marker.getLatLng(), k_marker_snap)
+			);
 			this.no_snap = false;
 		}
 	}
 
 	on_zoom(event) {
 		if (this.marker) {
-			this.marker.setLatLng(this.snap_to_grid(this.marker.getLatLng(), k_marker_snap));
+			this.marker.setLatLng(
+				this.snap_to_grid(this.marker.getLatLng(), k_marker_snap)
+			);
 		}
 	}
 
@@ -403,7 +468,10 @@ class GgAppElement extends LitElement {
 		}
 
 		if (this.to_build) {
-			this.marker = L.marker(this.snap_to_grid(event.latlng, k_marker_snap), {icon: L.divIcon({className: 'build-icon'}), draggable: true}).addTo(this.leaflet);
+			this.marker = L.marker(this.snap_to_grid(event.latlng, k_marker_snap), {
+				icon: L.divIcon({className: 'build-icon'}),
+				draggable: true,
+			}).addTo(this.leaflet);
 			this.marker.on({click: this.on_marker_click.bind(this)});
 			this.marker.on({drag: this.on_marker_move.bind(this)});
 		}
@@ -417,7 +485,11 @@ class GgAppElement extends LitElement {
 			return;
 		}
 		if (!this.leaflet) {
-			this.leaflet = L.map(map, {attributionControl: false, maxZoom: 16, bounceAtZoomLimits: false});
+			this.leaflet = L.map(map, {
+				attributionControl: false,
+				maxZoom: 16,
+				bounceAtZoomLimits: false,
+			});
 			this.leaflet.on({contextmenu: this.on_click.bind(this)});
 			this.leaflet.on({click: this.on_mouse_down.bind(this)});
 			this.leaflet.on({zoom: this.on_zoom.bind(this)});
@@ -432,7 +504,7 @@ class GgAppElement extends LitElement {
 				var context = tile.getContext('2d');
 				context.font = '10pt sans';
 				let bounds = this._tileCoordsToBounds(coords);
-				let degrees = 360.0 / (2 ** coords.z);
+				let degrees = 360.0 / 2 ** coords.z;
 				let ul = bounds.getNorthWest();
 				let lr = bounds.getSouthEast();
 
@@ -442,33 +514,53 @@ class GgAppElement extends LitElement {
 				let mini_context = mini.getContext('2d');
 				let image_data = context.getImageData(0, 0, mini.width, mini.height);
 				for (let activity of self.loaded_activities) {
-					self.draw_activity_to_tile(image_data, mini.width, mini.height, ul, lr, activity);
+					self.draw_activity_to_tile(
+						image_data,
+						mini.width,
+						mini.height,
+						ul,
+						lr,
+						activity
+					);
 				}
 				context.textAlign = 'left';
 				context.textBaseline = 'bottom';
 				for (let x = 0; x < mini.width; x++) {
 					for (let y = 0; y < mini.height; y++) {
 						let start = (y * mini.width + x) * 4;
-						let pixel = self.color_to_emoji(image_data.data.slice(start, start + 4));
+						let pixel = self.color_to_emoji(
+							image_data.data.slice(start, start + 4)
+						);
 						if (pixel) {
 							//context.fillRect(x * size.x / mini.width, y * size.y / mini.height, size.x / mini.width, size.y / mini.height);
-							context.fillText(pixel, x * size.x / mini.width, y * size.y / mini.height + mini.height);
+							context.fillText(
+								pixel,
+								(x * size.x) / mini.width,
+								(y * size.y) / mini.height + mini.height
+							);
 						}
 					}
 				}
 				for (let placed of self.placed_emojis) {
-					let position = self.leaflet.options.crs.latLngToPoint(self.snap_to_grid(placed.position, undefined, coords.z), coords.z);
+					let position = self.leaflet.options.crs.latLngToPoint(
+						self.snap_to_grid(placed.position, undefined, coords.z),
+						coords.z
+					);
 					let tile_x = Math.floor(position.x / size.x);
 					let tile_y = Math.floor(position.y / size.y);
 					position.x = position.x - tile_x * size.x;
 					position.y = position.y - tile_y * size.y;
 					if (tile_x == coords.x && tile_y == coords.y) {
 						//context.fillRect(position.x, position.y, size.x / mini.width, size.y / mini.height);
-						context.fillText(placed.emoji, position.x, position.y + mini.height);
+						context.fillText(
+							placed.emoji,
+							position.x,
+							position.y + mini.height
+						);
 					}
 				}
 				return tile;
-			}
+			},
 		});
 		if (this.grid_layer) {
 			this.grid_layer.redraw();
@@ -484,10 +576,7 @@ class GgAppElement extends LitElement {
 			this.max_lon = Math.max(this.max_lon, bounds.max.lng);
 		}
 		if (this.focus) {
-			this.leaflet.fitBounds([
+			this.leaflet.fitBounds([this.focus.min, this.focus.max]);
-				this.focus.min,
-				this.focus.max,
-			]);
 			this.focus = undefined;
 		} else {
 			this.leaflet.fitBounds([
@@ -588,7 +677,12 @@ class GgAppElement extends LitElement {
 		let sy = y0 < y1 ? 1 : -1;
 		let error = dx + dy;
 		while (true) {
-			if (x0 >= 0 && y0 >= 0 && x0 < image_data.width && y0 < image_data.height) {
+			if (
+				x0 >= 0 &&
+				y0 >= 0 &&
+				x0 < image_data.width &&
+				y0 < image_data.height
+			) {
 				let base = (y0 * image_data.width + x0) * 4;
 				image_data.data[base + 0] = value[0];
 				image_data.data[base + 1] = value[1];
@@ -623,8 +717,8 @@ class GgAppElement extends LitElement {
 			let last;
 			for (let pt of polyline.decode(activity.map.polyline)) {
 				let px = [
-					Math.floor(width * (pt[1] - ul.lng) / (lr.lng - ul.lng)),
+					Math.floor((width * (pt[1] - ul.lng)) / (lr.lng - ul.lng)),
-					Math.floor(height * (pt[0] - ul.lat) / (lr.lat - ul.lat)),
+					Math.floor((height * (pt[0] - ul.lat)) / (lr.lat - ul.lat)),
 				];
 				if (last) {
 					this.line(image_data, last[0], last[1], px[0], px[1], color);
@@ -637,8 +731,8 @@ class GgAppElement extends LitElement {
 				let last;
 				for (let pt of segment) {
 					let px = [
-						Math.floor(width * (pt.lon - ul.lng) / (lr.lng - ul.lng)),
+						Math.floor((width * (pt.lon - ul.lng)) / (lr.lng - ul.lng)),
-						Math.floor(height * (pt.lat - ul.lat) / (lr.lat - ul.lat)),
+						Math.floor((height * (pt.lat - ul.lat)) / (lr.lat - ul.lat)),
 					];
 					if (last) {
 						this.line(image_data, last[0], last[1], px[0], px[1], color);
@@ -667,7 +761,7 @@ class GgAppElement extends LitElement {
 					{
 						link: blob_id,
 						name: 'activity_data',
-					}
+					},
 				],
 			};
 			console.log('id =', this.whoami, 'message = ', message);
@@ -693,8 +787,7 @@ class GgAppElement extends LitElement {
 
 	focus_map(activity) {
 		let bounds = this.activity_bounds(activity);
-		if (bounds.min.lat < bounds.max.lat &&
+		if (bounds.min.lat < bounds.max.lat && bounds.min.lng < bounds.max.lng) {
-			bounds.min.lng < bounds.max.lng) {
 			this.tab = 'map';
 			this.focus = bounds;
 		}
@@ -703,9 +796,13 @@ class GgAppElement extends LitElement {
 	render_news() {
 		return html`
 			<ul>
-				${this.loaded_activities.map(x => html`
+				${this.loaded_activities.map(
-					<li style="cursor: pointer" @click=${() => this.focus_map(x)}>${x.author} ${x.name ?? x.time}</li>
+					(x) => html`
-				`)}
+						<li style="cursor: pointer" @click=${() => this.focus_map(x)}>
+							${x.author} ${x.name ?? x.time}
+						</li>
+					`
+				)}
 			</ul>
 		`;
 	}
@@ -714,7 +811,7 @@ class GgAppElement extends LitElement {
 		let [emoji, cost] = item;
 		return html`
 			<div>
-				<input type="button" value="${emoji}" @click=${() => this.to_build = emoji}></input> ${cost} ${emoji == this.to_build ? '<-- Will be built next' : undefined}
+				<input type="button" value="${emoji}" @click=${() => (this.to_build = emoji)}></input> ${cost} ${emoji == this.to_build ? '<-- Will be built next' : undefined}
 			</div>
 		`;
 	}
@@ -732,7 +829,10 @@ class GgAppElement extends LitElement {
 	render() {
 		let header;
 		if (!this.user?.credentials?.session?.name) {
-			header = html`<div style="flex: 1 0">Please <a target="_top" href="/login?return=${this.url}">login</a> to Tilde Friends, first.</div>`;
+			header = html`<div style="flex: 1 0">
+				Please <a target="_top" href="/login?return=${this.url}">login</a> to
+				Tilde Friends, first.
+			</div>`;
 		} else if (!this.strava?.access_token) {
 			let strava_url = `https://www.strava.com/oauth/authorize?client_id=${k_client_id}&redirect_uri=${k_redirect_url}&response_type=code&approval_prompt=auto&scope=activity%3Aread&state=${g_data.state}`;
 			header = html`
@@ -765,10 +865,10 @@ class GgAppElement extends LitElement {
 				}
 			</style>
 			<div id="navigation" style="display: flex; flex-direction: row">
-				<input type="button" id="button_map" @click=${() => this.tab = 'map'} value="🗺️Map"></input>
+				<input type="button" id="button_map" @click=${() => (this.tab = 'map')} value="🗺️Map"></input>
-				<input type="button" id="button_news" @click=${() => this.tab = 'news'} value="🏃News"></input>
+				<input type="button" id="button_news" @click=${() => (this.tab = 'news')} value="🏃News"></input>
-				<input type="button" id="button_friends" @click=${() => this.tab = 'friends'} value="👫Friends"></input>
+				<input type="button" id="button_friends" @click=${() => (this.tab = 'friends')} value="👫Friends"></input>
-				<input type="button" id="button_store" @click=${() => this.tab = 'store'} value="🏗️Store"></input>
+				<input type="button" id="button_store" @click=${() => (this.tab = 'store')} value="🏗️Store"></input>
 			</div>
 		`;
 
@@ -796,7 +896,9 @@ class GgAppElement extends LitElement {
 				}
 			</style>
 			<link rel="stylesheet" href="leaflet.css" />
-			<div style="width: 100%; height: 100%; display: flex; flex-direction: column">
+			<div
+				style="width: 100%; height: 100%; display: flex; flex-direction: column"
+			>
 				${header}
 				<div style="flex: 1 0; overflow: scroll">${content}</div>
 				${navigation}

apps/identity.json

@@ -0,0 +1,5 @@
+{
+	"type": "tildefriends-app",
+	"emoji": "🪪",
+	"previous": "&kgukkyDk1RxgfzgMH6H/0QeDPIuwPZypLuAFax21ljk=.sha256"
+}

apps/identity/app.js

@@ -0,0 +1,93 @@
+import * as tfrpc from '/tfrpc.js';
+
+tfrpc.register(async function get_private_key(id) {
+	return bip39Words(await ssb.getPrivateKey(id));
+});
+tfrpc.register(async function create_id(id) {
+	return await ssb.createIdentity();
+});
+tfrpc.register(async function add_id(id) {
+	return await ssb.addIdentity(bip39Bytes(id));
+});
+tfrpc.register(async function delete_id(id) {
+	return await ssb.deleteIdentity(id);
+});
+tfrpc.register(async function reload() {
+	await main();
+});
+
+async function main() {
+	let ids = await ssb.getIdentities();
+	await app.setDocument(
+		`<body style="color: #fff">
+		<script>const handler = {};</script>
+		<script type="module">
+			import * as tfrpc from '/static/tfrpc.js';
+			handler.export_id = async function export_id(event) {
+				let id = event.srcElement.dataset.id;
+				let element = document.createElement('textarea');
+				element.value = await tfrpc.rpc.get_private_key(id);
+				element.style = 'width: 100%; read-only: true';
+				element.readOnly = true;
+				event.srcElement.parentElement.appendChild(element);
+				event.srcElement.onclick = event => handler.hide_id(event, element);
+			}
+			handler.add_id = async function add_id(event) {
+				let id = document.getElementById('add_id').value;
+				try {
+					let new_id = await tfrpc.rpc.add_id(id);
+					alert('Successfully imported: ' + new_id);
+					await tfrpc.rpc.reload();
+				} catch (e) {
+					alert('Error importing identity: ' + e);
+				}
+			}
+			handler.create_id = async function create_id(event) {
+				try {
+					let id = await tfrpc.rpc.create_id();
+					alert('Successfully created: ' + id);
+					await tfrpc.rpc.reload();
+				} catch (e) {
+					alert('Error creating identity: ' + e);
+				}
+			}
+			handler.hide_id = function hide_id(event, element) {
+				element.parentNode.removeChild(element);
+				event.srcElement.onclick = handler.export_id;
+			}
+			handler.delete_id = async function delete_id(event) {
+				let id = event.srcElement.dataset.id;
+				try {
+					if (prompt('Are you sure you want to delete "' + id + '"?  It cannot be recovered without the exported phrase.\\n\\nEnter the word "DELETE" to confirm you wish to delete it.') === 'DELETE') {
+						if (await tfrpc.rpc.delete_id(id)) {
+							alert('Successfully deleted ID: ' + id);
+						}
+						await tfrpc.rpc.reload();
+					}
+				} catch (e) {
+					alert('Error deleting ID: ' + e);
+				}
+			}
+		</script>
+		<h1>SSB Identity Management</h1>
+		<h2>Create a new identity</h2>
+		<button id="create_id" onclick="handler.create_id()">Create Identity</button>
+		<h2>Import an SSB Identity from 12 BIP39 English Words</h2>
+		<textarea id="add_id" style="width: 100%" rows="4"></textarea><button id="add" onclick="handler.add_id(event)">Import Identity</button>
+		<h2>Identities</h2>
+		<ul>` +
+			ids
+				.map(
+					(id) => `<li>
+			<button onclick="handler.export_id(event)" data-id="${id}">Export Identity</button>
+			<button onclick="handler.delete_id(event)" data-id="${id}">Delete Identity</button>
+			${id}
+		</li>`
+				)
+				.join('\n') +
+			`	</ul>
+	</body>`
+	);
+}
+
+main();

apps/issues/app.js

@@ -97,7 +97,7 @@ core.register('onConnectionsChanged', async function() {
 });
 
 async function main() {
-	if (typeof(database) !== 'undefined') {
+	if (typeof database !== 'undefined') {
 		g_database = await database('ssb');
 	}
 	await app.setDocument(utf8Decode(await getFile('index.html')));

apps/issues/index.html

@@ -1,12 +1,14 @@
-<!DOCTYPE html>
+<!doctype html>
 <html style="color: #fff">
 	<head>
 		<title>Tilde Friends</title>
-		<base target="_top">
+		<base target="_top" />
 	</head>
 	<body>
 		<tf-issues-app />
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script src="commonmark.min.js"></script>
 		<script src="commonmark-linkify.js" type="module"></script>
 		<script src="script.js" type="module"></script>

apps/issues/script.js

@@ -31,7 +31,12 @@ class TfIdPickerElement extends LitElement {
 		if (this.ids) {
 			return html`
 				<select @change=${this.changed} style="max-width: 100%">
-					${(this.ids).map(id => html`<option ?selected=${id == this.selected} value=${id}>${id}</option>`)}
+					${this.ids.map(
+						(id) =>
+							html`<option ?selected=${id == this.selected} value=${id}>
+								${id}
+							</option>`
+					)}
 				</select>
 			`;
 		} else {
@@ -57,13 +62,15 @@ class TfComposeElement extends LitElement {
 	}
 
 	submit() {
-		this.dispatchEvent(new CustomEvent('tf-submit', {
+		this.dispatchEvent(
+			new CustomEvent('tf-submit', {
 				bubbles: true,
 				composed: true,
 				detail: {
 					value: this.renderRoot.getElementById('input').value,
 				},
-		}));
+			})
+		);
 		this.renderRoot.getElementById('input').value = '';
 		this.input();
 	}
@@ -96,7 +103,8 @@ class TfIssuesAppElement extends LitElement {
 
 	async load() {
 		let issues = {};
-		let messages = await tfrpc.rpc.query(`
+		let messages = await tfrpc.rpc.query(
+			`
 			WITH issues AS (SELECT messages.* FROM messages_refs JOIN messages ON
 				messages.id = messages_refs.message
 				WHERE messages_refs.ref = ? AND json_extract(messages.content, '$.type') = 'issue'),
@@ -107,7 +115,9 @@ class TfIssuesAppElement extends LitElement {
 			SELECT * FROM issues
 			UNION
 			SELECT * FROM edits ORDER BY timestamp
-		`, [k_project]);
+		`,
+			[k_project]
+		);
 		for (let message of messages) {
 			let content = JSON.parse(message.content);
 			switch (content.type) {
@@ -123,7 +133,7 @@ class TfIssuesAppElement extends LitElement {
 					break;
 				case 'issue-edit':
 				case 'post':
-					for (let issue of (content.issues || [])) {
+					for (let issue of content.issues || []) {
 						if (issues[issue.link]) {
 							if (issue.open !== undefined) {
 								issues[issue.link].open = issue.open;
@@ -136,7 +146,9 @@ class TfIssuesAppElement extends LitElement {
 					break;
 			}
 		}
-		this.issues = Object.values(issues).sort((x, y) => (y.open - x.open) || (y.created - x.created));
+		this.issues = Object.values(issues).sort(
+			(x, y) => y.open - x.open || y.created - x.created
+		);
 		if (this.selected) {
 			for (let issue of this.issues) {
 				if (issue.id == this.selected.id) {
@@ -150,11 +162,20 @@ class TfIssuesAppElement extends LitElement {
 		return html`
 			<tr>
 				<td>${issue.open ? '☐ open' : '☑ closed'}</td>
-				<td style="max-width: 8em; overflow: hidden; white-space: nowrap; text-overflow: ellipsis">${issue.author}</td>
+				<td
-				<td style="max-width: 40em; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; cursor: pointer" @click=${() => this.selected = issue}>
+					style="max-width: 8em; overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
+				>
+					${issue.author}
+				</td>
+				<td
+					style="max-width: 40em; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; cursor: pointer"
+					@click=${() => (this.selected = issue)}
+				>
 					${issue.text.split('\n')?.[0]}
 				</td>
-				<td>${new Date(issue.updated ?? issue.created).toLocaleDateString()}</td>
+				<td>
+					${new Date(issue.updated ?? issue.created).toLocaleDateString()}
+				</td>
 			</tr>
 		`;
 	}
@@ -170,13 +191,21 @@ class TfIssuesAppElement extends LitElement {
 				<div>${new Date(update.timestamp).toLocaleString()}</div>
 				<div>${update.author}</div>
 				<div>${message}</div>
-				<div>${update.open !== undefined ? (update.open ? 'issue opened' : 'issue closed') : undefined}</div>
+				<div>
+					${update.open !== undefined
+						? update.open
+							? 'issue opened'
+							: 'issue closed'
+						: undefined}
+				</div>
 			</div>
 		`;
 	}
 
 	async set_open(id, open) {
-		if (confirm(`Are you sure you want to ${open ? 'open' : 'close'} this issue?`)) {
+		if (
+			confirm(`Are you sure you want to ${open ? 'open' : 'close'} this issue?`)
+		) {
 			let whoami = this.shadowRoot.getElementById('picker').selected;
 			await tfrpc.rpc.appendMessage(whoami, {
 				type: 'issue-edit',
@@ -207,7 +236,9 @@ class TfIssuesAppElement extends LitElement {
 			type: 'post',
 			text: event.detail.value,
 			root: this.selected.id,
-			branch: this.selected.updates.length ? this.selected.updates[this.selected.updates.length - 1].id : this.selected.id,
+			branch: this.selected.updates.length
+				? this.selected.updates[this.selected.updates.length - 1].id
+				: this.selected.id,
 			issues: [
 				{
 					link: this.selected.id,
@@ -226,16 +257,18 @@ class TfIssuesAppElement extends LitElement {
 			return html`
 				${header}
 				<div>
-					<input type="button" value="Back" @click=${() => this.selected = undefined}></input>
+					<input type="button" value="Back" @click=${() => (this.selected = undefined)}></input>
-					${this.selected.open ?
+					${
-						html`<input type="button" value="Close Issue" @click=${() => this.set_open(this.selected.id, false)}></input>` :
+						this.selected.open
-						html`<input type="button" value="Reopen Issue" @click=${() => this.set_open(this.selected.id, true)}></input>`}
+							? html`<input type="button" value="Close Issue" @click=${() => this.set_open(this.selected.id, false)}></input>`
+							: html`<input type="button" value="Reopen Issue" @click=${() => this.set_open(this.selected.id, true)}></input>`
+					}
 				</div>
 				<div>${new Date(this.selected.created).toLocaleString()}</div>
 				<div>${this.selected.author}</div>
 				<div>${this.selected.id}</div>
 				<div>${unsafeHTML(tfutils.markdown(this.selected.text))}</div>
-				${this.selected.updates.map(x => this.render_update(x))}
+				${this.selected.updates.map((x) => this.render_update(x))}
 				<tf-compose @tf-submit=${this.reply_to_issue}></tf-compose>
 			`;
 		} else {
@@ -250,7 +283,7 @@ class TfIssuesAppElement extends LitElement {
 						<th>Title</th>
 						<th>Date</th>
 					</tr>
-					${this.issues.map(x => this.render_issue_table_row(x))}
+					${this.issues.map((x) => this.render_issue_table_row(x))}
 				</table>
 			`;
 		}

apps/issues/tf-utils.js

@@ -1,20 +1,32 @@
 import * as linkify from './commonmark-linkify.js';
 
 function image(node, entering) {
-	if (node.firstChild?.type === 'text' &&
+	if (
-		node.firstChild.literal.startsWith('video:')) {
+		node.firstChild?.type === 'text' &&
+		node.firstChild.literal.startsWith('video:')
+	) {
 		if (entering) {
-			this.lit('<video style="max-width: 100%; max-height: 480px" title="' + this.esc(node.firstChild?.literal) + '" controls>');
+			this.lit(
+				'<video style="max-width: 100%; max-height: 480px" title="' +
+					this.esc(node.firstChild?.literal) +
+					'" controls>'
+			);
 			this.lit('<source src="' + this.esc(node.destination) + '"></source>');
 			this.disableTags += 1;
 		} else {
 			this.disableTags -= 1;
 			this.lit('</video>');
 		}
-	} else if (node.firstChild?.type === 'text' &&
+	} else if (
-		node.firstChild.literal.startsWith('audio:')) {
+		node.firstChild?.type === 'text' &&
+		node.firstChild.literal.startsWith('audio:')
+	) {
 		if (entering) {
-			this.lit('<audio style="height: 32px; max-width: 100%" title="' + this.esc(node.firstChild?.literal) + '" controls>');
+			this.lit(
+				'<audio style="height: 32px; max-width: 100%" title="' +
+					this.esc(node.firstChild?.literal) +
+					'" controls>'
+			);
 			this.lit('<source src="' + this.esc(node.destination) + '"></source>');
 			this.disableTags += 1;
 		} else {
@@ -24,7 +36,11 @@ function image(node, entering) {
 	} else {
 		if (entering) {
 			if (this.disableTags === 0) {
-				this.lit('<div class="img_caption">' + this.esc(node.firstChild?.literal || node.destination) + '</div>');
+				this.lit(
+					'<div class="img_caption">' +
+						this.esc(node.firstChild?.literal || node.destination) +
+						'</div>'
+				);
 				if (this.options.safe && potentiallyUnsafe(node.destination)) {
 					this.lit('<img src="" alt="');
 				} else {
@@ -56,14 +72,20 @@ export function markdown(md) {
 		node = event.node;
 		if (event.entering) {
 			if (node.type == 'link') {
-				if (node.destination.startsWith('@') &&
+				if (
-					node.destination.endsWith('.ed25519')) {
+					node.destination.startsWith('@') &&
+					node.destination.endsWith('.ed25519')
+				) {
 					node.destination = '#' + node.destination;
-				} else if (node.destination.startsWith('%') &&
+				} else if (
-					node.destination.endsWith('.sha256')) {
+					node.destination.startsWith('%') &&
+					node.destination.endsWith('.sha256')
+				) {
 					node.destination = '#' + node.destination;
-				} else if (node.destination.startsWith('&') &&
+				} else if (
-					node.destination.endsWith('.sha256')) {
+					node.destination.startsWith('&') &&
+					node.destination.endsWith('.sha256')
+				) {
 					node.destination = '/' + node.destination + '/view';
 				}
 			} else if (node.type == 'image') {

apps/journal/app.js

@@ -104,8 +104,7 @@ async function process_message(whoami, collection, message, kind, parent) {
 		if (!x) {
 			return;
 		}
-		if (content.type !== kind ||
+		if (content.type !== kind || (parent && content.parent !== parent)) {
-			(parent && content.parent !== parent)) {
 			return;
 		}
 	}
@@ -113,7 +112,10 @@ async function process_message(whoami, collection, message, kind, parent) {
 		if (content?.tombstone) {
 			delete collection[content.key];
 		} else {
-			collection[content.key] = Object.assign(collection[content.key] || {}, content);
+			collection[content.key] = Object.assign(
+				collection[content.key] || {},
+				content
+			);
 		}
 	} else {
 		collection[message.id] = Object.assign(content, {id: message.id});
@@ -125,20 +127,29 @@ tfrpc.register(async function collection(ids, kind, parent, max_rowid, data) {
 	let whoami = await ssb.getIdentities();
 	data = data ?? {};
 	let rowid = 0;
-	await ssb.sqlAsync('SELECT MAX(rowid) AS rowid FROM messages', [], function(row) {
+	await ssb.sqlAsync(
+		'SELECT MAX(rowid) AS rowid FROM messages',
+		[],
+		function (row) {
 			rowid = row.rowid;
-	});
+		}
+	);
 	while (true) {
 		if (rowid == max_rowid) {
 			await new_message();
-			await ssb.sqlAsync('SELECT MAX(rowid) AS rowid FROM messages', [], function(row) {
+			await ssb.sqlAsync(
+				'SELECT MAX(rowid) AS rowid FROM messages',
+				[],
+				function (row) {
 					rowid = row.rowid;
-			});
+				}
+			);
 		}
 
 		let modified = false;
 		let rows = [];
-		await ssb.sqlAsync(`
+		await ssb.sqlAsync(
+			`
 			SELECT messages.id, author, content, timestamp
 			FROM messages
 			JOIN json_each(?1) AS id ON messages.author = id.value
@@ -152,7 +163,8 @@ tfrpc.register(async function collection(ids, kind, parent, max_rowid, data) {
 			[JSON.stringify(ids), max_rowid ?? -1, rowid, kind, parent],
 			function (row) {
 				rows.push(row);
-			});
+			}
+		);
 		max_rowid = rowid;
 		for (let row of rows) {
 			if (await process_message(whoami, data, row, kind, parent)) {

apps/journal/index.html

@@ -1,12 +1,14 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
-		<base target="_top">
+		<base target="_top" />
 	</head>
 	<body style="color: #fff">
 		<tf-journal-app></tf-journal-app>
 		<script src="commonmark.min.js"></script>
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script src="tf-journal-app.js" type="module"></script>
 		<script src="tf-journal-entry.js" type="module"></script>
 		<script src="tf-id-picker.js" type="module"></script>

apps/journal/tf-id-picker.js

@@ -19,15 +19,22 @@ class TfIdentityPickerElement extends LitElement {
 
 	changed(event) {
 		this.selected = event.srcElement.value;
-		this.dispatchEvent(new Event('change', {
+		this.dispatchEvent(
+			new Event('change', {
 				srcElement: this,
-		}));
+			})
+		);
 	}
 
 	render() {
 		return html`
 			<select @change=${this.changed} style="max-width: 100%">
-				${(this.ids ?? []).map(id => html`<option ?selected=${id == this.selected} value=${id}>${id}</option>`)}
+				${(this.ids ?? []).map(
+					(id) =>
+						html`<option ?selected=${id == this.selected} value=${id}>
+							${id}
+						</option>`
+				)}
 			</select>
 		`;
 	}

apps/journal/tf-journal-app.js

@@ -28,9 +28,14 @@ class TfJournalAppElement extends LitElement {
 	async read_journals() {
 		let max_rowid;
 		let journals;
-		while (true)
+		while (true) {
-		{
+			[max_rowid, journals] = await tfrpc.rpc.collection(
-			[max_rowid, journals] = await tfrpc.rpc.collection([this.whoami], 'journal-entry', undefined, max_rowid, journals);
+				[this.whoami],
+				'journal-entry',
+				undefined,
+				max_rowid,
+				journals
+			);
 			this.journals = Object.assign({}, journals);
 			console.log('JOURNALS', this.journals);
 		}
@@ -52,7 +57,11 @@ class TfJournalAppElement extends LitElement {
 		};
 		message.recps = [this.whoami];
 		print(message);
-		message = await tfrpc.rpc.encrypt(this.whoami, message.recps, JSON.stringify(message));
+		message = await tfrpc.rpc.encrypt(
+			this.whoami,
+			message.recps,
+			JSON.stringify(message)
+		);
 		print(message);
 		await tfrpc.rpc.appendMessage(this.whoami, message);
 	}
@@ -62,12 +71,17 @@ class TfJournalAppElement extends LitElement {
 		let self = this;
 		return html`
 			<div>
-				<tf-id-picker .ids=${this.ids} selected=${this.whoami} @change=${this.on_whoami_changed}></tf-id-picker>
+				<tf-id-picker
+					.ids=${this.ids}
+					selected=${this.whoami}
+					@change=${this.on_whoami_changed}
+				></tf-id-picker>
 			</div>
 			<tf-journal-entry
 				whoami=${this.whoami}
 				.journals=${this.journals}
-				@publish=${this.on_journal_publish}></tf-journal-entry>
+				@publish=${this.on_journal_publish}
+			></tf-journal-entry>
 		`;
 	}
 }

apps/journal/tf-journal-entry.js

@@ -30,13 +30,15 @@ class TfJournalEntryElement extends LitElement {
 
 	async on_publish() {
 		console.log('publish', this.text);
-		this.dispatchEvent(new CustomEvent('publish', {
+		this.dispatchEvent(
+			new CustomEvent('publish', {
 				bubbles: true,
 				detail: {
 					key: this.shadowRoot.getElementById('date_picker').value,
 					text: this.text,
 				},
-		}));
+			})
+		);
 	}
 
 	back_dates(count) {
@@ -63,19 +65,30 @@ class TfJournalEntryElement extends LitElement {
 		console.log('RENDER ENTRY', this.key, this.journals?.[this.key]);
 		return html`
 			<select id="date_picker" @change=${this.on_date_change}>
-				${this.back_dates(10).map(x => html`
+				${this.back_dates(10).map(
-					<option value=${x}>${x}</option>
+					(x) => html` <option value=${x}>${x}</option> `
-				`)}
+				)}
 			</select>
 			<div style="display: inline-flex; flex-direction: row">
-				<button ?disabled=${this.text == this.journals?.[this.key]?.text} @click=${this.on_publish}>Publish</button>
+				<button
+					?disabled=${this.text == this.journals?.[this.key]?.text}
+					@click=${this.on_publish}
+				>
+					Publish
+				</button>
 				<button @click=${this.on_discard}>Discard</button>
 			</div>
 			<div style="display: flex; flex-direction: row">
 				<textarea
 					style="flex: 1 1; min-height: 10em"
-					@input=${this.on_edit} .value=${this.text ?? this.journals?.[this.key]?.text ?? ''}></textarea>
+					@input=${this.on_edit}
-				<div style="flex: 1 1">${unsafeHTML(this.markdown(this.text ?? this.journals?.[this.key]?.text))}</div>
+					.value=${this.text ?? this.journals?.[this.key]?.text ?? ''}
+				></textarea>
+				<div style="flex: 1 1">
+					${unsafeHTML(
+						this.markdown(this.text ?? this.journals?.[this.key]?.text)
+					)}
+				</div>
 			</div>
 		`;
 	}

apps/sneaker/index.html

@@ -1,12 +1,14 @@
-<!DOCTYPE html>
+<!doctype html>
 <html style="color: #fff">
 	<head>
 		<title>Tilde Friends</title>
-		<base target="_top">
+		<base target="_top" />
 	</head>
 	<body>
 		<tf-sneaker-app />
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script src="filesaver.min.js"></script>
 		<script src="jszip.min.js"></script>
 		<script src="script.js" type="module"></script>

apps/sneaker/script.js

@@ -19,7 +19,8 @@ class TfSneakerAppElement extends LitElement {
 
 	async search() {
 		let q = this.renderRoot.getElementById('search').value;
-		let result = await tfrpc.rpc.query(`
+		let result = await tfrpc.rpc.query(
+			`
 			SELECT messages.author AS id, json_extract(messages.content, '$.name') AS name
 			FROM messages_fts(?)
 			JOIN messages ON messages.rowid = messages_fts.rowid
@@ -31,8 +32,9 @@ class TfSneakerAppElement extends LitElement {
 			HAVING MAX(messages.sequence)
 			ORDER BY COUNT(*) DESC
 			`,
-			[`"${q.replaceAll('"', '""')}"`]);
+			[`"${q.replaceAll('"', '""')}"`]
-		this.feeds = Object.fromEntries(result.map(x => [x.id, x.name]));
+		);
+		this.feeds = Object.fromEntries(result.map((x) => [x.id, x.name]));
 	}
 
 	format_message(message) {
@@ -70,6 +72,7 @@ class TfSneakerAppElement extends LitElement {
 			return true;
 		}
 
+		// prettier-ignore
 		if (startsWith(data, [0xff, 0xd8, 0xff, 0xdb]) ||
 			startsWith(data, [0xff, 0xd8, 0xff, 0xe0, 0x00, 0x10, 0x4a, 0x46, 0x49, 0x46, 0x00, 0x01]) ||
 			startsWith(data, [0xff, 0xd8, 0xff, 0xee]) ||
@@ -98,17 +101,29 @@ class TfSneakerAppElement extends LitElement {
 		let all_messages = '';
 		let sequence = -1;
 		let messages_done = 0;
-		let messages_max = (await tfrpc.rpc.query('SELECT MAX(sequence) AS total FROM messages WHERE author = ?', [id]))[0].total;
+		let messages_max = (
+			await tfrpc.rpc.query(
+				'SELECT MAX(sequence) AS total FROM messages WHERE author = ?',
+				[id]
+			)
+		)[0].total;
 		while (true) {
 			let messages = await tfrpc.rpc.query(
 				'SELECT * FROM messages WHERE author = ? AND SEQUENCE > ? ORDER BY sequence LIMIT 100',
 				[id, sequence]
 			);
 			if (messages?.length) {
-				all_messages += messages.map(x => JSON.stringify(this.format_message(x))).join('\n') + '\n';
+				all_messages +=
+					messages
+						.map((x) => JSON.stringify(this.format_message(x)))
+						.join('\n') + '\n';
 				sequence = messages[messages.length - 1].sequence;
 				messages_done += messages.length;
-				this.progress = {name: 'messages', value: messages_done, max: messages_max};
+				this.progress = {
+					name: 'messages',
+					value: messages_done,
+					max: messages_max,
+				};
 			} else {
 				break;
 			}
@@ -122,7 +137,8 @@ class TfSneakerAppElement extends LitElement {
 			FROM messages
 			JOIN messages_refs ON messages.id = messages_refs.message
 			WHERE messages.author = ? AND messages_refs.ref LIKE '&%.sha256'`,
-			[id]);
+			[id]
+		);
 		let blobs_done = 0;
 		for (let row of blobs) {
 			this.progress = {name: 'blobs', value: blobs_done, max: blobs.length};
@@ -133,7 +149,10 @@ class TfSneakerAppElement extends LitElement {
 				console.log(`Failed to get ${row.id}: ${e.message}`);
 			}
 			if (blob) {
-				zip.file(`blob/classic/${this.sanitize(row.id)}${this.guess_ext(blob)}`, new Uint8Array(blob));
+				zip.file(
+					`blob/classic/${this.sanitize(row.id)}${this.guess_ext(blob)}`,
+					new Uint8Array(blob)
+				);
 			}
 			blobs_done++;
 		}
@@ -181,7 +200,11 @@ class TfSneakerAppElement extends LitElement {
 					continue;
 				}
 				let message = JSON.parse(line);
-				this.progress = {name: 'messages', value: progress++, max: total_messages};
+				this.progress = {
+					name: 'messages',
+					value: progress++,
+					max: total_messages,
+				};
 				if (await tfrpc.rpc.store_message(message.value)) {
 					success.messages++;
 				}
@@ -202,7 +225,13 @@ class TfSneakerAppElement extends LitElement {
 		let progress;
 		if (this.progress) {
 			if (this.progress.max) {
-				progress = html`<div><label for="progress">${this.progress.name}</label><progress value=${this.progress.value} max=${this.progress.max}></progress></div>`;
+				progress = html`<div>
+					<label for="progress">${this.progress.name}</label
+					><progress
+						value=${this.progress.value}
+						max=${this.progress.max}
+					></progress>
+				</div>`;
 			} else {
 				progress = html`<div><span>${this.progress.name}</span></div>`;
 			}
@@ -218,13 +247,17 @@ class TfSneakerAppElement extends LitElement {
 			<input type="text" id="search" @keypress=${this.keypress}></input>
 			<input type="button" value="Search Users" @click=${this.search}></input>
 			<ul>
-				${Object.entries(this.feeds).map(([id, name]) => html`
+				${Object.entries(this.feeds).map(
+					([id, name]) => html`
 						<li>
-						${this.progress ? undefined : html`<input type="button" value="Export" @click=${() => this.export(id)}></input>`}
+							${this.progress
+								? undefined
+								: html`<input type="button" value="Export" @click=${() => this.export(id)}></input>`}
 							${name}
 							<code style="color: #ccc">${id}</code>
 						</li>
-				`)}
+					`
+				)}
 			</ul>
 		`;
 	}

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-  "previous": "&dO6ckMIPVv9QvSc+0TOg0S59qe+rirPo2a6p9xSHj9M=.sha256"
+	"previous": "&DUxMMCJcuhm6S9jg/eKgEyWodkITu6Tg9g5I5wgLWFU=.sha256"
 }

apps/ssb/app.js

@@ -109,7 +109,7 @@ core.register('onConnectionsChanged', async function() {
 });
 
 async function main() {
-	if (typeof(database) !== 'undefined') {
+	if (typeof database !== 'undefined') {
 		g_database = await database('ssb');
 	}
 	await app.setDocument(utf8Decode(await getFile('index.html')));

apps/ssb/commonmark-hashtag.js

@@ -39,7 +39,7 @@ function splitMatches(text, regexp) {
   return result;
 }
 
-const regex = new RegExp("(?<!\w)#[\\w-]+");
+const regex = new RegExp("(?<!\\w)#[\\w-]+");
 
 function split(textNodes) {
   const text = textNodes.map(n => n.literal).join("");

apps/ssb/emojis.js

@@ -72,9 +72,11 @@ export function picker(callback, anchor) {
 				list.appendChild(header);
 				let any = false;
 				for (let entry of Object.entries(row[1])) {
-					if (search &&
+					if (
+						search &&
 						search.length &&
-						entry[0].toLowerCase().indexOf(search) == -1) {
+						entry[0].toLowerCase().indexOf(search) == -1
+					) {
 						continue;
 					}
 					let emoji = document.createElement('span');

apps/ssb/index.html

@@ -1,8 +1,8 @@
-<!DOCTYPE html>
+<!doctype html>
 <html style="color: #fff">
 	<head>
 		<title>Tilde Friends</title>
-		<base target="_top">
+		<base target="_top" />
 		<link rel="stylesheet" href="tribute.css" />
 		<style>
 			.tribute-container {
@@ -10,9 +10,11 @@
 			}
 		</style>
 	</head>
-	<body>
+	<body style="background-color: #223a5e">
-		<tf-app/>
+		<tf-app class="w3-deep-purple" />
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script src="filesaver.min.js"></script>
 		<script src="commonmark.min.js"></script>
 		<script src="commonmark-linkify.js" type="module"></script>

apps/ssb/tf-app.js

@@ -34,9 +34,13 @@ class TfElement extends LitElement {
 		this.users = {};
 		this.loaded = false;
 		this.tags = [];
-		tfrpc.rpc.getBroadcasts().then(b => { self.broadcasts = b || []; });
+		tfrpc.rpc.getBroadcasts().then((b) => {
-		tfrpc.rpc.getConnections().then(c => { self.connections = c || []; });
+			self.broadcasts = b || [];
-		tfrpc.rpc.getHash().then(hash => self.set_hash(hash));
+		});
+		tfrpc.rpc.getConnections().then((c) => {
+			self.connections = c || [];
+		});
+		tfrpc.rpc.getHash().then((hash) => self.set_hash(hash));
 		tfrpc.register(function hashChanged(hash) {
 			self.set_hash(hash);
 		});
@@ -86,9 +90,14 @@ class TfElement extends LitElement {
 				last_row_id: 0,
 			};
 		}
-		let max_row_id = (await tfrpc.rpc.query(`
+		let max_row_id = (
+			await tfrpc.rpc.query(
+				`
 			SELECT MAX(rowid) AS max_row_id FROM messages
-		`, []))[0].max_row_id;
+		`,
+				[]
+			)
+		)[0].max_row_id;
 		for (let id of Object.keys(cache.about)) {
 			if (ids.indexOf(id) == -1) {
 				delete cache.about[id];
@@ -120,17 +129,21 @@ class TfElement extends LitElement {
 				ORDER BY messages.author, messages.sequence
 			`,
 			[
-				JSON.stringify(ids.filter(id => cache.about[id])),
+				JSON.stringify(ids.filter((id) => cache.about[id])),
-				JSON.stringify(ids.filter(id => !cache.about[id])),
+				JSON.stringify(ids.filter((id) => !cache.about[id])),
 				cache.last_row_id,
 				max_row_id,
-			]);
+			]
+		);
 		for (let about of abouts) {
 			let content = JSON.parse(about.content);
 			if (content.about === about.author) {
 				delete content.type;
 				delete content.about;
-				cache.about[about.author] = Object.assign(cache.about[about.author] || {}, content);
+				cache.about[about.author] = Object.assign(
+					cache.about[about.author] || {},
+					content
+				);
 			}
 		}
 		cache.last_row_id = max_row_id;
@@ -150,10 +163,8 @@ class TfElement extends LitElement {
 				JOIN json_each(?) AS following ON messages.author = following.value
 				WHERE messages.id = ?
 			`,
-			[
+			[JSON.stringify(this.following), id]
-				JSON.stringify(this.following),
+		);
-				id,
-			]);
 		if (messages && messages.length) {
 			this.unread = [...this.unread, ...messages];
 			this.unread = this.unread.slice(this.unread.length - 1024);
@@ -173,7 +184,7 @@ class TfElement extends LitElement {
 	}
 
 	async create_identity() {
-		if (confirm("Are you sure you want to create a new identity?")) {
+		if (confirm('Are you sure you want to create a new identity?')) {
 			await tfrpc.rpc.createIdentity();
 			this.ids = (await tfrpc.rpc.getIdentities()) || [];
 			if (this.ids && !this.whoami) {
@@ -184,14 +195,31 @@ class TfElement extends LitElement {
 
 	render_id_picker() {
 		return html`
-			<tf-id-picker id="picker" selected=${this.whoami} .ids=${this.ids} .users=${this.users} @change=${this._handle_whoami_changed}></tf-id-picker>
+			<div style="display: flex; gap: 8px">
-			<button @click=${this.create_identity} id="create_identity">Create Identity</button>
+				<tf-id-picker
+					id="picker"
+					style="flex: 1 1 auto"
+					selected=${this.whoami}
+					.ids=${this.ids}
+					.users=${this.users}
+					@change=${this._handle_whoami_changed}
+				></tf-id-picker>
+				<button
+					class="w3-button w3-dark-grey w3-border"
+					style="flex: 0 0 auto"
+					@click=${this.create_identity}
+					id="create_identity"
+				>
+					Create Identity
+				</button>
+			</div>
 		`;
 	}
 
 	async load_recent_tags() {
 		let start = new Date();
-		this.tags = await tfrpc.rpc.query(`
+		this.tags = await tfrpc.rpc.query(
+			`
 			WITH
 				recent AS (SELECT id, content FROM messages
 					WHERE messages.timestamp > ? AND json_extract(content, '$.type') = 'post'
@@ -205,7 +233,9 @@ class TfElement extends LitElement {
 				combined AS (SELECT id, tag FROM recent_channels UNION ALL SELECT id, tag FROM recent_mentions),
 				by_message AS (SELECT DISTINCT id, tag FROM combined)
 			SELECT tag, COUNT(*) AS count FROM by_message GROUP BY tag ORDER BY count DESC LIMIT 10
-		`, [new Date() - 7 * 24 * 60 * 60 * 1000]);
+		`,
+			[new Date() - 7 * 24 * 60 * 60 * 1000]
+		);
 		console.log('tags took', (new Date() - start) / 1000.0, 'seconds');
 	}
 
@@ -239,23 +269,53 @@ class TfElement extends LitElement {
 		let users = this.users;
 		if (this.tab === 'news') {
 			return html`
-				<tf-tab-news id="tf-tab-news" .following=${this.following} whoami=${this.whoami} .users=${this.users} hash=${this.hash} .unread=${this.unread} @refresh=${() => this.unread = []}></tf-tab-news>
+				<tf-tab-news
+					id="tf-tab-news"
+					.following=${this.following}
+					whoami=${this.whoami}
+					.users=${this.users}
+					hash=${this.hash}
+					.unread=${this.unread}
+					@refresh=${() => (this.unread = [])}
+				></tf-tab-news>
 			`;
 		} else if (this.tab === 'connections') {
 			return html`
-				<tf-tab-connections .users=${this.users} .connections=${this.connections} .broadcasts=${this.broadcasts}></tf-tab-connections>
+				<tf-tab-connections
+					.users=${this.users}
+					.connections=${this.connections}
+					.broadcasts=${this.broadcasts}
+				></tf-tab-connections>
 			`;
 		} else if (this.tab === 'mentions') {
 			return html`
-				<tf-tab-mentions .following=${this.following} whoami=${this.whoami} .users=${this.users}}></tf-tab-mentions>
+				<tf-tab-mentions
+					.following=${this.following}
+					whoami=${this.whoami}
+					.users="${this.users}}"
+				></tf-tab-mentions>
 			`;
 		} else if (this.tab === 'search') {
 			return html`
-				<tf-tab-search .following=${this.following} whoami=${this.whoami} .users=${this.users} query=${this.hash?.startsWith('#q=') ? decodeURIComponent(this.hash.substring(3)) : null}></tf-tab-search>
+				<tf-tab-search
+					.following=${this.following}
+					whoami=${this.whoami}
+					.users=${this.users}
+					query=${this.hash?.startsWith('#q=')
+						? decodeURIComponent(this.hash.substring(3))
+						: null}
+				></tf-tab-search>
 			`;
 		} else if (this.tab === 'query') {
 			return html`
-				<tf-tab-query .following=${this.following} whoami=${this.whoami} .users=${this.users} query=${this.hash?.startsWith('#sql=') ? decodeURIComponent(this.hash.substring(5)) : null}></tf-tab-query>
+				<tf-tab-query
+					.following=${this.following}
+					whoami=${this.whoami}
+					.users=${this.users}
+					query=${this.hash?.startsWith('#sql=')
+						? decodeURIComponent(this.hash.substring(5))
+						: null}
+				></tf-tab-query>
 			`;
 		}
 	}
@@ -283,25 +343,42 @@ class TfElement extends LitElement {
 			});
 		}
 
+		const k_tabs = {
+			'📰': 'news',
+			'📡': 'connections',
+			'@': 'mentions',
+			'🔍': 'search',
+			'👩‍💻': 'query',
+		};
+
 		let tabs = html`
-			<div>
+			<div class="w3-bar w3-black">
-				<input type="button" class="tab" value="News" ?disabled=${self.tab == 'news'} @click=${() => self.set_tab('news')}></input>
+				${Object.entries(k_tabs).map(
-				<input type="button" class="tab" value="Connections" ?disabled=${self.tab == 'connections'} @click=${() => self.set_tab('connections')}></input>
+					([k, v]) => html`
-				<input type="button" class="tab" value="Mentions" ?disabled=${self.tab == 'mentions'} @click=${() => self.set_tab('mentions')}></input>
+						<button
-				<input type="button" class="tab" value="Search" ?disabled=${self.tab == 'search'} @click=${() => self.set_tab('search')}></input>
+							title=${v}
-				<input type="button" class="tab" value="Query" ?disabled=${self.tab == 'query'} @click=${() => self.set_tab('query')}></input>
+							class="w3-bar-item w3-padding-large w3-hover-gray tab ${self.tab ==
+							v
+								? 'w3-red'
+								: 'w3-black'}"
+							@click=${() => self.set_tab(v)}
+						>
+							${k}
+						</button>
+					`
+				)}
 			</div>
 		`;
-		let contents =
+		let contents = !this.loaded
-				!this.loaded ?
+			? this.loading
-					this.loading ?
+				? html`<div>Loading...</div>`
-						html`<div>Loading...</div>` :
+				: html`<div>Select or create an identity.</div>`
-						html`<div>Select or create an identity.</div>` :
+			: this.render_tab();
-					this.render_tab();
 		return html`
-			${this.render_id_picker()}
+			${this.render_id_picker()} ${tabs}
-			${tabs}
+			${this.tags.map(
-			${this.tags.map(x => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`)}
+				(x) => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`
+			)}
 			${contents}
 		`;
 	}

apps/ssb/tf-compose.js

@@ -58,7 +58,9 @@ class TfComposeElement extends LitElement {
 					link: link,
 				};
 			}
-			draft.mentions[link].name = name.startsWith('@') ? name.substring(1) : name;
+			draft.mentions[link].name = name.startsWith('@')
+				? name.substring(1)
+				: name;
 			updated = true;
 		}
 		if (updated) {
@@ -72,27 +74,32 @@ class TfComposeElement extends LitElement {
 		let preview = this.renderRoot.getElementById('preview');
 		preview.innerHTML = this.process_text(edit.value);
 		let content_warning = this.renderRoot.getElementById('content_warning');
-		let content_warning_preview = this.renderRoot.getElementById('content_warning_preview');
+		let content_warning_preview = this.renderRoot.getElementById(
+			'content_warning_preview'
+		);
 		if (content_warning && content_warning_preview) {
 			content_warning_preview.innerText = content_warning.value;
 		}
 	}
 
 	notify(draft) {
-		this.dispatchEvent(new CustomEvent('tf-draft', {
+		this.dispatchEvent(
+			new CustomEvent('tf-draft', {
 				bubbles: true,
 				composed: true,
 				detail: {
 					id: this.branch,
-				draft: draft
+					draft: draft,
 				},
-		}));
+			})
+		);
 	}
 
 	change() {
 		let draft = this.get_draft();
 		draft.text = this.renderRoot.getElementById('edit')?.value;
-		draft.content_warning = this.renderRoot.getElementById('content_warning')?.value;
+		draft.content_warning =
+			this.renderRoot.getElementById('content_warning')?.value;
 		this.notify(draft);
 	}
 
@@ -109,13 +116,17 @@ class TfComposeElement extends LitElement {
 				let context = canvas.getContext('2d');
 				context.drawImage(img, 0, 0, canvas.width, canvas.height);
 				let data_url = canvas.toDataURL(mime_type);
-				let result = atob(data_url.split(',')[1]).split('').map(x => x.charCodeAt(0));
+				let result = atob(data_url.split(',')[1])
+					.split('')
+					.map((x) => x.charCodeAt(0));
 				resolve(result);
 			};
 			img.onerror = function (event) {
 				reject(new Error('Failed to load image.'));
 			};
-			let raw = Array.from(new Uint8Array(buffer)).map(b => String.fromCharCode(b)).join('');
+			let raw = Array.from(new Uint8Array(buffer))
+				.map((b) => String.fromCharCode(b))
+				.join('');
 			let original = `data:${type};base64,${btoa(raw)}`;
 			img.src = original;
 		});
@@ -131,7 +142,11 @@ class TfComposeElement extends LitElement {
 				let best_buffer;
 				let best_type;
 				for (let format of ['image/png', 'image/jpeg', 'image/webp']) {
-					let test_buffer = await self.convert_to_format(buffer, file.type, format);
+					let test_buffer = await self.convert_to_format(
+						buffer,
+						file.type,
+						format
+					);
 					if (!best_buffer || test_buffer.length < best_buffer.length) {
 						best_buffer = test_buffer;
 						best_type = format;
@@ -201,7 +216,11 @@ class TfComposeElement extends LitElement {
 			to = [...to];
 			message.recps = to;
 			console.log('message is now', message);
-			message = await tfrpc.rpc.encrypt(this.whoami, to, JSON.stringify(message));
+			message = await tfrpc.rpc.encrypt(
+				this.whoami,
+				to,
+				JSON.stringify(message)
+			);
 			console.log('encrypted as', message);
 		}
 		try {
@@ -241,12 +260,15 @@ class TfComposeElement extends LitElement {
 		this.last_autocomplete = text;
 		let results = [];
 		try {
-			let rows = await tfrpc.rpc.query(`
+			let rows = await tfrpc.rpc.query(
+				`
 				SELECT messages.content FROM messages_fts(?)
 				JOIN messages ON messages.rowid = messages_fts.rowid
 				WHERE messages.content LIKE ?
 				ORDER BY timestamp DESC LIMIT 10
-			`, ['"' + text.replace('"', '""') + '"', `%![%${text}%](%)%`]);
+			`,
+				['"' + text.replace('"', '""') + '"', `%![%${text}%](%)%`]
+			);
 			for (let row of rows) {
 				for (let match of row.content.matchAll(/!\[([^\]]*)\]\((&.*?)\)/g)) {
 					if (match[1].toLowerCase().indexOf(text.toLowerCase()) != -1) {
@@ -265,7 +287,10 @@ class TfComposeElement extends LitElement {
 		let tribute = new Tribute({
 			collection: [
 				{
-					values: Object.entries(this.users).map(x => ({key: x[1].name, value: x[0]})),
+					values: Object.entries(this.users).map((x) => ({
+						key: x[1].name,
+						value: x[0],
+					})),
 					selectTemplate: function (item) {
 						return `[@${item.original.key}](${item.original.value})`;
 					},
@@ -293,7 +318,10 @@ class TfComposeElement extends LitElement {
 		let encrypt = this.renderRoot.getElementById('encrypt_to');
 		if (encrypt) {
 			let tribute = new Tribute({
-				values: Object.entries(this.users).map(x => ({key: x[1].name, value: x[0]})),
+				values: Object.entries(this.users).map((x) => ({
+					key: x[1].name,
+					value: x[0],
+				})),
 				selectTemplate: function (item) {
 					return item.original.value;
 				},
@@ -311,17 +339,27 @@ class TfComposeElement extends LitElement {
 
 	render_mention(mention) {
 		let self = this;
-		return html`
+		return html` <div style="display: flex; flex-direction: row">
-			<div style="display: flex; flex-direction: row">
 			<div style="align-self: center; margin: 0.5em">
-					<input type="button" value="🚮" title="Remove ${mention.name} mention" @click=${() => self.remove_mention(mention.link)}></input>
+				<button
+					class="w3-button w3-dark-grey"
+					title="Remove ${mention.name} mention"
+					@click=${() => self.remove_mention(mention.link)}
+				>
+					🚮
+				</button>
 			</div>
 			<div style="display: flex; flex-direction: column">
 				<h3>${mention.name}</h3>
 				<div style="padding-left: 1em">
 					${Object.entries(mention)
-							.filter(x => x[0] != 'name')
+						.filter((x) => x[0] != 'name')
-							.map(x => html`<div><span style="font-weight: bold">${x[0]}</span>: ${x[1]}</div>`)}
+						.map(
+							(x) =>
+								html`<div>
+									<span style="font-weight: bold">${x[0]}</span>: ${x[1]}
+								</div>`
+						)}
 				</div>
 			</div>
 		</div>`;
@@ -357,12 +395,21 @@ class TfComposeElement extends LitElement {
 
 		if (this.apps) {
 			return html`
-				<div>
+				<div class="w3-card-4 w3-margin w3-padding">
-					<select id="select">
+					<select id="select" class="w3-select w3-dark-grey">
-						${Object.keys(self.apps).map(app => html`<option value=${app}>${app}</option>`)}
+						${Object.keys(self.apps).map(
+							(app) => html`<option value=${app}>${app}</option>`
+						)}
 					</select>
-					<input type="button" value="Attach" @click=${attach_selected_app}></input>
+					<button class="w3-button w3-dark-grey" @click=${attach_selected_app}>
-					<input type="button" value="Cancel" @click=${() => this.apps = null}></input>
+						Attach
+					</button>
+					<button
+						class="w3-button w3-dark-grey"
+						@click=${() => (this.apps = null)}
+					>
+						Cancel
+					</button>
 				</div>
 			`;
 		}
@@ -374,9 +421,16 @@ class TfComposeElement extends LitElement {
 			self.apps = await tfrpc.rpc.apps();
 		}
 		if (!this.apps) {
-			return html`<input type="button" value="Attach App" @click=${attach_app}></input>`;
+			return html`<button class="w3-button w3-dark-grey" @click=${attach_app}>
+				Attach App
+			</button>`;
 		} else {
-			return html`<input type="button" value="Discard App" @click=${() => this.apps = null}></input>`;
+			return html`<button
+				class="w3-button w3-dark-grey"
+				@click=${() => (this.apps = null)}
+			>
+				Discard App
+			</button>`;
 		}
 	}
 
@@ -392,15 +446,17 @@ class TfComposeElement extends LitElement {
 		let draft = this.get_draft();
 		if (draft.content_warning !== undefined) {
 			return html`
-				<div>
+				<div class="w3-container w3-padding">
-					<input type="checkbox" id="cw" @change=${() => self.set_content_warning(undefined)} checked></input>
+					<p>
+						<input type="checkbox" class="w3-check w3-dark-grey" id="cw" @change=${() => self.set_content_warning(undefined)} checked="checked"></input>
 						<label for="cw">CW</label>
-					<input type="text" id="content_warning" @input=${this.input} @change=${this.change} value=${draft.content_warning}></input>
+					</p>
+					<input type="text" class="w3-input w3-border w3-dark-grey" id="content_warning" placeholder="Enter a content warning here." @input=${this.input} @change=${this.change} value=${draft.content_warning}></input>
 				</div>
 			`;
 		} else {
 			return html`
-				<input type="checkbox" id="cw" @change=${() => self.set_content_warning('')}></input>
+				<input type="checkbox" class="w3-check w3-dark-grey" id="cw" @change=${() => self.set_content_warning('')}></input>
 				<label for="cw">CW</label>
 			`;
 		}
@@ -430,14 +486,16 @@ class TfComposeElement extends LitElement {
 			<div style="display: flex; flex-direction: row; width: 100%">
 				<label for="encrypt_to">🔐 To:</label>
 				<input type="text" id="encrypt_to" style="display: flex; flex: 1 1" @input=${this.update_encrypt}></input>
-				<input type="button" value="🚮" @click=${() => this.set_encrypt(undefined)}></input>
+				<button class="w3-button w3-dark-grey" @click=${() => this.set_encrypt(undefined)}>🚮</button>
 			</div>
 			<ul>
-				${draft.encrypt_to.map(x => html`
+				${draft.encrypt_to.map(
+					(x) => html`
 					<li>
 						<tf-user id=${x} .users=${this.users}></tf-user>
-						<input type="button" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter(id => id != x))}></input>
+						<input type="button" class="w3-button w3-dark-grey" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter((id) => id != x))}></input>
-					</li>`)}
+					</li>`
+				)}
 			</ul>
 		`;
 	}
@@ -453,29 +511,66 @@ class TfComposeElement extends LitElement {
 		let self = this;
 		let draft = self.get_draft();
 		let content_warning =
-			draft.content_warning !== undefined ?
+			draft.content_warning !== undefined
-			html`<div id="content_warning_preview" class="content_warning">${draft.content_warning}</div>` :
+				? html`<div class="w3-panel w3-round-xlarge w3-blue">
-			undefined;
+						<p id="content_warning_preview">${draft.content_warning}</p>
-		let encrypt = draft.encrypt_to !== undefined ?
+					</div>`
-			undefined :
+				: undefined;
-			html`<input type="button" value="🔐" @click=${() => this.set_encrypt([])}></input>`;
+		let encrypt =
+			draft.encrypt_to !== undefined
+				? undefined
+				: html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => this.set_encrypt([])}
+					>
+						🔐
+					</button>`;
 		let result = html`
+			<div
+				class="w3-card-4 w3-blue-grey w3-padding"
+				style="box-sizing: border-box"
+			>
 				${this.render_encrypt()}
-			<div style="display: flex; flex-direction: row; width: 100%">
+				<div style="display: flex; flex-direction: row; width: 100%; gap: 4px">
-				<textarea id="edit" @input=${this.input} @change=${this.change} @paste=${this.paste} style="flex: 1 0 50%">${draft.text}</textarea>
+					<div style="flex: 1 0 50%">
+						<p>
+							<textarea
+								class="w3-input w3-dark-grey w3-border"
+								style="resize: vertical"
+								placeholder="Write a post here."
+								id="edit"
+								@input=${this.input}
+								@change=${this.change}
+								@paste=${this.paste}
+							>
+${draft.text}</textarea
+							>
+						</p>
+					</div>
 					<div style="flex: 1 0 50%">
 						${content_warning}
 						<div id="preview"></div>
 					</div>
 				</div>
-			${Object.values(draft.mentions || {}).map(x => self.render_mention(x))}
+				${Object.values(draft.mentions || {}).map((x) =>
-			${this.render_content_warning()}
+					self.render_mention(x)
-			${this.render_attach_app()}
+				)}
-			<input type="button" id="submit" value="Submit" @click=${this.submit}></input>
+				${this.render_attach_app()} ${this.render_content_warning()}
-			<input type="button" value="Attach" @click=${this.attach}></input>
+				<button
-			${this.render_attach_app_button()}
+					class="w3-button w3-dark-grey"
-			${encrypt}
+					id="submit"
-			<input type="button" value="Discard" @click=${this.discard}></input>
+					@click=${this.submit}
+				>
+					Submit
+				</button>
+				<button class="w3-button w3-dark-grey" @click=${this.attach}>
+					Attach
+				</button>
+				${this.render_attach_app_button()} ${encrypt}
+				<button class="w3-button w3-dark-grey" @click=${this.discard}>
+					Discard
+				</button>
+			</div>
 		`;
 		return result;
 	}

apps/ssb/tf-id-picker.js

@@ -1,8 +1,9 @@
 import {LitElement, html} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
+import {styles} from './tf-styles.js';
 
 /*
-** Provide a list of IDs, and this lets the user pick one.
+ * Provide a list of IDs, and this lets the user pick one.
  */
 class TfIdentityPickerElement extends LitElement {
 	static get properties() {
@@ -13,6 +14,8 @@ class TfIdentityPickerElement extends LitElement {
 		};
 	}
 
+	static styles = styles;
+
 	constructor() {
 		super();
 		this.ids = [];
@@ -21,15 +24,28 @@ class TfIdentityPickerElement extends LitElement {
 
 	changed(event) {
 		this.selected = event.srcElement.value;
-		this.dispatchEvent(new Event('change', {
+		this.dispatchEvent(
+			new Event('change', {
 				srcElement: this,
-		}));
+			})
+		);
 	}
 
 	render() {
 		return html`
-			<select @change=${this.changed} style="max-width: 100%">
+			<select
-				${(this.ids ?? []).map(id => html`<option ?selected=${id == this.selected} value=${id}>${this.users[id]?.name ? (this.users[id]?.name + ' - ') : undefined}<small>${id}</small></option>`)}
+				class="w3-select w3-dark-grey w3-padding w3-border"
+				@change=${this.changed}
+				style="max-width: 100%; overflow: hidden"
+			>
+				${(this.ids ?? []).map(
+					(id) =>
+						html`<option ?selected=${id == this.selected} value=${id}>
+							${this.users[id]?.name
+								? this.users[id]?.name + ' - '
+								: undefined}<small>${id}</small>
+						</option>`
+				)}
 			</select>
 		`;
 	}

apps/ssb/tf-message.js

@@ -31,14 +31,27 @@ class TfMessageElement extends LitElement {
 	}
 
 	show_reply() {
-		let event = new CustomEvent('tf-draft', {bubbles: true, composed: true, detail: {id: this.message?.id, draft: {
+		let event = new CustomEvent('tf-draft', {
+			bubbles: true,
+			composed: true,
+			detail: {
+				id: this.message?.id,
+				draft: {
 					encrypt_to: this.message?.decrypted?.recps,
-		}}});
+				},
+			},
+		});
 		this.dispatchEvent(event);
 	}
 
 	discard_reply() {
-		this.dispatchEvent(new CustomEvent('tf-draft', {bubbles: true, composed: true, detail: {id: this.id, draft: undefined}}));
+		this.dispatchEvent(
+			new CustomEvent('tf-draft', {
+				bubbles: true,
+				composed: true,
+				detail: {id: this.id, draft: undefined},
+			})
+		);
 	}
 
 	render_votes() {
@@ -53,12 +66,19 @@ class TfMessageElement extends LitElement {
 				return expression;
 			}
 		}
-		return html`<div>${(this.message.votes || []).map(
+		return html`<div>
-			vote => html`
+			${(this.message.votes || []).map(
-				<span title="${this.users[vote.author]?.name ?? vote.author} ${new Date(vote.timestamp)}">
+				(vote) => html`
+					<span
+						title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
+							vote.timestamp
+						)}"
+					>
 						${normalize_expression(vote.content.vote.expression)}
 					</span>
-			`)}</div>`;
+				`
+			)}
+		</div>`;
 	}
 
 	render_raw() {
@@ -72,30 +92,40 @@ class TfMessageElement extends LitElement {
 			content: this.message?.content,
 			signature: this.message?.signature,
 		};
-		return html`<div style="white-space: pre-wrap">${JSON.stringify(raw, null, 2)}</div>`;
+		return html`<div style="white-space: pre-wrap">
+			${JSON.stringify(raw, null, 2)}
+		</div>`;
 	}
 
 	vote(emoji) {
 		let reaction = emoji;
 		let message = this.message.id;
-		if (confirm('Are you sure you want to react with ' + reaction + ' to ' + message + '?')) {
+		if (
-			tfrpc.rpc.appendMessage(
+			confirm(
-				this.whoami,
+				'Are you sure you want to react with ' +
-				{
+					reaction +
+					' to ' +
+					message +
+					'?'
+			)
+		) {
+			tfrpc.rpc
+				.appendMessage(this.whoami, {
 					type: 'vote',
 					vote: {
 						link: message,
 						value: 1,
 						expression: reaction,
 					},
-				}).catch(function(error) {
+				})
+				.catch(function (error) {
 					alert(error?.message);
 				});
 		}
 	}
 
 	react(event) {
-		emojis.picker(x => this.vote(x));
+		emojis.picker((x) => this.vote(x));
 	}
 
 	show_image(link) {
@@ -129,7 +159,10 @@ class TfMessageElement extends LitElement {
 	body_click(event) {
 		if (event.srcElement.tagName == 'IMG') {
 			this.show_image(event.srcElement.src);
-		} else if (event.srcElement.tagName == 'DIV' && event.srcElement.classList.contains('img_caption')) {
+		} else if (
+			event.srcElement.tagName == 'DIV' &&
+			event.srcElement.classList.contains('img_caption')
+		) {
 			let next = event.srcElement.nextSibling;
 			if (next.style.display == 'block') {
 				next.style.display = 'none';
@@ -140,50 +173,77 @@ class TfMessageElement extends LitElement {
 	}
 
 	render_mention(mention) {
-		if (!mention?.link || typeof(mention.link) != 'string') {
+		if (!mention?.link || typeof mention.link != 'string') {
 			return html` <pre>${JSON.stringify(mention)}</pre>`;
-		} else if (mention?.link?.startsWith('&') &&
+		} else if (
-			mention?.type?.startsWith('image/')) {
+			mention?.link?.startsWith('&') &&
+			mention?.type?.startsWith('image/')
+		) {
 			return html`
-				<img src=${'/' + mention.link + '/view'} style="max-width: 128px; max-height: 128px" title=${mention.name} @click=${() => this.show_image('/' + mention.link + '/view')}>
+				<img
+					src=${'/' + mention.link + '/view'}
+					style="max-width: 128px; max-height: 128px"
+					title=${mention.name}
+					@click=${() => this.show_image('/' + mention.link + '/view')}
+				/>
 			`;
-		} else if (mention.link?.startsWith('&') &&
+		} else if (
-			mention.name?.startsWith('audio:')) {
+			mention.link?.startsWith('&') &&
+			mention.name?.startsWith('audio:')
+		) {
 			return html`
 				<audio controls style="height: 32px">
 					<source src=${'/' + mention.link + '/view'}></source>
 				</audio>
 			`;
-		} else if (mention.link?.startsWith('&') &&
+		} else if (
-			mention.name?.startsWith('video:')) {
+			mention.link?.startsWith('&') &&
+			mention.name?.startsWith('video:')
+		) {
 			return html`
 				<video controls style="max-height: 240px; max-width: 128px">
 					<source src=${'/' + mention.link + '/view'}></source>
 				</video>
 			`;
-		} else if (mention.link?.startsWith('&') &&
+		} else if (
-			mention?.type === 'application/tildefriends') {
+			mention.link?.startsWith('&') &&
+			mention?.type === 'application/tildefriends'
+		) {
 			return html` <a href=${`/${mention.link}/`}>😎 ${mention.name}</a>`;
 		} else if (mention.link?.startsWith('%') || mention.link?.startsWith('@')) {
-			return html` <a href=${'#' + encodeURIComponent(mention.link)}>${mention.name}</a>`;
+			return html` <a href=${'#' + encodeURIComponent(mention.link)}
+				>${mention.name}</a
+			>`;
 		} else if (mention.link?.startsWith('#')) {
-			return html` <a href=${'#q=' + encodeURIComponent(mention.link)}>${mention.link}</a>`;
+			return html` <a href=${'#q=' + encodeURIComponent(mention.link)}
-		} else if (Object.keys(mention).length == 2 && mention.link && mention.name) {
+				>${mention.link}</a
+			>`;
+		} else if (
+			Object.keys(mention).length == 2 &&
+			mention.link &&
+			mention.name
+		) {
 			return html` <a href=${`/${mention.link}/view`}>${mention.name}</a>`;
 		} else {
-			return html` <pre style="white-space: pre-wrap">${JSON.stringify(mention, null, 2)}</pre>`;
+			return html` <pre style="white-space: pre-wrap">
+${JSON.stringify(mention, null, 2)}</pre
+			>`;
 		}
 	}
 
 	render_mentions() {
 		let mentions = this.message?.content?.mentions || [];
-		mentions = mentions.filter(x => this.message?.content?.text?.indexOf(x.link) === -1);
+		mentions = mentions.filter(
+			(x) => this.message?.content?.text?.indexOf(x.link) === -1
+		);
 		if (mentions.length) {
 			let self = this;
 			return html`
-				<fieldset style="background-color: rgba(0, 0, 0, 0.1); padding: 0.5em; border: 1px solid black">
+				<fieldset
+					style="background-color: rgba(0, 0, 0, 0.1); padding: 0.5em; border: 1px solid black"
+				>
 					<legend>Mentions</legend>
-					${mentions.map(x => self.render_mention(x))}
+					${mentions.map((x) => self.render_mention(x))}
 				</fieldset>
 			`;
 		}
@@ -194,28 +254,58 @@ class TfMessageElement extends LitElement {
 			return 0;
 		}
 		let total = message.child_messages.length;
-		for (let m of message.child_messages)
+		for (let m of message.child_messages) {
-		{
 			total += this.total_child_messages(m);
 		}
 		return total;
 	}
 
 	set_expanded(expanded, tag) {
-		this.dispatchEvent(new CustomEvent('tf-expand', {bubbles: true, composed: true, detail: {id: (this.message.id || '') + (tag || ''), expanded: expanded}}));
+		this.dispatchEvent(
+			new CustomEvent('tf-expand', {
+				bubbles: true,
+				composed: true,
+				detail: {
+					id: (this.message.id || '') + (tag || ''),
+					expanded: expanded,
+				},
+			})
+		);
 	}
 
 	toggle_expanded(tag) {
-		this.set_expanded(!this.expanded[(this.message.id || '') + (tag || '')], tag);
+		this.set_expanded(
+			!this.expanded[(this.message.id || '') + (tag || '')],
+			tag
+		);
 	}
 
 	render_children() {
 		let self = this;
 		if (this.message.child_messages?.length) {
 			if (!this.expanded[this.message.id]) {
-				return html`<input type="button" value=${this.total_child_messages(this.message) + ' More'} @click=${() => self.set_expanded(true)}></input>`;
+				return html`<button
+					class="w3-button w3-dark-grey"
+					@click=${() => self.set_expanded(true)}
+				>
+					+ ${this.total_child_messages(this.message) + ' More'}
+				</button>`;
 			} else {
-				return html`<input type="button" value="Collapse" @click=${() => self.set_expanded(false)}></input>${(this.message.child_messages || []).map(x => html`<tf-message .message=${x} whoami=${this.whoami} .users=${this.users} .drafts=${this.drafts} .expanded=${this.expanded}></tf-message>`)}`;
+				return html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => self.set_expanded(false)}
+					>
+						Collapse</button
+					>${(this.message.child_messages || []).map(
+						(x) =>
+							html`<tf-message
+								.message=${x}
+								whoami=${this.whoami}
+								.users=${this.users}
+								.drafts=${this.drafts}
+								.expanded=${this.expanded}
+							></tf-message>`
+					)}`;
 			}
 		}
 	}
@@ -231,13 +321,12 @@ class TfMessageElement extends LitElement {
 		}
 		if (Array.isArray(content.mentions)) {
 			for (let mention of content.mentions) {
-				if (typeof mention?.link === 'string' &&
+				if (typeof mention?.link === 'string' && mention.link.startsWith('#')) {
-					mention.link.startsWith('#')) {
 					channels.push(mention.link);
 				}
 			}
 		}
-		return channels.map(x => html`<tf-tag tag=${x}></tf-tag>`);
+		return channels.map((x) => html`<tf-tag tag=${x}></tf-tag>`);
 	}
 
 	render() {
@@ -250,52 +339,108 @@ class TfMessageElement extends LitElement {
 		switch (this.format) {
 			case 'raw':
 				if (content?.type == 'post' || content?.type == 'blog') {
-					raw_button = html`<input type="button" value="Markdown" @click=${() => self.format = 'md'}></input>`;
+					raw_button = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => (self.format = 'md')}
+					>
+						Markdown
+					</button>`;
 				} else {
-					raw_button = html`<input type="button" value="Message" @click=${() => self.format = 'message'}></input>`; 
+					raw_button = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => (self.format = 'message')}
+					>
+						Message
+					</button>`;
 				}
 				break;
 			case 'md':
-				raw_button = html`<input type="button" value="Message" @click=${() => self.format = 'message'}></input>`;
+				raw_button = html`<button
+					class="w3-button w3-dark-grey"
+					@click=${() => (self.format = 'message')}
+				>
+					Message
+				</button>`;
 				break;
 			case 'decrypted':
-				raw_button = html`<input type="button" value="Raw" @click=${() => self.format = 'raw'}></input>`;
+				raw_button = html`<button
+					class="w3-button w3-dark-grey"
+					@click=${() => (self.format = 'raw')}
+				>
+					Raw
+				</button>`;
 				break;
 			default:
 				if (this.message.decrypted) {
-					raw_button = html`<input type="button" value="Decrypted" @click=${() => self.format = 'decrypted'}></input>`;
+					raw_button = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => (self.format = 'decrypted')}
+					>
+						Decrypted
+					</button>`;
 				} else {
-					raw_button = html`<input type="button" value="Raw" @click=${() => self.format = 'raw'}></input>`;
+					raw_button = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => (self.format = 'raw')}
+					>
+						Raw
+					</button>`;
 				}
 				break;
 		}
 		function small_frame(inner) {
 			let body;
 			return html`
-				<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; display: inline-block; overflow-wrap: anywhere">
+				<div
+					class="w3-card-4"
+					style="background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; display: inline-block; overflow-wrap: anywhere"
+				>
 					<tf-user id=${self.message.author} .users=${self.users}></tf-user>
-					<span style="padding-right: 8px"><a tfarget="_top" href=${'#' + self.message.id}>%</a> ${new Date(self.message.timestamp).toLocaleString()}</span>
+					<span style="padding-right: 8px"
-					${raw_button}
+						><a tfarget="_top" href=${'#' + self.message.id}>%</a> ${new Date(
-					${self.format == 'raw' ? self.render_raw() : inner}
+							self.message.timestamp
+						).toLocaleString()}</span
+					>
+					${raw_button} ${self.format == 'raw' ? self.render_raw() : inner}
 					${self.render_votes()}
 				</div>
 			`;
 		}
 		if (this.message?.type === 'contact_group') {
-			return html`
+			return html` <div
-				<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere">
+				class="w3-card-4"
-					${this.message.messages.map(x => 
+				style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
-						html`<tf-message .message=${x} whoami=${this.whoami} .users=${this.users} .drafts=${this.drafts} .expanded=${this.expanded}></tf-message>`
+			>
+				${this.message.messages.map(
+					(x) =>
+						html`<tf-message
+							.message=${x}
+							whoami=${this.whoami}
+							.users=${this.users}
+							.drafts=${this.drafts}
+							.expanded=${this.expanded}
+						></tf-message>`
 				)}
 			</div>`;
 		} else if (this.message.placeholder) {
-			return html`
+			return html` <div
-				<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere">
+				class="w3-card-4"
-					<a target="_top" href=${'#' + this.message.id}>${this.message.id}</a> (placeholder)
+				style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
+			>
+				<a target="_top" href=${'#' + this.message.id}>${this.message.id}</a>
+				(placeholder)
 				<div>${this.render_votes()}</div>
-					${(this.message.child_messages || []).map(x => html`
+				${(this.message.child_messages || []).map(
-						<tf-message .message=${x} whoami=${this.whoami} .users=${this.users} .drafts=${this.drafts} .expanded=${this.expanded}></tf-message>
+					(x) => html`
-					`)}
+						<tf-message
+							.message=${x}
+							whoami=${this.whoami}
+							.users=${this.users}
+							.drafts=${this.drafts}
+							.expanded=${this.expanded}
+						></tf-message>
+					`
+				)}
 			</div>`;
 		} else if (typeof (content?.type === 'string')) {
 			if (content.type == 'about') {
@@ -307,7 +452,7 @@ class TfMessageElement extends LitElement {
 				}
 				if (content.image !== undefined) {
 					image = html`
-						<div><img src=${'/' + (typeof(content.image?.link) == 'string' ? content.image.link : content.image) + '/view'} style="width: 256px; height: auto"></img></div>
+						<div><img src=${'/' + (typeof content.image?.link == 'string' ? content.image.link : content.image) + '/view'} style="width: 256px; height: auto"></img></div>
 					`;
 				}
 				if (content.description !== undefined) {
@@ -317,41 +462,54 @@ class TfMessageElement extends LitElement {
 						</div>
 					`;
 				}
-				let update = content.about == this.message.author ?
+				let update =
-					html`<div style="font-weight: bold">Updated profile.</div>` :
+					content.about == this.message.author
-					html`<div style="font-weight: bold">Updated profile for <tf-user id=${content.about} .users=${this.users}></tf-user>.</div>`;
+						? html`<div style="font-weight: bold">Updated profile.</div>`
-				return small_frame(html`
+						: html`<div style="font-weight: bold">
-					${update}
+								Updated profile for
-					${name}
+								<tf-user id=${content.about} .users=${this.users}></tf-user>.
-					${image}
+							</div>`;
-					${description}
+				return small_frame(html` ${update} ${name} ${image} ${description} `);
-				`);
 			} else if (content.type == 'contact') {
 				return html`
 					<div>
 						<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 						is
-						${
+						${content.blocking === true
-							content.blocking === true ? 'blocking' :
+							? 'blocking'
-							content.blocking === false ? 'no longer blocking' :
+							: content.blocking === false
-							content.following === true ? 'following' :
+								? 'no longer blocking'
-							content.following === false ? 'no longer following' :
+								: content.following === true
-							'?'
+									? 'following'
-						}
+									: content.following === false
-						<tf-user id=${this.message.content.contact} .users=${this.users}></tf-user>
+										? 'no longer following'
+										: '?'}
+						<tf-user
+							id=${this.message.content.contact}
+							.users=${this.users}
+						></tf-user>
 					</div>
 				`;
 			} else if (content.type == 'post') {
-				let reply = (this.drafts[this.message?.id] !== undefined) ? html`
+				let reply =
+					this.drafts[this.message?.id] !== undefined
+						? html`
 								<tf-compose
 									whoami=${this.whoami}
 									.users=${this.users}
 									root=${this.message.content.root || this.message.id}
 									branch=${this.message.id}
 									.drafts=${this.drafts}
-						@tf-discard=${this.discard_reply}></tf-compose>
+									@tf-discard=${this.discard_reply}
-				` : html`
+								></tf-compose>
-					<input type="button" value="Reply" @click=${this.show_reply}></input>
+							`
+						: html`
+								<button
+									class="w3-button w3-dark-grey"
+									@click=${this.show_reply}
+								>
+									Reply
+								</button>
 							`;
 				let self = this;
 				let body;
@@ -360,32 +518,47 @@ class TfMessageElement extends LitElement {
 						body = this.render_raw();
 						break;
 					case 'md':
-						body = html`<code style="white-space: pre-wrap; overflow-wrap: anywhere">${content.text}</code>`;
+						body = html`<code
+							style="white-space: pre-wrap; overflow-wrap: anywhere"
+							>${content.text}</code
+						>`;
 						break;
 					case 'message':
 						body = unsafeHTML(tfutils.markdown(content.text));
 						break;
+					case 'decrypted':
+						body = html`<pre
+							style="white-space: pre-wrap; overflow-wrap: anywhere"
+						>
+${JSON.stringify(content, null, 2)}</pre
+						>`;
+						break;
 				}
 				let content_warning = html`
-					<div class="content_warning" @click=${x => this.toggle_expanded(':cw')}>${content.contentWarning}</div>
+					<div
+						class="w3-panel w3-round-xlarge w3-blue"
+						style="cursor: pointer"
+						@click=${(x) => this.toggle_expanded(':cw')}
+					>
+						<p>${content.contentWarning}</p>
+					</div>
 				`;
-				let content_html =
+				let content_html = html`
-					html`
 					${this.render_channels()}
 					<div @click=${this.body_click}>${body}</div>
 					${this.render_mentions()}
 				`;
-				let payload =
+				let payload = content.contentWarning
-					content.contentWarning ?
+					? self.expanded[(this.message.id || '') + ':cw']
-						self.expanded[(this.message.id || '') + ':cw'] ?
+						? html` ${content_warning} ${content_html} `
-							html`
+						: content_warning
-								${content_warning}
+					: content_html;
-								${content_html}
+				let is_encrypted = this.message?.decrypted
-							` :
+					? html`<span style="align-self: center">🔓</span>`
-							content_warning :
+					: undefined;
-						content_html;
+				let style_background = this.message?.decrypted
-				let is_encrypted = this.message?.decrypted ? html`<span style="align-self: center">🔓</span>` : undefined;
+					? 'rgba(255, 0, 0, 0.2)'
-				let style_background = this.message?.decrypted ? 'rgba(255, 0, 0, 0.2)' : 'rgba(255, 255, 255, 0.1)';
+					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -401,26 +574,37 @@ class TfMessageElement extends LitElement {
 							display: block;
 						}
 					</style>
-					<div style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px">
+					<div
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
+					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							${is_encrypted}
 							<span style="flex: 1"></span>
-							<span style="padding-right: 8px"><a target="_top" href=${'#' + self.message.id}>%</a> ${new Date(this.message.timestamp).toLocaleString()}</span>
+							<span style="padding-right: 8px"
+								><a target="_top" href=${'#' + self.message.id}>%</a>
+								${new Date(this.message.timestamp).toLocaleString()}</span
+							>
 							<span>${raw_button}</span>
 						</div>
-						${payload}
+						${payload} ${this.render_votes()}
-						${this.render_votes()}
+						<p>
-						<div>
 							${reply}
-							<input type="button" value="React" @click=${this.react}></input>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
-						</div>
+								React
+							</button>
+						</p>
 						${this.render_children()}
 					</div>
 				`;
 			} else if (content.type === 'issue') {
-				let is_encrypted = this.message?.decrypted ? html`<span style="align-self: center">🔓</span>` : undefined;
+				let is_encrypted = this.message?.decrypted
-				let style_background = this.message?.decrypted ? 'rgba(255, 0, 0, 0.2)' : 'rgba(255, 255, 255, 0.1)';
+					? html`<span style="align-self: center">🔓</span>`
+					: undefined;
+				let style_background = this.message?.decrypted
+					? 'rgba(255, 0, 0, 0.2)'
+					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -436,19 +620,26 @@ class TfMessageElement extends LitElement {
 							display: block;
 						}
 					</style>
-					<div style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px">
+					<div
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
+					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							${is_encrypted}
 							<span style="flex: 1"></span>
-							<span style="padding-right: 8px"><a target="_top" href=${'#' + self.message.id}>%</a> ${new Date(this.message.timestamp).toLocaleString()}</span>
+							<span style="padding-right: 8px"
+								><a target="_top" href=${'#' + self.message.id}>%</a>
+								${new Date(this.message.timestamp).toLocaleString()}</span
+							>
 							<span>${raw_button}</span>
 						</div>
-						${content.text}
+						${content.text} ${this.render_votes()}
-						${this.render_votes()}
+						<p>
-						<div>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
-							<input type="button" value="React" @click=${this.react}></input>
+								React
-						</div>
+							</button>
+						</p>
 						${this.render_children()}
 					</div>
 				`;
@@ -457,10 +648,13 @@ class TfMessageElement extends LitElement {
 				tfrpc.rpc.get_blob(content.blog).then(function (data) {
 					self.blog_data = data;
 				});
-				let payload =
+				let payload = this.expanded[(this.message.id || '') + ':blog']
-						this.expanded[(this.message.id || '') + ':blog'] ?
+					? html`<div>
-						html`<div>${this.blog_data ? unsafeHTML(tfutils.markdown(this.blog_data)) : 'Loading...'}</div>` :
+							${this.blog_data
-						undefined;
+								? unsafeHTML(tfutils.markdown(this.blog_data))
+								: 'Loading...'}
+						</div>`
+					: undefined;
 				let body;
 				switch (this.format) {
 					case 'raw':
@@ -473,7 +667,7 @@ class TfMessageElement extends LitElement {
 						body = html`
 							<div
 								style="border: 1px solid #fff; border-radius: 1em; padding: 8px; margin: 4px; cursor: pointer"
-								@click=${x => self.toggle_expanded(':blog')}>
+								@click=${(x) => self.toggle_expanded(':blog')}>
 								<h2>${content.title}</h2>
 								<div style="display: flex; flex-direction: row">
 									<img src=/${content.thumbnail}/view></img>
@@ -484,6 +678,26 @@ class TfMessageElement extends LitElement {
 						`;
 						break;
 				}
+				let reply =
+					this.drafts[this.message?.id] !== undefined
+						? html`
+								<tf-compose
+									whoami=${this.whoami}
+									.users=${this.users}
+									root=${this.message.content.root || this.message.id}
+									branch=${this.message.id}
+									.drafts=${this.drafts}
+									@tf-discard=${this.discard_reply}
+								></tf-compose>
+							`
+						: html`
+								<button
+									class="w3-button w3-dark-grey"
+									@click=${this.show_reply}
+								>
+									Reply
+								</button>
+							`;
 				return html`
 					<style>
 						code {
@@ -499,44 +713,70 @@ class TfMessageElement extends LitElement {
 							display: block;
 						}
 					</style>
-					<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px">
+					<div
+						class="w3-card-4"
+						style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px"
+					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							<span style="flex: 1"></span>
-							<span style="padding-right: 8px"><a target="_top" href=${'#' + self.message.id}>%</a> ${new Date(this.message.timestamp).toLocaleString()}</span>
+							<span style="padding-right: 8px"
+								><a target="_top" href=${'#' + self.message.id}>%</a>
+								${new Date(this.message.timestamp).toLocaleString()}</span
+							>
 							<span>${raw_button}</span>
 						</div>
 
 						<div>${body}</div>
 						${this.render_mentions()}
-						${this.render_votes()}
+						<div>
+							${reply}
+							<button class="w3-button w3-dark-grey" @click=${this.react}>
+								React
+							</button>
+						</div>
+						${this.render_votes()} ${this.render_children()}
 					</div>
 				`;
 			} else if (content.type === 'pub') {
-				return small_frame(html`
+				return small_frame(
-				<style>
+					html` <style>
 							span {
 								overflow-wrap: anywhere;
 							}
 						</style>
 						<span>
 							<div>
-						🍻 <tf-user .users=${this.users} id=${content.address.key}></tf-user>
+								🍻
+								<tf-user
+									.users=${this.users}
+									id=${content.address.key}
+								></tf-user>
 							</div>
 							<pre>${content.address.host}:${content.address.port}</pre>
-				</span>`);
+						</span>`
+				);
 			} else if (content.type === 'channel') {
 				return small_frame(html`
 					<div>
-						${content.subscribed ? 'subscribed to' : 'unsubscribed from'} <a href=${'#q=' + encodeURIComponent('#' + content.channel)}>#${content.channel}</a>
+						${content.subscribed ? 'subscribed to' : 'unsubscribed from'}
+						<a href=${'#q=' + encodeURIComponent('#' + content.channel)}
+							>#${content.channel}</a
+						>
 					</div>
 				`);
-			} else if (typeof(this.message.content) == 'string') {
+			} else if (typeof this.message.content == 'string') {
 				if (this.message?.decrypted) {
 					if (this.format == 'decrypted') {
-						return small_frame(html`<span>🔓</span><pre>${JSON.stringify(this.message.decrypted, null, 2)}</pre>`);
+						return small_frame(
+							html`<span>🔓</span>
+								<pre>${JSON.stringify(this.message.decrypted, null, 2)}</pre>`
+						);
 					} else {
-						return small_frame(html`<span>🔓</span><div>${this.message.decrypted.type}</div>`);
+						return small_frame(
+							html`<span>🔓</span>
+								<div>${this.message.decrypted.type}</div>`
+						);
 					}
 				} else {
 					return small_frame(html`<span>🔒</span>`);

apps/ssb/tf-news.js

@@ -61,7 +61,7 @@ class TfNewsElement extends LitElement {
 				message.parent_message = message.content.vote.link;
 			} else if (message.content.type == 'post') {
 				if (message.content.root) {
-					if (typeof(message.content.root) === 'string') {
+					if (typeof message.content.root === 'string') {
 						let m = ensure_message(message.content.root);
 						if (!m.child_messages) {
 							m.child_messages = [];
@@ -89,8 +89,7 @@ class TfNewsElement extends LitElement {
 		for (let message of messages) {
 			try {
 				message.content = JSON.parse(message.content);
-			} catch {
+			} catch {}
-			}
 			if (!messages_by_id[message.id]) {
 				messages_by_id[message.id] = message;
 				link_message(message);
@@ -100,8 +99,12 @@ class TfNewsElement extends LitElement {
 				message.parent_message = placeholder.parent_message;
 				message.child_messages = placeholder.child_messages;
 				message.votes = placeholder.votes;
-				if (placeholder.parent_message && messages_by_id[placeholder.parent_message]) {
+				if (
-					let children = messages_by_id[placeholder.parent_message].child_messages;
+					placeholder.parent_message &&
+					messages_by_id[placeholder.parent_message]
+				) {
+					let children =
+						messages_by_id[placeholder.parent_message].child_messages;
 					children.splice(children.indexOf(placeholder), 1);
 					children.push(message);
 				}
@@ -116,7 +119,10 @@ class TfNewsElement extends LitElement {
 		let latest = 0;
 		for (let message of messages || []) {
 			if (message.latest_subtree_timestamp === undefined) {
-				message.latest_subtree_timestamp = Math.max(message.timestamp ?? 0, this.update_latest_subtree_timestamp(message.child_messages));
+				message.latest_subtree_timestamp = Math.max(
+					message.timestamp ?? 0,
+					this.update_latest_subtree_timestamp(message.child_messages)
+				);
 			}
 			latest = Math.max(latest, message.latest_subtree_timestamp);
 		}
@@ -127,20 +133,22 @@ class TfNewsElement extends LitElement {
 		function recursive_sort(messages, top) {
 			if (messages) {
 				if (top) {
-					messages.sort((a, b) => b.latest_subtree_timestamp - a.latest_subtree_timestamp);
+					messages.sort(
+						(a, b) => b.latest_subtree_timestamp - a.latest_subtree_timestamp
+					);
 				} else {
 					messages.sort((a, b) => a.timestamp - b.timestamp);
 				}
 				for (let message of messages) {
 					recursive_sort(message.child_messages, false);
 				}
-				return messages.map(x => Object.assign({}, x));
+				return messages.map((x) => Object.assign({}, x));
 			} else {
 				return {};
 			}
 		}
 
-		let roots = Object.values(messages_by_id).filter(x => !x.parent_message);
+		let roots = Object.values(messages_by_id).filter((x) => !x.parent_message);
 		this.update_latest_subtree_timestamp(roots);
 		return recursive_sort(roots, true);
 	}
@@ -167,10 +175,22 @@ class TfNewsElement extends LitElement {
 
 	load_and_render(messages) {
 		let messages_by_id = this.process_messages(messages);
-		let final_messages = this.group_following(this.finalize_messages(messages_by_id));
+		let final_messages = this.group_following(
+			this.finalize_messages(messages_by_id)
+		);
 		return html`
 			<div style="display: flex; flex-direction: column">
-				${final_messages.map(x => html`<tf-message .message=${x} whoami=${this.whoami} .users=${this.users} .drafts=${this.drafts} .expanded=${this.expanded} collapsed=true></tf-message>`)}
+				${final_messages.map(
+					(x) =>
+						html`<tf-message
+							.message=${x}
+							whoami=${this.whoami}
+							.users=${this.users}
+							.drafts=${this.drafts}
+							.expanded=${this.expanded}
+							collapsed="true"
+						></tf-message>`
+				)}
 			</div>
 		`;
 	}

apps/ssb/tf-profile.js

@@ -36,23 +36,29 @@ class TfProfileElement extends LitElement {
 			this.following = undefined;
 			this.blocking = undefined;
 
-			let result = await tfrpc.rpc.query(`
+			let result = await tfrpc.rpc.query(
+				`
 				SELECT json_extract(content, '$.following') AS following
 				FROM messages WHERE author = ? AND
 				json_extract(content, '$.type') = 'contact' AND
 				json_extract(content, '$.contact') = ? AND
 				following IS NOT NULL
 				ORDER BY sequence DESC LIMIT 1
-			`, [this.whoami, this.id]);
+			`,
+				[this.whoami, this.id]
+			);
 			this.following = result?.[0]?.following ?? false;
-			result = await tfrpc.rpc.query(`
+			result = await tfrpc.rpc.query(
+				`
 				SELECT json_extract(content, '$.blocking') AS blocking
 				FROM messages WHERE author = ? AND
 				json_extract(content, '$.type') = 'contact' AND
 				json_extract(content, '$.contact') = ? AND
 				blocking IS NOT NULL
 				ORDER BY sequence DESC LIMIT 1
-			`, [this.whoami, this.id]);
+			`,
+				[this.whoami, this.id]
+			);
 			this.blocking = result?.[0]?.blocking ?? false;
 		}
 	}
@@ -60,13 +66,16 @@ class TfProfileElement extends LitElement {
 	async initial_load() {
 		this.server_follows_me = undefined;
 		let server_id = await tfrpc.rpc.getServerIdentity();
-		let followed = await tfrpc.rpc.query(`
+		let followed = await tfrpc.rpc.query(
+			`
 			SELECT json_extract(content, '$.following') AS following
 			FROM messages
 			WHERE author = ? AND
 			json_extract(content, '$.type') = 'contact' AND
 			json_extract(content, '$.contact') = ? ORDER BY sequence DESC LIMIT 1
-		`, [server_id, this.whoami]);
+		`,
+			[server_id, this.whoami]
+		);
 		let is_followed = false;
 		for (let row of followed) {
 			is_followed = row.following != 0;
@@ -75,11 +84,18 @@ class TfProfileElement extends LitElement {
 	}
 
 	modify(change) {
-		tfrpc.rpc.appendMessage(this.whoami,
+		tfrpc.rpc
-			Object.assign({
+			.appendMessage(
+				this.whoami,
+				Object.assign(
+					{
 						type: 'contact',
 						contact: this.id,
-			}, change)).catch(function(error) {
+					},
+					change
+				)
+			)
+			.catch(function (error) {
 				alert(error?.message);
 			});
 	}
@@ -122,9 +138,12 @@ class TfProfileElement extends LitElement {
 				message[key] = this.editing[key];
 			}
 		}
-		tfrpc.rpc.appendMessage(this.whoami, message).then(function() {
+		tfrpc.rpc
+			.appendMessage(this.whoami, message)
+			.then(function () {
 				self.editing = null;
-		}).catch(function(error) {
+			})
+			.catch(function (error) {
 				alert(error?.message);
 			});
 	}
@@ -139,13 +158,17 @@ class TfProfileElement extends LitElement {
 		input.type = 'file';
 		input.onchange = function (event) {
 			let file = event.target.files[0];
-			file.arrayBuffer().then(function(buffer) {
+			file
+				.arrayBuffer()
+				.then(function (buffer) {
 					let bin = Array.from(new Uint8Array(buffer));
 					return tfrpc.rpc.store_blob(bin);
-			}).then(function(id) {
+				})
+				.then(function (id) {
 					self.editing = Object.assign({}, self.editing, {image: id});
 					console.log(self.editing);
-			}).catch(function(e) {
+				})
+				.catch(function (e) {
 					alert(e.message);
 				});
 		};
@@ -166,15 +189,22 @@ class TfProfileElement extends LitElement {
 	}
 
 	render() {
-		if (this.id == this.whoami && this.editing && this.server_follows_me === undefined) {
+		if (
+			this.id == this.whoami &&
+			this.editing &&
+			this.server_follows_me === undefined
+		) {
 			this.initial_load();
 		}
 		this.load();
 		let self = this;
 		let profile = this.users[this.id] || {};
-		tfrpc.rpc.query(
+		tfrpc.rpc
+			.query(
 				`SELECT SUM(LENGTH(content)) AS size FROM messages WHERE author = ?`,
-			[this.id]).then(function(result) {
+				[this.id]
+			)
+			.then(function (result) {
 				self.size = result[0].size;
 			});
 		let edit;
@@ -184,50 +214,75 @@ class TfProfileElement extends LitElement {
 			if (this.editing) {
 				let server_follow;
 				if (this.server_follows_me === true) {
-					server_follow = html`<input type="button" value="Server, Stop Following Me" @click=${() => this.server_follow_me(false)}></input>`;
+					server_follow = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => this.server_follow_me(false)}
+					>
+						Server, Stop Following Me
+					</button>`;
 				} else if (this.server_follows_me === false) {
-					server_follow = html`<input type="button" value="Server, Follow Me" @click=${() => this.server_follow_me(true)}></input>`;
+					server_follow = html`<button
+						class="w3-button w3-dark-grey"
+						@click=${() => this.server_follow_me(true)}
+					>
+						Server, Follow Me
+					</button>`;
 				}
 				edit = html`
-					<input type="button" value="Save Profile" @click=${this.save_edits}></input>
+					<button class="w3-button w3-dark-grey" @click=${this.save_edits}>
-					<input type="button" value="Discard" @click=${this.discard_edits}></input>
+						Save Profile
+					</button>
+					<button class="w3-button w3-dark-grey" @click=${this.discard_edits}>
+						Discard
+					</button>
 					${server_follow}
 				`;
 			} else {
-				edit = html`<input type="button" value="Edit Profile" @click=${this.edit}></input>`;
+				edit = html`<button class="w3-button w3-dark-grey" @click=${this.edit}>
+					Edit Profile
+				</button>`;
 			}
 		}
-		if (this.id !== this.whoami &&
+		if (this.id !== this.whoami && this.following !== undefined) {
-			this.following !== undefined) {
+			follow = this.following
-			follow =
+				? html`<button class="w3-button w3-dark-grey" @click=${this.unfollow}>
-				this.following ?
+						Unfollow
-				html`<input type="button" value="Unfollow" @click=${this.unfollow}></input>` :
+					</button>`
-				html`<input type="button" value="Follow" @click=${this.follow}></input>`;
+				: html`<button class="w3-button w3-dark-grey" @click=${this.follow}>
+						Follow
+					</button>`;
 		}
-		if (this.id !== this.whoami &&
+		if (this.id !== this.whoami && this.blocking !== undefined) {
-			this.blocking !== undefined) {
+			block = this.blocking
-			block =
+				? html`<button class="w3-button w3-dark-grey" @click=${this.unblock}>
-				this.blocking ?
+						Unblock
-				html`<input type="button" value="Unblock" @click=${this.unblock}></input>` :
+					</button>`
-				html`<input type="button" value="Block" @click=${this.block}></input>`;
+				: html`<button class="w3-button w3-dark-grey" @click=${this.block}>
+						Block
+					</button>`;
 		}
-		let edit_profile = this.editing ? html`
+		let edit_profile = this.editing
-			<div style="flex: 1 0 50%; display: flex; flex-direction: column">
+			? html`
+			<div style="flex: 1 0 50%; display: flex; flex-direction: column; gap: 8px">
+				<div class="w3-container">
 					<div>
 						<label for="name">Name:</label>
-					<input type="text" id="name" value=${this.editing.name} @input=${event => this.editing = Object.assign({}, this.editing, {name: event.srcElement.value})}></input>
+						<input class="w3-input w3-dark-grey" type="text" id="name" value=${this.editing.name} @input=${(event) => (this.editing = Object.assign({}, this.editing, {name: event.srcElement.value}))}></input>
 					</div>
 					<div><label for="description">Description:</label></div>
-				<textarea style="flex: 1 0" id="description" @input=${event => this.editing = Object.assign({}, this.editing, {description: event.srcElement.value})}>${this.editing.description}</textarea>
+					<textarea class="w3-input w3-dark-grey" style="resize: vertical" rows="8" id="description" @input=${(event) => (this.editing = Object.assign({}, this.editing, {description: event.srcElement.value}))}>${this.editing.description}</textarea>
 					<div>
 						<label for="public_web_hosting">Public Web Hosting:</label>
-					<input type="checkbox" id="public_web_hosting" ?checked=${this.editing.publicWebHosting} @input=${event => self.editing = Object.assign({}, self.editing, {publicWebHosting: event.srcElement.checked})}></input>
+						<input class="w3-check w3-dark-grey" type="checkbox" id="public_web_hosting" ?checked=${this.editing.publicWebHosting} @input=${(event) => (self.editing = Object.assign({}, self.editing, {publicWebHosting: event.srcElement.checked}))}></input>
 					</div>
 					<div>
-					<input type="button" value="Attach Image" @click=${this.attach_image}></input>
+						<button class="w3-button w3-dark-grey" @click=${this.attach_image}>Attach Image</button>
 					</div>
-			</div>` : null;
+				</div>
-		let image = typeof(profile.image) == 'string' ? profile.image : profile.image?.link;
+			</div>`
+			: null;
+		let image =
+			typeof profile.image == 'string' ? profile.image : profile.image?.link;
 		image = this.editing?.image ?? image;
 		let description = this.editing?.description ?? profile.description;
 		return html`<div style="border: 2px solid black; background-color: rgba(255, 255, 255, 0.2); padding: 16px">

apps/ssb/tf-styles.js

@@ -1,6 +1,6 @@
 import {css} from './lit-all.min.js';
 
-export let styles = css`
+const tf = css`
 	a:link {
 		color: #bbf;
 	}
@@ -46,9 +46,259 @@ div.img_caption::after {
 		content: ' ±';
 	}
 
+	code {
+		background-color: #444;
+		padding-left: 3px;
+		padding-right: 3px;
+		border: 1px dotted #fff;
+		border-radius: 4px;
+	}
+
 	blockquote {
+		background-color: #607d8b;
 		border-left: 4px solid #fff;
-	margin-left: 0px;
+		padding: 8px;
-	padding-left: 8px;
+		padding-left: 12px;
 	}
 `;
+
+// prettier-ignore
+const w3 = css`
+/* W3.CSS 4.15 December 2020 by Jan Egil and Borge Refsnes */
+html{box-sizing:border-box}*,*:before,*:after{box-sizing:inherit}
+/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
+html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
+article,aside,details,figcaption,figure,footer,header,main,menu,nav,section{display:block}summary{display:list-item}
+audio,canvas,progress,video{display:inline-block}progress{vertical-align:baseline}
+audio:not([controls]){display:none;height:0}[hidden],template{display:none}
+a{background-color:transparent}a:active,a:hover{outline-width:0}
+abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}
+b,strong{font-weight:bolder}dfn{font-style:italic}mark{background:#ff0;color:#000}
+small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
+sub{bottom:-0.25em}sup{top:-0.5em}figure{margin:1em 40px}img{border-style:none}
+code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}hr{box-sizing:content-box;height:0;overflow:visible}
+button,input,select,textarea,optgroup{font:inherit;margin:0}optgroup{font-weight:bold}
+button,input{overflow:visible}button,select{text-transform:none}
+button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button}
+button::-moz-focus-inner,[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner{border-style:none;padding:0}
+button:-moz-focusring,[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring{outline:1px dotted ButtonText}
+fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
+legend{color:inherit;display:table;max-width:100%;padding:0;white-space:normal}textarea{overflow:auto}
+[type=checkbox],[type=radio]{padding:0}
+[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
+[type=search]{-webkit-appearance:textfield;outline-offset:-2px}
+[type=search]::-webkit-search-decoration{-webkit-appearance:none}
+::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}
+/* End extract */
+html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
+h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}
+.w3-serif{font-family:serif}.w3-sans-serif{font-family:sans-serif}.w3-cursive{font-family:cursive}.w3-monospace{font-family:monospace}
+h1,h2,h3,h4,h5,h6{font-family:"Segoe UI",Arial,sans-serif;font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
+hr{border:0;border-top:1px solid #eee;margin:20px 0}
+.w3-image{max-width:100%;height:auto}img{vertical-align:middle}a{color:inherit}
+.w3-table,.w3-table-all{border-collapse:collapse;border-spacing:0;width:100%;display:table}.w3-table-all{border:1px solid #ccc}
+.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
+.w3-table-all tr:nth-child(odd){background-color:#fff}.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
+.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}.w3-centered tr th,.w3-centered tr td{text-align:center}
+.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:8px 8px;display:table-cell;text-align:left;vertical-align:top}
+.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
+.w3-btn,.w3-button{border:none;display:inline-block;padding:8px 16px;vertical-align:middle;overflow:hidden;text-decoration:none;color:inherit;background-color:inherit;text-align:center;cursor:pointer;white-space:nowrap}
+.w3-btn:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
+.w3-btn,.w3-button{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}   
+.w3-disabled,.w3-btn:disabled,.w3-button:disabled{cursor:not-allowed;opacity:0.3}.w3-disabled *,:disabled *{pointer-events:none}
+.w3-btn.w3-disabled:hover,.w3-btn:disabled:hover{box-shadow:none}
+.w3-badge,.w3-tag{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}.w3-badge{border-radius:50%}
+.w3-ul{list-style-type:none;padding:0;margin:0}.w3-ul li{padding:8px 16px;border-bottom:1px solid #ddd}.w3-ul li:last-child{border-bottom:none}
+.w3-tooltip,.w3-display-container{position:relative}.w3-tooltip .w3-text{display:none}.w3-tooltip:hover .w3-text{display:inline-block}
+.w3-ripple:active{opacity:0.5}.w3-ripple{transition:opacity 0s}
+.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #ccc;width:100%}
+.w3-select{padding:9px 0;width:100%;border:none;border-bottom:1px solid #ccc}
+.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
+.w3-dropdown-hover:hover .w3-dropdown-content{display:block}
+.w3-dropdown-hover:first-child,.w3-dropdown-click:hover{background-color:#ccc;color:#000}
+.w3-dropdown-hover:hover > .w3-button:first-child,.w3-dropdown-click:hover > .w3-button:first-child{background-color:#ccc;color:#000}
+.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0;z-index:1}
+.w3-check,.w3-radio{width:24px;height:24px;position:relative;top:6px}
+.w3-sidebar{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
+.w3-bar-block .w3-dropdown-hover,.w3-bar-block .w3-dropdown-click{width:100%}
+.w3-bar-block .w3-dropdown-hover .w3-dropdown-content,.w3-bar-block .w3-dropdown-click .w3-dropdown-content{min-width:100%}
+.w3-bar-block .w3-dropdown-hover .w3-button,.w3-bar-block .w3-dropdown-click .w3-button{width:100%;text-align:left;padding:8px 16px}
+.w3-main,#main{transition:margin-left .4s}
+.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
+.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}
+.w3-bar{width:100%;overflow:hidden}.w3-center .w3-bar{display:inline-block;width:auto}
+.w3-bar .w3-bar-item{padding:8px 16px;float:left;width:auto;border:none;display:block;outline:0}
+.w3-bar .w3-dropdown-hover,.w3-bar .w3-dropdown-click{position:static;float:left}
+.w3-bar .w3-button{white-space:normal}
+.w3-bar-block .w3-bar-item{width:100%;display:block;padding:8px 16px;text-align:left;border:none;white-space:normal;float:none;outline:0}
+.w3-bar-block.w3-center .w3-bar-item{text-align:center}.w3-block{display:block;width:100%}
+.w3-responsive{display:block;overflow-x:auto}
+.w3-container:after,.w3-container:before,.w3-panel:after,.w3-panel:before,.w3-row:after,.w3-row:before,.w3-row-padding:after,.w3-row-padding:before,
+.w3-cell-row:before,.w3-cell-row:after,.w3-clear:after,.w3-clear:before,.w3-bar:before,.w3-bar:after{content:"";display:table;clear:both}
+.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
+.w3-col.s1{width:8.33333%}.w3-col.s2{width:16.66666%}.w3-col.s3{width:24.99999%}.w3-col.s4{width:33.33333%}
+.w3-col.s5{width:41.66666%}.w3-col.s6{width:49.99999%}.w3-col.s7{width:58.33333%}.w3-col.s8{width:66.66666%}
+.w3-col.s9{width:74.99999%}.w3-col.s10{width:83.33333%}.w3-col.s11{width:91.66666%}.w3-col.s12{width:99.99999%}
+@media (min-width:601px){.w3-col.m1{width:8.33333%}.w3-col.m2{width:16.66666%}.w3-col.m3,.w3-quarter{width:24.99999%}.w3-col.m4,.w3-third{width:33.33333%}
+.w3-col.m5{width:41.66666%}.w3-col.m6,.w3-half{width:49.99999%}.w3-col.m7{width:58.33333%}.w3-col.m8,.w3-twothird{width:66.66666%}
+.w3-col.m9,.w3-threequarter{width:74.99999%}.w3-col.m10{width:83.33333%}.w3-col.m11{width:91.66666%}.w3-col.m12{width:99.99999%}}
+@media (min-width:993px){.w3-col.l1{width:8.33333%}.w3-col.l2{width:16.66666%}.w3-col.l3{width:24.99999%}.w3-col.l4{width:33.33333%}
+.w3-col.l5{width:41.66666%}.w3-col.l6{width:49.99999%}.w3-col.l7{width:58.33333%}.w3-col.l8{width:66.66666%}
+.w3-col.l9{width:74.99999%}.w3-col.l10{width:83.33333%}.w3-col.l11{width:91.66666%}.w3-col.l12{width:99.99999%}}
+.w3-rest{overflow:hidden}.w3-stretch{margin-left:-16px;margin-right:-16px}
+.w3-content,.w3-auto{margin-left:auto;margin-right:auto}.w3-content{max-width:980px}.w3-auto{max-width:1140px}
+.w3-cell-row{display:table;width:100%}.w3-cell{display:table-cell}
+.w3-cell-top{vertical-align:top}.w3-cell-middle{vertical-align:middle}.w3-cell-bottom{vertical-align:bottom}
+.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
+@media (max-width:1205px){.w3-auto{max-width:95%}}
+@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}
+.w3-dropdown-hover.w3-mobile .w3-dropdown-content,.w3-dropdown-click.w3-mobile .w3-dropdown-content{position:relative}	
+.w3-hide-small{display:none!important}.w3-mobile{display:block;width:100%!important}.w3-bar-item.w3-mobile,.w3-dropdown-hover.w3-mobile,.w3-dropdown-click.w3-mobile{text-align:center}
+.w3-dropdown-hover.w3-mobile,.w3-dropdown-hover.w3-mobile .w3-btn,.w3-dropdown-hover.w3-mobile .w3-button,.w3-dropdown-click.w3-mobile,.w3-dropdown-click.w3-mobile .w3-btn,.w3-dropdown-click.w3-mobile .w3-button{width:100%}}
+@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
+@media (min-width:993px){.w3-modal-content{width:900px}.w3-hide-large{display:none!important}.w3-sidebar.w3-collapse{display:block!important}}
+@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
+@media (max-width:992px){.w3-sidebar.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}.w3-auto{max-width:100%}}
+.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
+.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
+.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
+.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
+.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
+.w3-display-left{position:absolute;top:50%;left:0%;transform:translate(0%,-50%);-ms-transform:translate(-0%,-50%)}
+.w3-display-right{position:absolute;top:50%;right:0%;transform:translate(0%,-50%);-ms-transform:translate(0%,-50%)}
+.w3-display-topmiddle{position:absolute;left:50%;top:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
+.w3-display-bottommiddle{position:absolute;left:50%;bottom:0;transform:translate(-50%,0%);-ms-transform:translate(-50%,0%)}
+.w3-display-container:hover .w3-display-hover{display:block}.w3-display-container:hover span.w3-display-hover{display:inline-block}.w3-display-hover{display:none}
+.w3-display-position{position:absolute}
+.w3-circle{border-radius:50%}
+.w3-round-small{border-radius:2px}.w3-round,.w3-round-medium{border-radius:4px}.w3-round-large{border-radius:8px}.w3-round-xlarge{border-radius:16px}.w3-round-xxlarge{border-radius:32px}
+.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
+.w3-container,.w3-panel{padding:0.01em 16px}.w3-panel{margin-top:16px;margin-bottom:16px}
+.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
+.w3-code{width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #4CAF50;word-wrap:break-word}
+.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
+.w3-card,.w3-card-2{box-shadow:0 2px 5px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)}
+.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 10px 0 rgba(0,0,0,0.2),0 4px 20px 0 rgba(0,0,0,0.19)}
+.w3-spin{animation:w3-spin 2s infinite linear}@keyframes w3-spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}
+.w3-animate-fading{animation:fading 10s infinite}@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
+.w3-animate-opacity{animation:opac 0.8s}@keyframes opac{from{opacity:0} to{opacity:1}}
+.w3-animate-top{position:relative;animation:animatetop 0.4s}@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
+.w3-animate-left{position:relative;animation:animateleft 0.4s}@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
+.w3-animate-right{position:relative;animation:animateright 0.4s}@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
+.w3-animate-bottom{position:relative;animation:animatebottom 0.4s}@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
+.w3-animate-zoom {animation:animatezoom 0.6s}@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
+.w3-animate-input{transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
+.w3-opacity,.w3-hover-opacity:hover{opacity:0.60}.w3-opacity-off,.w3-hover-opacity-off:hover{opacity:1}
+.w3-opacity-max{opacity:0.25}.w3-opacity-min{opacity:0.75}
+.w3-greyscale-max,.w3-grayscale-max,.w3-hover-greyscale:hover,.w3-hover-grayscale:hover{filter:grayscale(100%)}
+.w3-greyscale,.w3-grayscale{filter:grayscale(75%)}.w3-greyscale-min,.w3-grayscale-min{filter:grayscale(50%)}
+.w3-sepia{filter:sepia(75%)}.w3-sepia-max,.w3-hover-sepia:hover{filter:sepia(100%)}.w3-sepia-min{filter:sepia(50%)}
+.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
+.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
+.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
+.w3-border-0{border:0!important}.w3-border{border:1px solid #ccc!important}
+.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
+.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
+.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
+.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
+.w3-section,.w3-code{margin-top:16px!important;margin-bottom:16px!important}
+.w3-margin{margin:16px!important}.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
+.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
+.w3-padding-small{padding:4px 8px!important}.w3-padding{padding:8px 16px!important}.w3-padding-large{padding:12px 24px!important}
+.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
+.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
+.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
+.w3-padding-top-64{padding-top:64px!important}.w3-padding-top-48{padding-top:48px!important}
+.w3-padding-top-32{padding-top:32px!important}.w3-padding-top-24{padding-top:24px!important}
+.w3-left{float:left!important}.w3-right{float:right!important}
+.w3-button:hover{color:#000!important;background-color:#ccc!important}
+.w3-transparent,.w3-hover-none:hover{background-color:transparent!important}
+.w3-hover-none:hover{box-shadow:none!important}
+/* Colors */
+.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
+.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
+.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
+.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
+.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
+.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
+.w3-blue-grey,.w3-hover-blue-grey:hover,.w3-blue-gray,.w3-hover-blue-gray:hover{color:#fff!important;background-color:#607d8b!important}
+.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
+.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
+.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
+.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
+.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
+.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
+.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
+.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
+.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
+.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
+.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
+.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
+.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
+.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
+.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
+.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
+.w3-grey,.w3-hover-grey:hover,.w3-gray,.w3-hover-gray:hover{color:#000!important;background-color:#9e9e9e!important}
+.w3-light-grey,.w3-hover-light-grey:hover,.w3-light-gray,.w3-hover-light-gray:hover{color:#000!important;background-color:#f1f1f1!important}
+.w3-dark-grey,.w3-hover-dark-grey:hover,.w3-dark-gray,.w3-hover-dark-gray:hover{color:#fff!important;background-color:#616161!important}
+.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
+.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
+.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
+.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
+.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
+.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
+.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
+.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
+.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
+.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
+.w3-text-blue-grey,.w3-hover-text-blue-grey:hover,.w3-text-blue-gray,.w3-hover-text-blue-gray:hover{color:#607d8b!important}
+.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
+.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
+.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
+.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
+.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
+.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
+.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
+.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
+.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
+.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
+.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
+.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
+.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
+.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
+.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
+.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
+.w3-text-grey,.w3-hover-text-grey:hover,.w3-text-gray,.w3-hover-text-gray:hover{color:#757575!important}
+.w3-text-light-grey,.w3-hover-text-light-grey:hover,.w3-text-light-gray,.w3-hover-text-light-gray:hover{color:#f1f1f1!important}
+.w3-text-dark-grey,.w3-hover-text-dark-grey:hover,.w3-text-dark-gray,.w3-hover-text-dark-gray:hover{color:#3a3a3a!important}
+.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
+.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
+.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
+.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
+.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
+.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
+.w3-border-blue-grey,.w3-hover-border-blue-grey:hover,.w3-border-blue-gray,.w3-hover-border-blue-gray:hover{border-color:#607d8b!important}
+.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
+.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
+.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
+.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
+.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
+.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
+.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
+.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
+.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
+.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
+.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
+.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
+.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
+.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
+.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
+.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
+.w3-border-grey,.w3-hover-border-grey:hover,.w3-border-gray,.w3-hover-border-gray:hover{border-color:#9e9e9e!important}
+.w3-border-light-grey,.w3-hover-border-light-grey:hover,.w3-border-light-gray,.w3-hover-border-light-gray:hover{border-color:#f1f1f1!important}
+.w3-border-dark-grey,.w3-hover-border-dark-grey:hover,.w3-border-dark-gray,.w3-hover-border-dark-gray:hover{border-color:#616161!important}
+.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
+.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}
+`;
+
+export let styles = [tf, w3];

apps/ssb/tf-tab-connections.js

@@ -1,5 +1,6 @@
 import {LitElement, html} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
+import {styles} from './tf-styles.js';
 
 class TfTabConnectionsElement extends LitElement {
 	static get properties() {
@@ -12,6 +13,8 @@ class TfTabConnectionsElement extends LitElement {
 		};
 	}
 
+	static styles = styles;
+
 	constructor() {
 		super();
 		let self = this;
@@ -40,10 +43,12 @@ class TfTabConnectionsElement extends LitElement {
 
 	render_room_peers(connection) {
 		let self = this;
-		let peers = this.broadcasts.filter(x => x.tunnel?.id == connection);
+		let peers = this.broadcasts.filter((x) => x.tunnel?.id == connection);
 		if (peers.length) {
-			let connections = this.connections.map(x => x.id);
+			let connections = this.connections.map((x) => x.id);
-			return html`${peers.filter(x => connections.indexOf(x.pubkey) == -1).map(x => html`${self.render_room_peer(x)}`)}`;
+			return html`${peers
+				.filter((x) => connections.indexOf(x.pubkey) == -1)
+				.map((x) => html`${self.render_room_peer(x)}`)}`;
 		}
 	}
 
@@ -55,7 +60,12 @@ class TfTabConnectionsElement extends LitElement {
 		let self = this;
 		return html`
 			<li>
-				<input type="button" @click=${() => self._tunnel(connection.tunnel.id, connection.pubkey)} value="Connect"></input>
+				<button
+					class="w3-button w3-dark-grey"
+					@click=${() => self._tunnel(connection.tunnel.id, connection.pubkey)}
+				>
+					Connect
+				</button>
 				<tf-user id=${connection.pubkey} .users=${this.users}></tf-user> 📡
 			</li>
 		`;
@@ -64,7 +74,12 @@ class TfTabConnectionsElement extends LitElement {
 	render_broadcast(connection) {
 		return html`
 			<li>
-				<input type="button" @click=${() => tfrpc.rpc.connect(connection)} value="Connect"></input>
+				<button
+					class="w3-button w3-dark-grey"
+					@click=${() => tfrpc.rpc.connect(connection)}
+				>
+					Connect
+				</button>
 				<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
 				${this.render_connection_summary(connection)}
 			</li>
@@ -78,11 +93,20 @@ class TfTabConnectionsElement extends LitElement {
 
 	render_connection(connection) {
 		return html`
-			<input type="button" @click=${() => tfrpc.rpc.closeConnection(connection.id)} value="Close"></input>
+			<button
+				class="w3-button w3-dark-grey"
+				@click=${() => tfrpc.rpc.closeConnection(connection.id)}
+			>
+				Close
+			</button>
 			<tf-user id=${connection.id} .users=${this.users}></tf-user>
-			${connection.tunnel !== undefined ? '🚇' : html`(${connection.host}:${connection.port})`}
+			${connection.tunnel !== undefined
+				? '🚇'
+				: html`(${connection.host}:${connection.port})`}
 			<ul>
-				${this.connections.filter(x => x.tunnel === this.connections.indexOf(connection)).map(x => html`<li>${this.render_connection(x)}</li>`)}
+				${this.connections
+					.filter((x) => x.tunnel === this.connections.indexOf(connection))
+					.map((x) => html`<li>${this.render_connection(x)}</li>`)}
 				${this.render_room_peers(connection.id)}
 			</ul>
 		`;
@@ -91,35 +115,59 @@ class TfTabConnectionsElement extends LitElement {
 	render() {
 		let self = this;
 		return html`
+			<div class="w3-container">
 				<h2>New Connection</h2>
-			<div style="display: flex; flex-direction: column">
+				<textarea class="w3-input w3-dark-grey" id="code"></textarea>
-				<textarea id="code"></textarea>
+				<button
-			</div>
+					class="w3-button w3-dark-grey"
-			<input type="button" @click=${() => tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)} value="Connect"></input>
+					@click=${() =>
+						tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)}
+				>
+					Connect
+				</button>
 				<h2>Broadcasts</h2>
 				<ul>
-				${this.broadcasts.filter(x => x.address).map(x => self.render_broadcast(x))}
+					${this.broadcasts
+						.filter((x) => x.address)
+						.map((x) => self.render_broadcast(x))}
 				</ul>
 				<h2>Connections</h2>
 				<ul>
-				${this.connections.filter(x => x.tunnel === undefined).map(x => html`
+					${this.connections
-					<li>${this.render_connection(x)}</li>
+						.filter((x) => x.tunnel === undefined)
-				`)}
+						.map((x) => html` <li>${this.render_connection(x)}</li> `)}
 				</ul>
 				<h2>Stored Connections (WIP)</h2>
 				<ul>
-				${this.stored_connections.map(x => html`
+					${this.stored_connections.map(
+						(x) => html`
 							<li>
-						<input type="button" @click=${() => self.forget_stored_connection(x)} value="Forget"></input>
+								<button
-						<input type="button" @click=${() => tfrpc.rpc.connect(x)} value="Connect"></input>
+									class="w3-button w3-dark-grey"
-						${x.address}:${x.port} <tf-user id=${x.pubkey} .users=${self.users}></tf-user>
+									@click=${() => self.forget_stored_connection(x)}
+								>
+									Forget
+								</button>
+								<button
+									class="w3-button w3-dark-grey"
+									@click=${() => tfrpc.rpc.connect(x)}
+								>
+									Connect
+								</button>
+								${x.address}:${x.port}
+								<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
 							</li>
-				`)}
+						`
+					)}
 				</ul>
 				<h2>Local Accounts</h2>
 				<ul>
-				${this.identities.map(x => html`<li><tf-user id=${x} .users=${this.users}></tf-user></li>`)}
+					${this.identities.map(
+						(x) =>
+							html`<li><tf-user id=${x} .users=${this.users}></tf-user></li>`
+					)}
 				</ul>
+			</div>
 		`;
 	}
 }

apps/ssb/tf-tab-mentions.js

@@ -27,7 +27,8 @@ class TfTabMentionsElement extends LitElement {
 
 	async load() {
 		console.log('Loading...', this.whoami);
-		let results = await tfrpc.rpc.query(`
+		let results = await tfrpc.rpc.query(
+			`
 				SELECT messages.*
 				FROM messages_fts(?)
 				JOIN messages ON messages.rowid = messages_fts.rowid
@@ -35,7 +36,12 @@ class TfTabMentionsElement extends LitElement {
 				WHERE messages.author != ?
 				ORDER BY timestamp DESC limit 20
 			`,
-			['"' + this.whoami.replace('"', '""') + '"', JSON.stringify(this.following), this.whoami]);
+			[
+				'"' + this.whoami.replace('"', '""') + '"',
+				JSON.stringify(this.following),
+				this.whoami,
+			]
+		);
 		console.log('Done.');
 		this.messages = results;
 	}
@@ -58,7 +64,14 @@ class TfTabMentionsElement extends LitElement {
 			this.load();
 		}
 		return html`
-			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} @tf-expand=${this.on_expand}></tf-news>
+			<tf-news
+				id="news"
+				whoami=${this.whoami}
+				.messages=${this.messages}
+				.users=${this.users}
+				.expanded=${this.expanded}
+				@tf-expand=${this.on_expand}
+			></tf-news>
 		`;
 	}
 }

apps/ssb/tf-tab-news-feed.js

@@ -45,9 +45,8 @@ class TfTabNewsFeedElement extends LitElement {
 					UNION
 					SELECT * FROM mine
 				`,
-				[
+				[this.hash.substring(1)]
-					this.hash.substring(1),
+			);
-				]);
 			return r;
 		} else if (this.hash.startsWith('#%')) {
 			return await tfrpc.rpc.query(
@@ -61,14 +60,14 @@ class TfTabNewsFeedElement extends LitElement {
 					ON messages.id = messages_refs.message
 					WHERE messages_refs.ref = ?1
 				`,
-				[
+				[this.hash.substring(1)]
-					this.hash.substring(1),
+			);
-				]);
 		} else {
 			let promises = [];
 			const k_following_limit = 256;
 			for (let i = 0; i < this.following.length; i += k_following_limit) {
-				promises.push(tfrpc.rpc.query(
+				promises.push(
+					tfrpc.rpc.query(
 						`
 						WITH news AS (SELECT messages.*
 						FROM messages
@@ -95,7 +94,9 @@ class TfTabNewsFeedElement extends LitElement {
 							 ** messages with far-future timestamps from staying at the top forever.
 							 */
 							new Date().valueOf() + 24 * 60 * 60 * 1000,
-					]));
+						]
+					)
+				);
 			}
 			return [].concat(...(await Promise.all(promises)));
 		}
@@ -124,11 +125,8 @@ class TfTabNewsFeedElement extends LitElement {
 				UNION
 				SELECT news.* FROM news
 			`,
-			[
+			[JSON.stringify(this.following), this.start_time, last_start_time]
-				JSON.stringify(this.following),
+		);
-				this.start_time,
-				last_start_time,
-			]);
 		this.messages = await this.decrypt([...more, ...this.messages]);
 	}
 
@@ -139,14 +137,12 @@ class TfTabNewsFeedElement extends LitElement {
 			let content;
 			try {
 				content = JSON.parse(message?.content);
-			} catch {
+			} catch {}
-			}
+			if (typeof content === 'string') {
-			if (typeof(content) === 'string') {
 				let decrypted;
 				try {
 					decrypted = await tfrpc.rpc.try_decrypt(this.whoami, content);
-				} catch {
+				} catch {}
-				}
 				if (decrypted) {
 					try {
 						message.decrypted = JSON.parse(decrypted);
@@ -165,29 +161,48 @@ class TfTabNewsFeedElement extends LitElement {
 	}
 
 	render() {
-		if (!this.messages ||
+		if (
+			!this.messages ||
 			this._messages_hash !== this.hash ||
-			this._messages_following !== this.following) {
+			this._messages_following !== this.following
-			console.log(`loading messages for ${this.whoami} (following ${this.following.length})`);
+		) {
+			console.log(
+				`loading messages for ${this.whoami} (following ${this.following.length})`
+			);
 			let self = this;
 			this.messages = [];
 			this._messages_hash = this.hash;
 			this._messages_following = this.following;
-			this.fetch_messages().then(this.decrypt.bind(this)).then(function(messages) {
+			this.fetch_messages()
+				.then(this.decrypt.bind(this))
+				.then(function (messages) {
 					self.messages = messages;
 					console.log(`loading mesages done for ${self.whoami}`);
-			}).catch(function(error) {
+				})
+				.catch(function (error) {
 					alert(JSON.stringify(error, null, 2));
 				});
 		}
 		let more;
 		if (!this.hash.startsWith('#@') && !this.hash.startsWith('#%')) {
 			more = html`
-				<input type="button" value="Load More" @click=${this.load_more}></input>
+				<p>
+					<button class="w3-button w3-dark-grey" @click=${this.load_more}>
+						Load More
+					</button>
+				</p>
 			`;
 		}
 		return html`
-			<tf-news id="news" whoami=${this.whoami} .users=${this.users} .messages=${this.messages} .following=${this.following} .drafts=${this.drafts} .expanded=${this.expanded}></tf-news>
+			<tf-news
+				id="news"
+				whoami=${this.whoami}
+				.users=${this.users}
+				.messages=${this.messages}
+				.following=${this.following}
+				.drafts=${this.drafts}
+				.expanded=${this.expanded}
+			></tf-news>
 			${more}
 		`;
 	}

apps/ssb/tf-tab-news.js

@@ -48,7 +48,9 @@ class TfTabNewsElement extends LitElement {
 		let news = this.shadowRoot?.getElementById('news');
 		if (news) {
 			console.log('injecting messages', news.messages);
-			news.add_messages(Object.values(Object.fromEntries(this.unread.map(x => [x.id, x]))));
+			news.add_messages(
+				Object.values(Object.fromEntries(this.unread.map((x) => [x.id, x])))
+			);
 			this.dispatchEvent(new CustomEvent('refresh'));
 		}
 	}
@@ -62,11 +64,16 @@ class TfTabNewsElement extends LitElement {
 			let type = 'private';
 			try {
 				type = JSON.parse(message.content).type || type;
-			} catch {
+			} catch {}
-			}
 			counts[type] = (counts[type] || 0) + 1;
 		}
-		return 'Show New: ' + Object.keys(counts).sort().map(x => (counts[x].toString() + ' ' + x + 's')).join(', ');
+		return (
+			'↻ Show New: ' +
+			Object.keys(counts)
+				.sort()
+				.map((x) => counts[x].toString() + ' ' + x + 's')
+				.join(', ')
+		);
 	}
 
 	draft(event) {
@@ -96,22 +103,52 @@ class TfTabNewsElement extends LitElement {
 	}
 
 	on_keypress(event) {
-		if (event.target === document.body &&
+		if (event.target === document.body && event.key == '.') {
-			event.key == '.') {
 			this.show_more();
 		}
 	}
 
 	render() {
-		let profile = this.hash.startsWith('#@') ?
+		let profile = this.hash.startsWith('#@')
-			html`<tf-profile id=${this.hash.substring(1)} whoami=${this.whoami} .users=${this.users}></tf-profile>` : undefined;
+			? html`<tf-profile
+					id=${this.hash.substring(1)}
+					whoami=${this.whoami}
+					.users=${this.users}
+				></tf-profile>`
+			: undefined;
 		return html`
-			<div><input type="button" value=${this.new_messages_text()} @click=${this.show_more}></input></div>
+			<p class="w3-bar">
-			<a target="_top" href="#" ?hidden=${this.hash.length <= 1}>🏠Home</a>
+				<button
-			<div>Welcome, <tf-user id=${this.whoami} .users=${this.users}></tf-user>!</div>
+					class="w3-bar-item w3-button w3-dark-grey"
-			<div><tf-compose id="tf-compose" whoami=${this.whoami} .users=${this.users} .drafts=${this.drafts} @tf-draft=${this.draft}></tf-compose></div>
+					@click=${this.show_more}
+				>
+					${this.new_messages_text()}
+				</button>
+			</p>
+			<div>
+				Welcome, <tf-user id=${this.whoami} .users=${this.users}></tf-user>!
+			</div>
+			<div>
+				<tf-compose
+					id="tf-compose"
+					whoami=${this.whoami}
+					.users=${this.users}
+					.drafts=${this.drafts}
+					@tf-draft=${this.draft}
+				></tf-compose>
+			</div>
 			${profile}
-			<tf-tab-news-feed id="news" whoami=${this.whoami} .users=${this.users} .following=${this.following} hash=${this.hash} .drafts=${this.drafts} .expanded=${this.expanded} @tf-draft=${this.draft} @tf-expand=${this.on_expand}></tf-tab-news-feed>
+			<tf-tab-news-feed
+				id="news"
+				whoami=${this.whoami}
+				.users=${this.users}
+				.following=${this.following}
+				hash=${this.hash}
+				.drafts=${this.drafts}
+				.expanded=${this.expanded}
+				@tf-draft=${this.draft}
+				@tf-expand=${this.on_expand}
+			></tf-tab-news-feed>
 		`;
 	}
 }

apps/ssb/tf-tab-query.js

@@ -41,7 +41,7 @@ class TfTabQueryElement extends LitElement {
 		await tfrpc.rpc.setHash('#sql=' + encodeURIComponent(query));
 		let start_time = new Date();
 		try {
-			this.results = await tfrpc.rpc.query(query, [])
+			this.results = await tfrpc.rpc.query(query, []);
 		} catch (error) {
 			this.error = error;
 		}
@@ -79,8 +79,15 @@ class TfTabQueryElement extends LitElement {
 		} else {
 			let keys = Object.keys(this.results[0]).sort();
 			return html`<table style="width: 100%; max-width: 100%">
-				<tr>${keys.map(key => html`<th>${key}</th>`)}</tr>
+				<tr>
-				${this.results.map(row => html`<tr>${keys.map(key => html`<td>${row[key]}</td>`)}</tr>`)}
+					${keys.map((key) => html`<th>${key}</th>`)}
+				</tr>
+				${this.results.map(
+					(row) =>
+						html`<tr>
+							${keys.map((key) => html`<td>${row[key]}</td>`)}
+						</tr>`
+				)}
 			</table>`;
 		}
 	}
@@ -99,14 +106,29 @@ class TfTabQueryElement extends LitElement {
 		}
 		let self = this;
 		return html`
-			<div style="display: flex; flex-direction: row">
+			<div style="display: flex; flex-direction: row; gap: 4px">
-				<textarea id="search" rows=8 style="flex: 1" @keydown=${this.search_keydown}>${this.query}</textarea>
+				<textarea
-				<input type="button" value="Execute" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}></input>
+					id="search"
+					rows="8"
+					class="w3-input w3-dark-grey"
+					style="flex: 1; resize: vertical"
+					@keydown=${this.search_keydown}
+				>
+${this.query}</textarea
+				>
+				<button
+					class="w3-button w3-dark-grey"
+					@click=${(event) =>
+						self.search(self.renderRoot.getElementById('search').value)}
+				>
+					Execute
+				</button>
+			</div>
+			<div ?hidden=${this.duration === undefined}>
+				Took ${this.duration / 1000.0} seconds.
 			</div>
-			<div ?hidden=${this.duration === undefined}>Took ${this.duration / 1000.0} seconds.</div>
 			<div ?hidden=${this.duration !== undefined}>Executing...</div>
-			${this.render_error()}
+			${this.render_error()} ${this.render_results()}
-			${this.render_results()}
 		`;
 	}
 }

apps/ssb/tf-tab-search.js

@@ -33,14 +33,16 @@ class TfTabSearchElement extends LitElement {
 			search.select();
 		}
 		await tfrpc.rpc.setHash('#q=' + encodeURIComponent(query));
-		let results = await tfrpc.rpc.query(`
+		let results = await tfrpc.rpc.query(
+			`
 				SELECT messages.*
 				FROM messages_fts(?)
 				JOIN messages ON messages.rowid = messages_fts.rowid
 				JOIN json_each(?) AS following ON messages.author = following.value
 				ORDER BY timestamp DESC limit 100
 			`,
-			['"' + query.replace('"', '""') + '"', JSON.stringify(this.following)]);
+			['"' + query.replace('"', '""') + '"', JSON.stringify(this.following)]
+		);
 		console.log('Done.');
 		search = this.renderRoot.getElementById('search');
 		if (search) {
@@ -75,9 +77,9 @@ class TfTabSearchElement extends LitElement {
 		}
 		let self = this;
 		return html`
-			<div style="display: flex; flex-direction: row">
+			<div style="display: flex; flex-direction: row; gap: 4px">
-				<input type="text" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
+				<input type="text" class="w3-input w3-dark-grey" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
-				<input type="button" value="Search" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}></input>
+				<button class="w3-button w3-dark-grey" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}>Search</button>
 			</div>
 			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} @tf-expand=${this.on_expand}></tf-news>
 		`;

apps/ssb/tf-tag.js

@@ -17,7 +17,11 @@ class TfTagElement extends LitElement {
 
 	render() {
 		let number = this.count ? html` (${this.count})` : undefined;
-		return html`<a href="#q=${this.tag}" style="display: inline-block; margin: 3px; border: 1px solid black; background-color: #444; padding: 4px; border-radius: 3px">${this.tag}${number}</a>`;
+		return html`<a
+			href="#q=${this.tag}"
+			style="display: inline-block; margin: 3px; border: 1px solid black; background-color: #444; padding: 4px; border-radius: 3px"
+			>${this.tag}${number}</a
+		>`;
 	}
 }
 

apps/ssb/tf-user.js

@@ -20,21 +20,24 @@ class TfUserElement extends LitElement {
 
 	render() {
 		let name = this.users?.[this.id]?.name;
-		name = name !== undefined ?
+		name =
-			html`<a target="_top" href=${'#' + this.id}>${name}</a>` :
+			name !== undefined
-			html`<a target="_top" href=${'#' + this.id}>${this.id}</a>`;
+				? html`<a target="_top" href=${'#' + this.id}>${name}</a>`
+				: html`<a target="_top" href=${'#' + this.id}>${this.id}</a>`;
 
 		if (this.users[this.id]) {
 			let image = this.users[this.id].image;
-			image = typeof(image) == 'string' ? image : image?.link;
+			image = typeof image == 'string' ? image : image?.link;
-			return html`
+			return html` <div style="display: inline-block; font-weight: bold">
-				<div style="display: inline-block; font-weight: bold">
+				<img
-						<img style="width: 2em; height: 2em; vertical-align: middle; border-radius: 50%" ?hidden=${image === undefined} src="${image ? '/' + image + '/view' : undefined}">
+					style="width: 2em; height: 2em; vertical-align: middle; border-radius: 50%"
+					?hidden=${image === undefined}
+					src="${image ? '/' + image + '/view' : undefined}"
+				/>
 				${name}
 			</div>`;
 		} else {
-			return html`
+			return html` <div style="display: inline-block; font-weight: bold">
-				<div style="display: inline-block; font-weight: bold">
 				${name}
 			</div>`;
 		}

apps/ssb/tf-utils.js

@@ -2,20 +2,32 @@ import * as linkify from './commonmark-linkify.js';
 import * as hashtagify from './commonmark-hashtag.js';
 
 function image(node, entering) {
-	if (node.firstChild?.type === 'text' &&
+	if (
-		node.firstChild.literal.startsWith('video:')) {
+		node.firstChild?.type === 'text' &&
+		node.firstChild.literal.startsWith('video:')
+	) {
 		if (entering) {
-			this.lit('<video style="max-width: 100%; max-height: 480px" title="' + this.esc(node.firstChild?.literal) + '" controls>');
+			this.lit(
+				'<video style="max-width: 100%; max-height: 480px" title="' +
+					this.esc(node.firstChild?.literal) +
+					'" controls>'
+			);
 			this.lit('<source src="' + this.esc(node.destination) + '"></source>');
 			this.disableTags += 1;
 		} else {
 			this.disableTags -= 1;
 			this.lit('</video>');
 		}
-	} else if (node.firstChild?.type === 'text' &&
+	} else if (
-		node.firstChild.literal.startsWith('audio:')) {
+		node.firstChild?.type === 'text' &&
+		node.firstChild.literal.startsWith('audio:')
+	) {
 		if (entering) {
-			this.lit('<audio style="height: 32px; max-width: 100%" title="' + this.esc(node.firstChild?.literal) + '" controls>');
+			this.lit(
+				'<audio style="height: 32px; max-width: 100%" title="' +
+					this.esc(node.firstChild?.literal) +
+					'" controls>'
+			);
 			this.lit('<source src="' + this.esc(node.destination) + '"></source>');
 			this.disableTags += 1;
 		} else {
@@ -25,7 +37,11 @@ function image(node, entering) {
 	} else {
 		if (entering) {
 			if (this.disableTags === 0) {
-				this.lit('<div class="img_caption">' + this.esc(node.firstChild?.literal || node.destination) + '</div>');
+				this.lit(
+					'<div class="img_caption">' +
+						this.esc(node.firstChild?.literal || node.destination) +
+						'</div>'
+				);
 				if (this.options.safe && potentiallyUnsafe(node.destination)) {
 					this.lit('<img src="" alt="');
 				} else {
@@ -46,26 +62,32 @@ function image(node, entering) {
 }
 
 export function markdown(md) {
-	var reader = new commonmark.Parser({safe: true});
+	let reader = new commonmark.Parser({safe: true});
-	var writer = new commonmark.HtmlRenderer();
+	let writer = new commonmark.HtmlRenderer();
 	writer.image = image;
-	var parsed = reader.parse(md || '');
+	let parsed = reader.parse(md || '');
-	parsed = linkify.transform(parsed);
 	parsed = hashtagify.transform(parsed);
-	var walker = parsed.walker();
+	parsed = linkify.transform(parsed);
-	var event, node;
+	let walker = parsed.walker();
+	let event, node;
 	while ((event = walker.next())) {
 		node = event.node;
 		if (event.entering) {
 			if (node.type == 'link') {
-				if (node.destination.startsWith('@') &&
+				if (
-					node.destination.endsWith('.ed25519')) {
+					node.destination.startsWith('@') &&
+					node.destination.endsWith('.ed25519')
+				) {
 					node.destination = '#' + node.destination;
-				} else if (node.destination.startsWith('%') &&
+				} else if (
-					node.destination.endsWith('.sha256')) {
+					node.destination.startsWith('%') &&
+					node.destination.endsWith('.sha256')
+				) {
 					node.destination = '#' + node.destination;
-				} else if (node.destination.startsWith('&') &&
+				} else if (
-					node.destination.endsWith('.sha256')) {
+					node.destination.startsWith('&') &&
+					node.destination.endsWith('.sha256')
+				) {
 					node.destination = '/' + node.destination + '/view';
 				}
 			} else if (node.type == 'image') {

apps/todo/app.js

@@ -27,7 +27,8 @@ async function todo_add(list) {
 		let set = new Set(names);
 		set.add(list);
 		names = JSON.stringify([...set].sort());
-		exchanged = original === names || await g_db.exchange('files', original, names);
+		exchanged =
+			original === names || (await g_db.exchange('files', original, names));
 	}
 	return exchanged;
 }
@@ -42,7 +43,8 @@ async function todo_remove(list) {
 		let set = new Set(names);
 		set.delete(list);
 		names = JSON.stringify([...set].sort());
-		exchanged = original === names || await g_db.exchange('files', original, names);
+		exchanged =
+			original === names || (await g_db.exchange('files', original, names));
 	}
 	await g_db.remove('list:' + list);
 	return exchanged;

apps/todo/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
 		<title>TODO</title>

apps/todo/script.js

@@ -4,7 +4,7 @@ import * as tfrpc from '/static/tfrpc.js';
 class TodosElement extends LitElement {
 	static get properties() {
 		return {
-			lists: {type: Array}
+			lists: {type: Array},
 		};
 	}
 
@@ -12,9 +12,12 @@ class TodosElement extends LitElement {
 		super();
 		this.lists = [];
 		let self = this;
-		tfrpc.rpc.todo_get_all().then(function(lists) {
+		tfrpc.rpc
+			.todo_get_all()
+			.then(function (lists) {
 				self.lists = lists;
-		}).catch(function(error) {
+			})
+			.catch(function (error) {
 				console.log(error);
 			});
 	}
@@ -32,9 +35,15 @@ class TodosElement extends LitElement {
 		return html`
 			<div>
 				<div style="display: flex">
-					${this.lists.map(x => html`
+					${this.lists.map(
-						<tf-todo-list name=${x.name} .items=${x.items} @change=${this.refresh}></tf-todo-list>
+						(x) => html`
-					`)}
+							<tf-todo-list
+								name=${x.name}
+								.items=${x.items}
+								@change=${this.refresh}
+							></tf-todo-list>
+						`
+					)}
 				</div>
 				<input type="button" @click=${this.new_list} value="+ List"></input>
 			</div>`;
@@ -59,16 +68,22 @@ class TodoListElement extends LitElement {
 	save() {
 		let self = this;
 		console.log('saving', self.name, self.items);
-		tfrpc.rpc.todo_set(self.name, self.items).then(function() {
+		tfrpc.rpc
+			.todo_set(self.name, self.items)
+			.then(function () {
 				console.log('saved', self.name, self.items);
-		}).catch(function(error) {
+			})
+			.catch(function (error) {
 				console.log(error);
 			});
 	}
 
 	remove_item(item) {
 		let index = this.items.indexOf(item);
-		this.items = [].concat(this.items.slice(0, index), this.items.slice(index + 1));
+		this.items = [].concat(
+			this.items.slice(0, index),
+			this.items.slice(index + 1)
+		);
 		this.save();
 	}
 
@@ -106,20 +121,20 @@ class TodoListElement extends LitElement {
 		let self = this;
 		if (index === this.editing) {
 			return html`
-				<div><input type="checkbox" ?checked=${item.x} @change=${x => self.handle_check(x, item)}></input>
+				<div><input type="checkbox" ?checked=${item.x} @change=${(x) => self.handle_check(x, item)}></input>
 				<input
 					id="edit"
 					type="text"
 					value=${item.text}
-					@change=${event => self.input_change(event, item)}
+					@change=${(event) => self.input_change(event, item)}
-					@keydown=${event => self.input_keydown(event, item)}
+					@keydown=${(event) => self.input_keydown(event, item)}
-					@blur=${x => self.input_blur(item)}></input>
+					@blur=${(x) => self.input_blur(item)}></input>
-				<span @click=${x => self.remove_item(item)} style="cursor: pointer">❎</span></div>
+				<span @click=${(x) => self.remove_item(item)} style="cursor: pointer">❎</span></div>
 			`;
 		} else {
 			return html`
-				<div><input type="checkbox" ?checked=${item.x} @change=${x => self.handle_check(x, item)}></input>
+				<div><input type="checkbox" ?checked=${item.x} @change=${(x) => self.handle_check(x, item)}></input>
-				<span @click=${x => self.editing = index}>${item.text || '(empty)'}</span>
+				<span @click=${(x) => (self.editing = index)}>${item.text || '(empty)'}</span>
 			`;
 		}
 	}
@@ -139,10 +154,13 @@ class TodoListElement extends LitElement {
 
 	rename(new_name) {
 		let self = this;
-		return tfrpc.rpc.todo_rename(this.name, new_name).then(function() {
+		return tfrpc.rpc
+			.todo_rename(this.name, new_name)
+			.then(function () {
 				self.dispatchEvent(new Event('change'));
 				self.editing_name = false;
-		}).catch(function(error) {
+			})
+			.catch(function (error) {
 				console.log(error);
 				alert(error.message);
 				self.editing_name = false;
@@ -163,19 +181,25 @@ class TodoListElement extends LitElement {
 
 	render() {
 		let self = this;
-		let name = this.editing_name ?
+		let name = this.editing_name
-			html`<input
+			? html`<input
 				type="text"
 				id="edit"
-				@keydown=${event => self.name_keydown(event)}
+				@keydown=${(event) => self.name_keydown(event)}
-				@blur=${event => self.name_blur(event.srcElement.value)}
+				@blur=${(event) => self.name_blur(event.srcElement.value)}
-				value=${this.name}></input>` :
+				value=${this.name}></input>`
-			html`<h2 @click=${x => this.editing_name = true}>${this.name}</h2>`;
+			: html`<h2 @click=${(x) => (this.editing_name = true)}>${this.name}</h2>`;
 		return html`
-			<div style="border: 3px solid black; padding: 8px; margin: 8px; border-radius: 8px; background-color: #444">
+			<div
+				style="border: 3px solid black; padding: 8px; margin: 8px; border-radius: 8px; background-color: #444"
+			>
 				${name}
-				${(this.items || []).filter(item => !item.x).map(x => self.render_item(x))}
+				${(this.items || [])
-				${(this.items || []).filter(item => item.x).map(x => self.render_item(x))}
+					.filter((item) => !item.x)
+					.map((x) => self.render_item(x))}
+				${(this.items || [])
+					.filter((item) => item.x)
+					.map((x) => self.render_item(x))}
 				<button @click=${self.add_item}>+ Item</button>
 				<button @click=${self.remove_list}>- List</button>
 			</div>

apps/welcome.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "👋",
-  "previous": "&xc5LDQt9bWp6wrPxZhvSGiMXjweSK1YbO2DReM7/2ic=.sha256"
+	"previous": "&zFISmRDAv+SXFonfZ9/sHNhrmMe+poTU22gwZzuSkT4=.sha256"
 }

apps/welcome/index.html

@@ -1,23 +1,36 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
-		<meta charset="UTF-8">
+		<meta charset="UTF-8" />
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
-		<link rel="stylesheet" href="w3.css">
+		<link rel="stylesheet" href="w3.css" />
-		<link rel="stylesheet" href="fontawesome.min.css">
+		<link rel="stylesheet" href="fontawesome.min.css" />
-		<link rel="stylesheet" href="regular.min.css">
+		<link rel="stylesheet" href="regular.min.css" />
-		<link rel="stylesheet" href="solid.min.css">
+		<link rel="stylesheet" href="solid.min.css" />
-		<link rel="stylesheet" href="brands.min.css">
+		<link rel="stylesheet" href="brands.min.css" />
 
 		<style>
-			body,h1,h2,h3,h4,h5 {font-family: "Poppins", sans-serif}
+			body,
-			body {font-size: 16px;}
+			h1,
-			img {margin-bottom: -8px;}
+			h2,
-			.mySlides {display: none;}
+			h3,
+			h4,
+			h5 {
+				font-family: 'Poppins', sans-serif;
+			}
+			body {
+				font-size: 16px;
+			}
+			img {
+				margin-bottom: -8px;
+			}
+			.mySlides {
+				display: none;
+			}
 		</style>
-		<base target="_top">
+		<base target="_top" />
 	</head>
-	<body class="w3-content w3-black" style="max-width:1500px;">
+	<body class="w3-content w3-black" style="max-width: 1500px">
 		<!-- The App Section -->
 		<div class="w3-padding-64 w3-white">
 			<div class="w3-row-padding">
@@ -25,20 +38,34 @@
 					<h1 class="w3-jumbo">
 						<b>😎 Tilde Friends</b>
 					</h1>
-					<h1 class="w3-xxlarge w3-text-green"><b>Make apps and friends from the comfort of your web browser.</b></h1>
+					<h1 class="w3-xxlarge w3-text-green">
-					<p>Tilde Friends is a platform for building, running, and sharing web applications.</p>
+						<b>Make apps and friends from the comfort of your web browser.</b>
-					<p>Available for lots of devices:
+					</h1>
+					<p>
+						Tilde Friends is a platform for building, running, and sharing web
+						applications.
+					</p>
+					<p>
+						Available for lots of devices:
 						<i class="fa-brands fa-linux w3-xlarge"></i>
 						<i class="fa-brands fa-android w3-xlarge"></i>
 						<i class="fa-brands fa-apple w3-xlarge"></i>
 						<i class="fa fa-mobile-screen w3-xlarge"></i>
 						<i class="fa-brands fa-windows w3-xlarge"></i>
 					</p>
-					<a class="w3-button w3-black w3-padding-large" href="https://www.tildefriends.net/~cory/releases/"><i class="fa fa-download"></i> Download</a>
+					<a
-					<a class="w3-button w3-black w3-padding-large" href="https://www.tildefriends.net/~cory/apps/"><i class="fa fa-link"></i> Try Some Apps</a>
+						class="w3-button w3-black w3-padding-large"
+						href="https://www.tildefriends.net/~cory/releases/"
+						><i class="fa fa-download"></i> Download</a
+					>
+					<a
+						class="w3-button w3-black w3-padding-large"
+						href="https://www.tildefriends.net/~cory/apps/"
+						><i class="fa fa-link"></i> Try It</a
+					>
 				</div>
 				<div class="w3-col l4 m6">
-					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small">
+					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small" />
 				</div>
 			</div>
 		</div>
@@ -47,19 +74,28 @@
 		<div class="w3-light-grey">
 			<div class="w3-row-padding w3-padding-64">
 				<div class="w3-col l4 m6 s4">
-					<a href="https://scuttlebutt.nz/"><img class="w3-image w3-round-large" src="ssb.png" alt="Secure Scuttlebutt"></a>
+					<a href="https://scuttlebutt.nz/"
+						><img
+							class="w3-image w3-round-large"
+							src="ssb.png"
+							alt="Secure Scuttlebutt"
+					/></a>
 				</div>
 				<div class="w3-col l8 m6" style="height: auto">
 					<h1 class="w3-jumbo"><b>Built for Sharing</b></h1>
 					<p>
-						Tilde Friends participates in the <a href="https://scuttlebutt.nz/">Secure Scuttlebutt</a> distributed social network.
+						Tilde Friends participates in the
+						<a href="https://scuttlebutt.nz/">Secure Scuttlebutt</a> distributed
+						social network.
 					</p>
 					<p>
-						Share apps with friends.  Discover new apps made by enemies.  Post pictures of your coffee.  Or just lurk.
+						Share apps with friends. Discover new apps made by enemies. Post
+						pictures of your coffee. Or just lurk.
 					</p>
 					<p>
-						The social network integration provides tools for connecting with other people world-wide
+						The social network integration provides tools for connecting with
-						while still allowing apps and everything to operate offline.
+						other people world-wide while still allowing apps and everything to
+						operate offline.
 					</p>
 				</div>
 			</div>
@@ -70,14 +106,16 @@
 			<div class="w3-row-padding">
 				<div class="w3-col l8 m6">
 					<h1 class="w3-jumbo"><b>Edit Anything</b></h1>
-					<i class="fa fa-pen-to-square w3-left w3-jumbo w3-text-gray" style="padding: 32px"></i>
+					<i
+						class="fa fa-pen-to-square w3-left w3-jumbo w3-text-gray"
+						style="padding: 32px"
+					></i>
 					<p>
-						See that <code><b>edit</b></code> link near the top left corner of this page?  It's there for
+						See that <code><b>edit</b></code> link near the top left corner of
-						every Tilde Friends app, so you can modify and see your changes right away.
+						this page? It's there for every Tilde Friends app, so you can modify
-					</p>
+						and see your changes right away.
-					<p>
-						It's kind of like a wiki, but for code!
 					</p>
+					<p>It's kind of like a wiki, but for code!</p>
 				</div>
 			</div>
 		</div>
@@ -86,16 +124,22 @@
 		<div class="w3-padding-64 w3-grey">
 			<div class="w3-row-padding">
 				<div class="w3-col">
-					<h1 class="w3-jumbo" style="text-align: right"><b>Sandbox Security</b></h1>
+					<h1 class="w3-jumbo" style="text-align: right">
-					<i class="fa fa-road-barrier w3-right w3-jumbo w3-text-yellow" style="padding: 32px"></i>
+						<b>Sandbox Security</b>
+					</h1>
+					<i
+						class="fa fa-road-barrier w3-right w3-jumbo w3-text-yellow"
+						style="padding: 32px"
+					></i>
 					<p>
-						Tilde Friends tries to make sure apps can be trusted using similar techniques to how web
+						Tilde Friends tries to make sure apps can be trusted using similar
-						browsers and operating systems do it.
+						techniques to how web browsers and operating systems do it.
 					</p>
 					<p>
-						This is all a work in progress, and it varies by platform, so don't give it all your
+						This is all a work in progress, and it varies by platform, so don't
-						innermost secrets yet, but do kick its tires and
+						give it all your innermost secrets yet, but do kick its tires and
-						<a href="mailto:cory@tildefriends.net">share</a> any surprises you find.
+						<a href="mailto:cory@tildefriends.net">share</a> any surprises you
+						find.
 					</p>
 				</div>
 			</div>
@@ -105,10 +149,16 @@
 		<div class="w3-container w3-padding-64 w3-light-grey w3-center">
 			<h1 class="w3-jumbo"><b>Trusted Technology</b></h1>
 			<p>Tilde Friends is built using boring, trusted tech.</p>
-			<p>Though of course for building Tilde Friends apps, you are free to use whatever fits.</p>
+			<p>
+				Though of course for building Tilde Friends apps, you are free to use
+				whatever fits.
+			</p>
 
 			<div class="w3-row" style="margin-top: 64px">
-				<a href="https://en.wikipedia.org/wiki/C_(programming_language)" class="w3-col s3">
+				<a
+					href="https://en.wikipedia.org/wiki/C_(programming_language)"
+					class="w3-col s3"
+				>
 					<i class="fa fa-c w3-text-blue w3-jumbo"></i>
 					<p>C</p>
 				</a>
@@ -120,7 +170,7 @@
 					<i class="fa fa-database w3-text-red w3-jumbo"></i>
 					<p>SQLite</p>
 				</a>
-				<a href="https://libuv.org/" class="w3-col s3">
+				<a href="https://github.com/libuv/libuv" class="w3-col s3">
 					<i class="fa fa-bolt w3-text-yellow w3-jumbo"></i>
 					<p>libuv</p>
 				</a>
@@ -139,7 +189,10 @@
 					<i class="fa fa-shield-halved w3-text-green w3-jumbo"></i>
 					<p>OpenSSL</p>
 				</a>
-				<a href="https://github.com/ianlancetaylor/libbacktrace" class="w3-col s3">
+				<a
+					href="https://github.com/ianlancetaylor/libbacktrace"
+					class="w3-col s3"
+				>
 					<i class="fa fa-burst w3-text-pink w3-jumbo"></i>
 					<p>libbacktrace</p>
 				</a>
@@ -150,11 +203,11 @@
 					<i class="fa fa-keyboard w3-text-indigo w3-jumbo"></i>
 					<p>CodeMirror</p>
 				</a>
-				<a href="https://speedscope.app/" class="w3-col s3">
+				<a href="https://github.com/jlfwong/speedscope/" class="w3-col s3">
 					<i class="fa fa-microscope w3-text-orange w3-jumbo"></i>
 					<p>Speedscope</p>
 				</a>
-				<a href="https://lit.dev/" class="w3-col s3">
+				<a href="https://github.com/lit/lit/" class="w3-col s3">
 					<i class="fa fa-fire w3-text-cyan w3-jumbo"></i>
 					<p>Lit</p>
 				</a>
@@ -167,7 +220,10 @@
 
 		<!-- Footer -->
 		<footer class="w3-container w3-padding-32 w3-blue-grey w3-center w3-xlarge">
-			<p class="w3-medium">This page and Tilde Friends itself was made by Cory mostly in coffee shops and a local pizza place.</p>
+			<p class="w3-medium">
+				This page and Tilde Friends itself was made by Cory mostly in coffee
+				shops and a local pizza place.
+			</p>
 		</footer>
 	</body>
 </html>

apps/wiki.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-  "previous": "&JHopifgZn2TsiMCQY8HUTlDqHEDDviiu2ifvr8HHNwo=.sha256"
+	"previous": "&/wl8HE2jZShRXTYEVYRrK3pjHwi41Wbxl9HoSJaQP6Y=.sha256"
 }

apps/wiki/handler.js

@@ -10,10 +10,15 @@ function markdown(md) {
 	while ((event = walker.next())) {
 		let node = event.node;
 		if (event.entering) {
-			if (node.type === 'link') {
+			if (node.destination?.startsWith('&')) {
-				if (node.destination.indexOf(':') == -1 &&
+				node.destination =
-					node.destination.indexOf('/') == -1) {
+					'/' + node.destination + '/view?filename=' + node.firstChild?.literal;
-					node.destination = `#${this.wiki?.name}/${node.destination}`;
+			} else if (node.type === 'link') {
+				if (
+					node.destination.indexOf(':') == -1 &&
+					node.destination.indexOf('/') == -1
+				) {
+					node.destination = `${node.destination}`;
 				}
 			}
 		}
@@ -27,7 +32,9 @@ async function main() {
 		let wiki_name = request.path.substring(0, slash);
 		let wiki_doc_name = request.path.substring(slash + 1);
 
-		let ids = Object.keys(await ssb.following(await ssb.getOwnerIdentities(), 1));
+		let ids = Object.keys(
+			await ssb.following(await ssb.getOwnerIdentities(), 1)
+		);
 		let [max_row_id, wikis] = await utils.collection(ids, 'wiki', null, -1, {});
 		let wiki;
 		for (let w of Object.values(wikis)) {
@@ -38,7 +45,13 @@ async function main() {
 		}
 		let wiki_doc;
 		if (wiki) {
-			let [max_row_id, wiki_docs] = await utils.collection(ids, 'wiki-doc', wiki.id, -1, {});
+			let [max_row_id, wiki_docs] = await utils.collection(
+				ids,
+				'wiki-doc',
+				wiki.id,
+				-1,
+				{}
+			);
 			for (let w of Object.values(wiki_docs)) {
 				if (w.name === wiki_doc_name && !w.tombstone) {
 					wiki_doc = w;
@@ -57,7 +70,7 @@ async function main() {
 				<h1>${wiki_name}: ${wiki_doc_name}</h1>
 				<div>${markdown(md)}</div>
 			`,
-			content_type: 'text/html',
+			content_type: 'text/html; charset=utf-8',
 			status_code: 200,
 		});
 	} else {

apps/wiki/index.html

@@ -1,11 +1,13 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
-		<base target="_top">
+		<base target="_top" />
 	</head>
 	<body style="color: #fff">
 		<tf-collections-app></tf-collections-app>
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script src="tf-collection.js" type="module"></script>
 		<script src="tf-id-picker.js" type="module"></script>
 		<script src="tf-wiki-doc.js" type="module"></script>

apps/wiki/tf-collection.js

@@ -14,52 +14,62 @@ class TfCollectionElement extends LitElement {
 
 	on_create(event) {
 		let name = this.shadowRoot.getElementById('create_name').value;
-		this.dispatchEvent(new CustomEvent('create', {
+		this.dispatchEvent(
+			new CustomEvent('create', {
 				bubbles: true,
 				detail: {
 					name: name,
 				},
-		}));
+			})
+		);
 		this.is_creating = false;
 	}
 
 	on_rename(event) {
 		let id = this.shadowRoot.getElementById('select').value;
 		let name = this.shadowRoot.getElementById('rename_name').value;
-		this.dispatchEvent(new CustomEvent('rename', {
+		this.dispatchEvent(
+			new CustomEvent('rename', {
 				bubbles: true,
 				detail: {
 					id: id,
 					value: this.collection[id],
 					name: name,
 				},
-		}));
+			})
+		);
 		this.is_renaming = false;
 	}
 
 	on_tombstone(event) {
 		let id = this.shadowRoot.getElementById('select').value;
-		if (confirm(`Are you sure you want to delete '${this.collection[id].name}'?`)) {
+		if (
-			this.dispatchEvent(new CustomEvent('tombstone', {
+			confirm(`Are you sure you want to delete '${this.collection[id].name}'?`)
+		) {
+			this.dispatchEvent(
+				new CustomEvent('tombstone', {
 					bubbles: true,
 					detail: {
 						id: id,
 						value: this.collection[id],
 					},
-			}));
+				})
+			);
 		}
 	}
 
 	on_selected(event) {
 		let id = event.srcElement.value;
 		this.selected_id = id != '' ? id : undefined;
-		this.dispatchEvent(new CustomEvent('change', {
+		this.dispatchEvent(
+			new CustomEvent('change', {
 				bubbles: true,
 				detail: {
 					id: id,
 					value: this.collection[id],
 				},
-		}));
+			})
+		);
 	}
 
 	render() {
@@ -68,25 +78,35 @@ class TfCollectionElement extends LitElement {
 			<span style="display: inline-flex; flex-direction: row">
 				<select @change=${this.on_selected} id="select" value=${this.selected_id}>
 					<option value="" ?selected=${this.selected_id === ''} disabled hidden>(select)</option>
-					${Object.values(this.collection ?? {}).sort((x, y) => x.name.localeCompare(y.name)).map(x => html`<option value=${x.id} ?selected=${this.selected_id === x.id}>${x.name}</option>`)}
+					${Object.values(this.collection ?? {})
+						.sort((x, y) => x.name.localeCompare(y.name))
+						.map(
+							(x) =>
+								html`<option
+									value=${x.id}
+									?selected=${this.selected_id === x.id}
+								>
+									${x.name}
+								</option>`
+						)}
 				</select>
 				<span ?hidden=${!this.is_renaming || !this.whoami}>
 					<span style="display: inline-flex; flex-direction: row; margin-left: 8px; margin-right: 8px">
 						<label for="rename_name">🏷Rename to:</label>
 						<input type="text" id="rename_name"></input>
 						<button @click=${this.on_rename}>Rename ${this.type}</button>
-						<button @click=${() => self.is_renaming = false}>x</button>
+						<button @click=${() => (self.is_renaming = false)}>x</button>
 					</span>
 				</span>
-				<button @click=${() => self.is_renaming = true} ?disabled=${this.is_renaming || !this.selected_id} ?hidden=${!this.whoami}>🏷</button>
+				<button @click=${() => (self.is_renaming = true)} ?disabled=${this.is_renaming || !this.selected_id} ?hidden=${!this.whoami}>🏷</button>
 				<button @click=${self.on_tombstone} ?disabled=${!this.selected_id} ?hidden=${!this.whoami}>🪦</button>
 				<span ?hidden=${!this.is_creating || !this.whoami}>
 					<label for="create_name">New ${this.type} name:</label>
 					<input type="text" id="create_name"></input>
 					<button @click=${this.on_create}>Create ${this.type}</button>
-					<button @click=${() => self.is_creating = false}>x</button>
+					<button @click=${() => (self.is_creating = false)}>x</button>
 				</span>
-				<button @click=${() => self.is_creating = true} ?hidden=${this.is_creating || !this.whoami}>+</button>
+				<button @click=${() => (self.is_creating = true)} ?hidden=${this.is_creating || !this.whoami}>+</button>
 			</span>
 		`;
 	}

apps/wiki/tf-id-picker.js

@@ -19,15 +19,22 @@ class TfIdentityPickerElement extends LitElement {
 
 	changed(event) {
 		this.selected = event.srcElement.value;
-		this.dispatchEvent(new Event('change', {
+		this.dispatchEvent(
+			new Event('change', {
 				srcElement: this,
-		}));
+			})
+		);
 	}
 
 	render() {
 		return html`
 			<select @change=${this.changed} style="max-width: 100%">
-				${(this.ids ?? []).map(id => html`<option ?selected=${id == this.selected} value=${id}>${id}</option>`)}
+				${(this.ids ?? []).map(
+					(id) =>
+						html`<option ?selected=${id == this.selected} value=${id}>
+							${id}
+						</option>`
+				)}
 			</select>
 		`;
 	}

apps/wiki/tf-wiki-app.js

@@ -31,7 +31,7 @@ class TfCollectionsAppElement extends LitElement {
 		tfrpc.register(function hash_changed(hash) {
 			self.notify_hash_changed(hash);
 		});
-		tfrpc.rpc.get_hash().then(hash => self.notify_hash_changed(hash));
+		tfrpc.rpc.get_hash().then((hash) => self.notify_hash_changed(hash));
 	}
 
 	async load() {
@@ -49,10 +49,16 @@ class TfCollectionsAppElement extends LitElement {
 		let max_rowid;
 		let wikis;
 		let start_whoami = this.whoami;
-		while (true)
+		while (true) {
-		{
 			console.log('read_wikis', this.whoami);
-			[max_rowid, wikis] = await tfrpc.rpc.collection(this.following, 'wiki', undefined, max_rowid, wikis, false);
+			[max_rowid, wikis] = await tfrpc.rpc.collection(
+				this.following,
+				'wiki',
+				undefined,
+				max_rowid,
+				wikis,
+				false
+			);
 			console.log('read ->', wikis);
 			if (this.whoami !== start_whoami) {
 				break;
@@ -70,9 +76,14 @@ class TfCollectionsAppElement extends LitElement {
 		let start_id = this.wiki.id;
 		let max_rowid;
 		let wiki_docs;
-		while (true)
+		while (true) {
-		{
+			[max_rowid, wiki_docs] = await tfrpc.rpc.collection(
-			[max_rowid, wiki_docs] = await tfrpc.rpc.collection(this.wiki?.editors, 'wiki-doc', this.wiki?.id, max_rowid, wiki_docs);
+				this.wiki?.editors,
+				'wiki-doc',
+				this.wiki?.id,
+				max_rowid,
+				wiki_docs
+			);
 			if (this.wiki?.id !== start_id) {
 				break;
 			}
@@ -128,7 +139,11 @@ class TfCollectionsAppElement extends LitElement {
 	}
 
 	update_hash() {
-		tfrpc.rpc.set_hash(this.wiki_doc ? `${this.wiki.name}/${this.wiki_doc.name}` : `${this.wiki.name}`);
+		tfrpc.rpc.set_hash(
+			this.wiki_doc
+				? `${this.wiki.name}/${this.wiki_doc.name}`
+				: `${this.wiki.name}`
+		);
 	}
 
 	async on_wiki_changed(event) {
@@ -174,7 +189,7 @@ class TfCollectionsAppElement extends LitElement {
 		if (confirm(`Are you sure you want to remove ${id} as an editor?`)) {
 			let editors = [...this.wiki.editors];
 			if (editors.indexOf(id) != -1) {
-				editors = editors.filter(x => x !== id);
+				editors = editors.filter((x) => x !== id);
 			}
 			await tfrpc.rpc.appendMessage(this.whoami, {
 				type: 'wiki',
@@ -252,34 +267,45 @@ class TfCollectionsAppElement extends LitElement {
 				<tf-id-picker .ids=${this.ids} selected=${this.whoami} @change=${this.on_whoami_changed} ?hidden=${!this.ids?.length}></tf-id-picker>
 			</div>
 			<div>
-				${keyed(this.whoami, html`<tf-collection
+				${keyed(
+					this.whoami,
+					html`<tf-collection
 						.collection=${this.wikis}
 						whoami=${this.whoami}
 						selected_id=${this.wiki?.id}
 						@create=${this.on_wiki_create}
 						@rename=${this.on_wiki_rename}
 						@tombstone=${this.on_wiki_tombstone}
-					@change=${this.on_wiki_changed}></tf-collection>`)}
+						@change=${this.on_wiki_changed}
-				${keyed(this.wiki_doc?.id, html`<tf-collection
+					></tf-collection>`
+				)}
+				${keyed(
+					this.wiki_doc?.id,
+					html`<tf-collection
 						.collection=${this.wiki_docs}
 						whoami=${this.whoami}
-					selected_id=${(this.wiki_doc && this.wiki_doc?.parent == this.wiki?.id) ? this.wiki_doc?.id : ''}
+						selected_id=${this.wiki_doc &&
+						this.wiki_doc?.parent == this.wiki?.id
+							? this.wiki_doc?.id
+							: ''}
 						@create=${this.on_wiki_doc_create}
 						@rename=${this.on_wiki_doc_rename}
 						@tombstone=${this.on_wiki_doc_tombstone}
-					@change=${this.on_wiki_doc_changed}></tf-collection>`)}
+						@change=${this.on_wiki_doc_changed}
-				<button @click=${() => self.expand_editors = !self.expand_editors}>${this.wiki?.editors?.length} editor${this.wiki?.editors?.length > 1 ? 's' : ''}</button>
+					></tf-collection>`
+				)}
+				<button @click=${() => (self.expand_editors = !self.expand_editors)}>${this.wiki?.editors?.length} editor${this.wiki?.editors?.length > 1 ? 's' : ''}</button>
 				<div ?hidden=${!this.wiki?.editors || !this.expand_editors}>
 					<div>
 						<ul>
-							${this.wiki?.editors.map(id => html`<li><button ?hidden=${id == this.whoami} @click=${() => self.on_remove_editor(id)}>x</button> ${id}</li>`)}
+							${this.wiki?.editors.map((id) => html`<li><button ?hidden=${id == this.whoami} @click=${() => self.on_remove_editor(id)}>x</button> ${id}</li>`)}
 							<li>
-								<button @click=${() => self.adding_editor = true} ?hidden=${this.wiki?.editors?.indexOf(this.whoami) == -1 || this.adding_editor}>+</button>
+								<button @click=${() => (self.adding_editor = true)} ?hidden=${this.wiki?.editors?.indexOf(this.whoami) == -1 || this.adding_editor}>+</button>
 								<div ?hidden=${!this.adding_editor}>
 									<label for="add_editor">Add Editor:</label>
 									<input type="text" id="add_editor"></input>
 									<button @click=${this.on_add_editor}>Add Editor</button>
-									<button @click=${() => self.adding_editor = false}>x</button>
+									<button @click=${() => (self.adding_editor = false)}>x</button>
 								</div>
 							</li>
 						</ul>
@@ -288,21 +314,53 @@ class TfCollectionsAppElement extends LitElement {
 			</div>
 			<div style="display: flex; flex-direction: row">
 				<div style="flex: 0 0">
-					${Object.values(this.wikis || {}).sort((x, y) => x.name.localeCompare(y.name)).map(wiki => html`
+					${Object.values(this.wikis || {})
-						<div class="toc ${self.wiki?.id === wiki.id ? 'selected' : ''}" style="white-space: nowrap; cursor: pointer" @click=${() => self.on_wiki_changed({detail: {value: wiki}})}>${wiki.name}</div>
+						.sort((x, y) => x.name.localeCompare(y.name))
-						<ul>
+						.map(
-							${Object.values(self.wiki_docs || {}).filter(doc => doc.parent === wiki?.id).sort((x, y) => x.name.localeCompare(y.name)).map(doc => html`
+							(wiki) => html`
-								<li class="toc ${self.wiki_doc?.id === doc.id ? 'selected' : ''}" style="white-space: nowrap; cursor: pointer" @click=${() => self.on_wiki_doc_changed({detail: {value: doc}})}>${doc.name}</li>
+								<div
-							`)}
+									class="toc ${self.wiki?.id === wiki.id ? 'selected' : ''}"
-						</ul>
+									style="white-space: nowrap; cursor: pointer"
-					`)}
+									@click=${() => self.on_wiki_changed({detail: {value: wiki}})}
+								>
+									${wiki.name}
 								</div>
-				${this.wiki_doc && this.wiki_doc.parent === this.wiki?.id ? html`
+								<ul>
+									${Object.values(self.wiki_docs || {})
+										.filter((doc) => doc.parent === wiki?.id)
+										.sort((x, y) => x.name.localeCompare(y.name))
+										.map(
+											(doc) => html`
+												<li
+													class="toc ${self.wiki_doc?.id === doc.id
+														? 'selected'
+														: ''}"
+													style="white-space: nowrap; cursor: pointer; list-style: none; text-indent: -1rem"
+													@click=${() =>
+														self.on_wiki_doc_changed({
+															detail: {value: doc},
+														})}
+												>
+													${doc?.private ? '🔒' : '📄'} ${doc.name}
+												</li>
+											`
+										)}
+								</ul>
+							`
+						)}
+				</div>
+				${
+					this.wiki_doc && this.wiki_doc.parent === this.wiki?.id
+						? html`
 								<tf-wiki-doc
+									style="width: 100%"
 									whoami=${this.whoami}
 									.wiki=${this.wiki}
-						.value=${this.wiki_doc}></tf-wiki-doc>
+									.value=${this.wiki_doc}
-				` : undefined}
+								></tf-wiki-doc>
+							`
+						: undefined
+				}
 			</div>
 		`;
 	}

apps/wiki/tf-wiki-doc.js

@@ -28,15 +28,19 @@ class TfWikiDocElement extends LitElement {
 		while ((event = walker.next())) {
 			let node = event.node;
 			if (event.entering) {
-				if (node.type === 'link') {
+				if (node.destination?.startsWith('&')) {
-					if (node.destination.indexOf(':') == -1 &&
+					node.destination =
-						node.destination.indexOf('/') == -1) {
+						'/' +
+						node.destination +
+						'/view?filename=' +
+						node.firstChild?.literal;
+				} else if (node.type === 'link') {
+					if (
+						node.destination.indexOf(':') == -1 &&
+						node.destination.indexOf('/') == -1
+					) {
 						node.destination = `#${this.wiki?.name}/${node.destination}`;
 					}
-				} else if (node.type == 'image') {
-					if (node.destination.startsWith('&')) {
-						node.destination = '/' + node.destination + '/view';
-					}
 				}
 			}
 		}
@@ -72,9 +76,9 @@ class TfWikiDocElement extends LitElement {
 	}
 
 	thumbnail(md) {
-		//let m = md ? md.match(/\!\[image:[^\]]+]\((\&.{44}\.sha256)\)/) : undefined;
+		let m = md
-		let m = md ? md.match(/.*\((\&.{44}\.sha256)\).*/) : undefined;
+			? md.match(/\!\[image:[^\]]+\]\((\&.{44}\.sha256)\).*/)
-		console.log('thumb', m);
+			: undefined;
 		return m ? m[1] : undefined;
 	}
 
@@ -110,12 +114,16 @@ class TfWikiDocElement extends LitElement {
 			key: this.value.id,
 			parent: this.value.parent,
 			blob: id,
-			mentions: this.blob.match(/(&.{44}.sha256)/g)?.map(x => ({link: x})),
+			mentions: this.blob.match(/(&.{44}.sha256)/g)?.map((x) => ({link: x})),
 			private: this.value?.private,
 		};
 		if (draft) {
 			message.recps = this.value.editors;
-			message = await tfrpc.rpc.encrypt(this.whoami, this.value.editors, JSON.stringify(message));
+			message = await tfrpc.rpc.encrypt(
+				this.whoami,
+				this.value.editors,
+				JSON.stringify(message)
+			);
 		}
 		await tfrpc.rpc.appendMessage(this.whoami, message);
 		this.is_editing = false;
@@ -140,7 +148,7 @@ class TfWikiDocElement extends LitElement {
 			summary: this.summary(blob),
 			thumbnail: this.thumbnail(blob),
 			blog: id,
-			mentions: this.blob.match(/(&.{44}.sha256)/g)?.map(x => ({link: x})),
+			mentions: this.blob.match(/(&.{44}.sha256)/g)?.map((x) => ({link: x})),
 		};
 		await tfrpc.rpc.appendMessage(this.whoami, message);
 		this.is_editing = false;
@@ -159,28 +167,47 @@ class TfWikiDocElement extends LitElement {
 				let context = canvas.getContext('2d');
 				context.drawImage(img, 0, 0, canvas.width, canvas.height);
 				let data_url = canvas.toDataURL(mime_type);
-				let result = atob(data_url.split(',')[1]).split('').map(x => x.charCodeAt(0));
+				let result = atob(data_url.split(',')[1])
+					.split('')
+					.map((x) => x.charCodeAt(0));
 				resolve(result);
 			};
 			img.onerror = function (event) {
 				reject(new Error('Failed to load image.'));
 			};
-			let raw = Array.from(new Uint8Array(buffer)).map(b => String.fromCharCode(b)).join('');
+			let raw = Array.from(new Uint8Array(buffer))
+				.map((b) => String.fromCharCode(b))
+				.join('');
 			let original = `data:${type};base64,${btoa(raw)}`;
 			img.src = original;
 		});
 	}
 
+	humanSize(value) {
+		let units = ['B', 'kB', 'MB', 'GB'];
+		let i = 0;
+		while (i < units.length - 1 && value >= 1024) {
+			value /= 1024;
+			i++;
+		}
+		return `${Math.round(value * 10) / 10} ${units[i]}`;
+	}
+
 	async add_file(editor, file) {
 		try {
 			let self = this;
 			let buffer = await file.arrayBuffer();
 			let type = file.type;
+			let insert;
 			if (type.startsWith('image/')) {
 				let best_buffer;
 				let best_type;
 				for (let format of ['image/png', 'image/jpeg', 'image/webp']) {
-					let test_buffer = await self.convert_to_format(buffer, file.type, format);
+					let test_buffer = await self.convert_to_format(
+						buffer,
+						file.type,
+						format
+					);
 					if (!best_buffer || test_buffer.length < best_buffer.length) {
 						best_buffer = test_buffer;
 						best_type = format;
@@ -188,12 +215,16 @@ class TfWikiDocElement extends LitElement {
 				}
 				buffer = best_buffer;
 				type = best_type;
-			} else {
-				buffer = Array.from(new Uint8Array(buffer));
-			}
 				let id = await tfrpc.rpc.store_blob(buffer);
 				let name = type.split('/')[0] + ':' + file.name;
-			editor.value += `\n![${name}](${id})`;
+				insert = `\n![${name}](${id})`;
+			} else {
+				buffer = Array.from(new Uint8Array(buffer));
+				let id = await tfrpc.rpc.store_blob(buffer);
+				let name = file.name;
+				insert = `\n[${name}](${id}) (${this.humanSize(buffer.length)})`;
+			}
+			document.execCommand('insertText', false, insert);
 			self.on_edit({srcElement: editor});
 		} catch (e) {
 			alert(e?.message);
@@ -203,13 +234,10 @@ class TfWikiDocElement extends LitElement {
 	paste(event) {
 		let self = this;
 		for (let item of event.clipboardData.items) {
-			if (item.type?.startsWith('image/')) {
 			let file = item.getAsFile();
-				if (!file) {
+			if (file) {
-					continue;
-				}
 				self.add_file(event.srcElement, file);
-				break;
+				event.preventDefault();
 			}
 		}
 	}
@@ -225,26 +253,85 @@ class TfWikiDocElement extends LitElement {
 		let self = this;
 		let thumbnail_ref = this.thumbnail(this.blob);
 		return html`
+			<style>
+				a:link {
+					color: #268bd2;
+				}
+				a:visited {
+					color: #6c71c4;
+				}
+				a:hover {
+					color: #859900;
+				}
+				a:active {
+					color: #2aa198;
+				}
+			</style>
 			<div style="display: inline-flex; flex-direction: row">
-				<button ?disabled=${!this.whoami || this.is_editing} @click=${() => self.is_editing = true}>Edit</button>
+				<button
-				<button ?disabled=${this.blob == this.blob_original} @click=${this.on_save_draft}>Save Draft</button>
+					?disabled=${!this.whoami || this.is_editing}
-				<button ?disabled=${this.blob == this.blob_original && !this.value?.draft} @click=${this.on_publish}>Publish</button>
+					@click=${() => (self.is_editing = true)}
-				<button ?disabled=${!this.is_editing} @click=${this.on_discard}>Discard</button>
+				>
-				<button ?disabled=${!this.is_editing} @click=${() => self.value = Object.assign({}, self.value, {private: !self.value.private})}>${this.value?.private ? 'Make Public' : 'Make Private'}</button>
+					Edit
-				<button ?disabled=${!this.is_editing} @click=${this.on_blog_publish}>Publish Blog</button>
+				</button>
+				<button
+					?disabled=${this.blob == this.blob_original}
+					@click=${this.on_save_draft}
+				>
+					Save Draft
+				</button>
+				<button
+					?disabled=${this.blob == this.blob_original && !this.value?.draft}
+					@click=${this.on_publish}
+				>
+					Publish
+				</button>
+				<button ?disabled=${!this.is_editing} @click=${this.on_discard}>
+					Discard
+				</button>
+				<button
+					?disabled=${!this.is_editing}
+					@click=${() =>
+						(self.value = Object.assign({}, self.value, {
+							private: !self.value.private,
+						}))}
+				>
+					${this.value?.private ? 'Make Public' : 'Make Private'}
+				</button>
+				<button ?disabled=${!this.is_editing} @click=${this.on_blog_publish}>
+					Publish Blog
+				</button>
 			</div>
-			<div ?hidden=${!this.value?.private} style="color: #800">🔒 document is private</div>
+			<div ?hidden=${!this.value?.private} style="color: #800">
-			<div style="display: flex; flex-direction: row; ${this.value?.private ? 'border-top: 4px solid #800' : ''}">
+				🔒 document is private
+			</div>
+			<div
+				style="display: flex; flex-direction: row; ${this.value?.private
+					? 'border-top: 4px solid #800'
+					: ''}"
+			>
 				<textarea
 					?hidden=${!this.is_editing}
-					style="flex: 1 1; min-height: 10em; ${this.value?.private ? 'border: 4px solid #800' : ''}"
+					style="flex: 1 1; min-height: 10em; ${this.value?.private
+						? 'border: 4px solid #800'
+						: ''}"
 					@input=${this.on_edit}
 					@paste=${this.paste}
-					.value=${this.blob ?? ''}></textarea>
+					.value=${this.blob ?? ''}
+				></textarea>
 				<div style="flex: 1 1">
-					<div ?hidden=${!this.is_editing} style="border: 1px solid #fff; border-radius: 1em; padding: 0.5em">
+					<div
-						<img ?hidden=${!thumbnail_ref} style="max-width: 128px; max-height: 128px; float: right" src="/${thumbnail_ref}/view">
+						?hidden=${!this.is_editing}
-						<h1 ?hidden=${!this.title(this.blob)}>${unsafeHTML(this.markdown(this.title(this.blob)))}</h1>
+						style="border: 1px solid #fff; border-radius: 1em; padding: 0.5em"
+					>
+						<img
+							?hidden=${!thumbnail_ref}
+							style="max-width: 128px; max-height: 128px; float: right"
+							src="/${thumbnail_ref}/view"
+						/>
+						<h1 ?hidden=${!this.title(this.blob)}>
+							${unsafeHTML(this.markdown(this.title(this.blob)))}
+						</h1>
 						${unsafeHTML(this.markdown(this.summary(this.blob)))}
 					</div>
 					${unsafeHTML(this.markdown(this.blob))}

apps/wiki/utils.js

@@ -2,7 +2,7 @@ async function process_message(whoami, collection, message, kind, parent) {
 	let content = JSON.parse(message.content);
 	if (typeof content == 'string') {
 		let x;
-		for (let id of (whoami || [])) {
+		for (let id of whoami || []) {
 			x = await ssb.privateMessageDecrypt(id, content);
 			if (x) {
 				try {
@@ -17,8 +17,7 @@ async function process_message(whoami, collection, message, kind, parent) {
 		if (!x) {
 			return;
 		}
-		if (content.type !== kind ||
+		if (content.type !== kind || (parent && content.parent !== parent)) {
-			(parent && content.parent !== parent)) {
 			return;
 		}
 	} else {
@@ -28,7 +27,10 @@ async function process_message(whoami, collection, message, kind, parent) {
 		if (content?.tombstone) {
 			delete collection[content.key];
 		} else {
-			collection[content.key] = Object.assign(collection[content.key] || {}, content);
+			collection[content.key] = Object.assign(
+				collection[content.key] || {},
+				content
+			);
 		}
 	} else {
 		collection[message.id] = Object.assign(content, {id: message.id});
@@ -58,26 +60,42 @@ ssb.addEventListener('message', function(id) {
 	}
 });
 
-export async function collection(ids, kind, parent, max_rowid, data, include_private) {
+export async function collection(
+	ids,
+	kind,
+	parent,
+	max_rowid,
+	data,
+	include_private
+) {
 	let whoami = await ssb.getIdentities();
 	data = data ?? {};
 	let rowid = 0;
 	let first = true;
-	await ssb.sqlAsync('SELECT MAX(rowid) AS rowid FROM messages', [], function(row) {
+	await ssb.sqlAsync(
+		'SELECT MAX(rowid) AS rowid FROM messages',
+		[],
+		function (row) {
 			rowid = row.rowid;
-	});
+		}
+	);
 	while (true) {
 		if (rowid == max_rowid) {
 			await new_message();
-			await ssb.sqlAsync('SELECT MAX(rowid) AS rowid FROM messages', [], function(row) {
+			await ssb.sqlAsync(
+				'SELECT MAX(rowid) AS rowid FROM messages',
+				[],
+				function (row) {
 					rowid = row.rowid;
-			});
+				}
+			);
 			first = false;
 		}
 
 		let modified = false;
 		let rows = [];
-		await ssb.sqlAsync(`
+		await ssb.sqlAsync(
+			`
 				SELECT messages.id, author, content, timestamp
 				FROM messages
 				JOIN json_each(?1) AS id ON messages.author = id.value
@@ -88,9 +106,19 @@ export async function collection(ids, kind, parent, max_rowid, data, include_pri
 					(?5 IS NULL OR json_extract(messages.content, '$.parent') = ?5)) OR
 					(?6 AND content LIKE '"%'))
 				ORDER BY timestamp
-		`, [JSON.stringify(ids), max_rowid ?? -1, rowid, kind, parent, include_private ? true : false], function(row) {
+		`,
+			[
+				JSON.stringify(ids),
+				max_rowid ?? -1,
+				rowid,
+				kind,
+				parent,
+				include_private ? true : false,
+			],
+			function (row) {
 				rows.push(row);
-		});
+			}
+		);
 		max_rowid = rowid;
 		for (let row of rows) {
 			if (await process_message(whoami, data, row, kind, parent)) {

core/app.js

@@ -18,7 +18,7 @@ function App() {
 
 App.prototype.readOutput = function (callback) {
 	this._on_output = callback;
-}
+};
 
 App.prototype.makeFunction = function (api) {
 	let self = this;
@@ -41,12 +41,12 @@ App.prototype.makeFunction = function(api) {
 	};
 	Object.defineProperty(result, 'name', {value: api[0], writable: false});
 	return result;
-}
+};
 
 App.prototype.send = function (message) {
 	if (this._send_queue) {
 		if (this._on_output) {
-			this._send_queue.forEach(x => this._on_output(x));
+			this._send_queue.forEach((x) => this._on_output(x));
 			this._send_queue = null;
 		} else if (message) {
 			this._send_queue.push(message);
@@ -55,7 +55,7 @@ App.prototype.send = function(message) {
 	if (message && this._on_output) {
 		this._on_output(message);
 	}
-}
+};
 
 function socket(request, response, client) {
 	let process;
@@ -67,13 +67,10 @@ function socket(request, response, client) {
 		if (process && process.task) {
 			process.task.kill();
 		}
+		if (process) {
+			process.timeout = 0;
 		}
-
+	};
-	response.onError = async function(error) {
-		if (process && process.task) {
-			process.task.kill();
-		}
-	}
 
 	response.onMessage = async function (event) {
 		if (event.opCode == 0x1 || event.opCode == 0x2) {
@@ -81,28 +78,33 @@ function socket(request, response, client) {
 			try {
 				message = JSON.parse(event.data);
 			} catch (error) {
-				print("ERROR", error, event.data, event.data.length, event.opCode);
+				print('ERROR', error, event.data, event.data.length, event.opCode);
 				return;
 			}
-			if (message.action == "hello") {
+			if (message.action == 'hello') {
 				let packageOwner;
 				let packageName;
 				let blobId;
 				let match;
 				let parentApp;
-				if (match = /^\/([&%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(message.path)) {
+				if (
+					(match = /^\/([&%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(message.path))
+				) {
 					blobId = match[1];
-				} else if (match = /^\/\~([^\/]+)\/([^\/]+)\/$/.exec(message.path)) {
+				} else if ((match = /^\/\~([^\/]+)\/([^\/]+)\/$/.exec(message.path))) {
 					packageOwner = match[1];
 					packageName = match[2];
 					blobId = await new Database(packageOwner).get('path:' + packageName);
 					if (!blobId) {
-						response.send(JSON.stringify({
+						response.send(
+							JSON.stringify({
 								message: 'tfrpc',
-							method: "error",
+								method: 'error',
 								params: [message.path + ' not found'],
 								id: -1,
-						}), 0x1);
+							}),
+							0x1
+						);
 						return;
 					}
 					if (packageOwner != 'core') {
@@ -113,12 +115,15 @@ function socket(request, response, client) {
 						};
 					}
 				}
-				response.send(JSON.stringify({
+				response.send(
-					action: "session",
+					JSON.stringify({
+						action: 'session',
 						credentials: credentials,
 						parentApp: parentApp,
 						id: blobId,
-				}), 0x1);
+					}),
+					0x1
+				);
 
 				options.api = message.api || [];
 				options.credentials = credentials;
@@ -128,9 +133,16 @@ function socket(request, response, client) {
 				let sessionId = makeSessionId();
 				if (blobId) {
 					if (message.edit_only) {
-						response.send(JSON.stringify({action: 'ready', edit_only: true}), 0x1);
+						response.send(
+							JSON.stringify({action: 'ready', edit_only: true}),
+							0x1
+						);
 					} else {
-						process = await core.getSessionProcessBlob(blobId, sessionId, options);
+						process = await core.getSessionProcessBlob(
+							blobId,
+							sessionId,
+							options
+						);
 					}
 				}
 				if (process) {
@@ -153,14 +165,14 @@ function socket(request, response, client) {
 						again = false;
 					} else {
 						// Idle.  Ping them.
-						response.send("", 0x9);
+						response.send('', 0x9);
 						process.lastPing = now;
 					}
 
-					if (again) {
+					if (again && process.timeout) {
 						setTimeout(ping, process.timeout);
 					}
-				}
+				};
 
 				if (process && process.timeout > 0) {
 					setTimeout(ping, process.timeout);
@@ -200,13 +212,16 @@ function socket(request, response, client) {
 		if (process) {
 			process.lastActive = Date.now();
 		}
-	}
-
-	if (refresh) {
-		return {
-			'Set-Cookie': `session=${refresh.token}; path=/; Max-Age=${refresh.interval}; Secure; SameSite=Strict`,
 	};
+
+	response.upgrade(
+		100,
+		refresh
+			? {
+					'Set-Cookie': `session=${refresh.token}; path=/; Max-Age=${refresh.interval}; Secure; SameSite=Strict`,
 				}
+			: {}
+	);
 }
 
 export {socket, App};

core/auth.html

@@ -1,17 +1,19 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 	<head>
 		<title>Tilde Friends Sign-in</title>
-		<link type="text/css" rel="stylesheet" href="/static/style.css">
+		<link type="text/css" rel="stylesheet" href="/static/style.css" />
-		<link type="image/png" rel="shortcut icon" href="/static/favicon.png">
+		<link type="image/png" rel="shortcut icon" href="/static/favicon.png" />
-		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
 	</head>
 	<body>
 		<h1 style="text-align: center">Tilde Friends Sign-in</h1>
 		<tf-auth id="auth"></tf-auth>
-		<script>window.litDisableBundleWarning = true;</script>
+		<script>
+			window.litDisableBundleWarning = true;
+		</script>
 		<script type="module">
-			import {LitElement, html} from '/static/lit/lit-all.min.js';
+			import {LitElement, html} from '/lit/lit-all.min.js';
 			let g_data = $AUTH_DATA;
 			let app = document.getElementById('auth');
 			Object.assign(app, g_data);

core/auth.js

@@ -1,7 +1,7 @@
 import * as core from './core.js';
 import * as form from './form.js';
 
-let gDatabase = new Database("auth");
+let gDatabase = new Database('auth');
 
 const kRefreshInterval = 1 * 7 * 24 * 60 * 60 * 1000;
 
@@ -36,8 +36,20 @@ function makeJwt(payload) {
 		id = ssb.createIdentity(':auth');
 	}
 
-	let final_payload = b64url(base64Encode(JSON.stringify(Object.assign({}, payload, {exp: (new Date().valueOf()) + kRefreshInterval}))));
+	let final_payload = b64url(
-	let jwt = [b64url(base64Encode(JSON.stringify({alg: 'HS256', typ: 'JWT'}))), final_payload, b64url(ssb.hmacsha256sign(final_payload, ':auth', id))].join('.');
+		base64Encode(
+			JSON.stringify(
+				Object.assign({}, payload, {
+					exp: new Date().valueOf() + kRefreshInterval,
+				})
+			)
+		)
+	);
+	let jwt = [
+		b64url(base64Encode(JSON.stringify({alg: 'HS256', typ: 'JWT'}))),
+		final_payload,
+		b64url(ssb.hmacsha256sign(final_payload, ':auth', id)),
+	].join('.');
 	return jwt;
 }
 
@@ -45,13 +57,13 @@ function readSession(session) {
 	let jwt_parts = session?.split('.');
 	if (jwt_parts?.length === 3) {
 		let [header, payload, signature] = jwt_parts;
-		header = JSON.parse(base64Decode(unb64url(header)));
+		header = JSON.parse(utf8Decode(base64Decode(unb64url(header))));
 		if (header.typ === 'JWT' && header.alg === 'HS256') {
 			signature = unb64url(signature);
 			let id = ssb.getIdentities(':auth');
 			if (id?.length && ssb.hmacsha256verify(id[0], payload, signature)) {
-				let result = JSON.parse(base64Decode(unb64url(payload)));
+				let result = JSON.parse(utf8Decode(base64Decode(unb64url(payload))));
-				let now = new Date().valueOf()
+				let now = new Date().valueOf();
 				if (now < result.exp) {
 					print(`JWT valid for another ${(result.exp - now) / 1000} seconds.`);
 					return result;
@@ -64,8 +76,6 @@ function readSession(session) {
 		} else {
 			print('Invalid JWT header.');
 		}
-	} else {
-		print('No session JWT.');
 	}
 }
 
@@ -79,9 +89,15 @@ function hashPassword(password) {
 }
 
 function noAdministrator() {
-	return !core.globalSettings || !core.globalSettings.permissions || !Object.keys(core.globalSettings.permissions).some(function(name) {
+	return (
-		return core.globalSettings.permissions[name].indexOf("administration") != -1;
+		!core.globalSettings ||
-	});
+		!core.globalSettings.permissions ||
+		!Object.keys(core.globalSettings.permissions).some(function (name) {
+			return (
+				core.globalSettings.permissions[name].indexOf('administration') != -1
+			);
+		})
+	);
 }
 
 function makeAdministrator(name) {
@@ -91,8 +107,8 @@ function makeAdministrator(name) {
 	if (!core.globalSettings.permissions[name]) {
 		core.globalSettings.permissions[name] = [];
 	}
-	if (core.globalSettings.permissions[name].indexOf("administration") == -1) {
+	if (core.globalSettings.permissions[name].indexOf('administration') == -1) {
-		core.globalSettings.permissions[name].push("administration");
+		core.globalSettings.permissions[name].push('administration');
 	}
 	core.setGlobalSettings(core.globalSettings);
 }
@@ -103,7 +119,7 @@ function getCookies(headers) {
 	if (headers.cookie) {
 		let parts = headers.cookie.split(/,|;/);
 		for (let i in parts) {
-			let equals = parts[i].indexOf("=");
+			let equals = parts[i].indexOf('=');
 			let name = parts[i].substring(0, equals).trim();
 			let value = parts[i].substring(equals + 1).trim();
 			cookies[name] = value;
@@ -115,18 +131,34 @@ function getCookies(headers) {
 
 function isNameValid(name) {
 	let c = name.charAt(0);
-	return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) && name.split().map(x => x >= ('a' && x <= 'z') || x >= ('A' && x <= 'Z') || x >= ('0' && x <= '9'));
+	return (
+		((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) &&
+		name
+			.split()
+			.map(
+				(x) =>
+					x >= ('a' && x <= 'z') ||
+					x >= ('A' && x <= 'Z') ||
+					x >= ('0' && x <= '9')
+			)
+	);
 }
 
 function handler(request, response) {
 	let session = getCookies(request.headers).session;
-	if (request.uri == "/login") {
+	if (request.uri == '/login') {
 		let formData = form.decodeForm(request.query);
 		if (query(request.headers)?.permissions?.authenticated) {
 			if (formData.return) {
-				response.writeHead(303, {"Location": formData.return});
+				response.writeHead(303, {Location: formData.return});
 			} else {
-				response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + request.headers.host + '/', "Content-Length": "0"});
+				response.writeHead(303, {
+					Location:
+						(request.client.tls ? 'https://' : 'http://') +
+						request.headers.host +
+						'/',
+					'Content-Length': '0',
+				});
 			}
 			response.end();
 			return;
@@ -135,22 +167,23 @@ function handler(request, response) {
 		let sessionIsNew = false;
 		let loginError;
 
-		if (request.method == "POST" || formData.submit) {
+		if (request.method == 'POST' || formData.submit) {
 			sessionIsNew = true;
 			formData = form.decodeForm(utf8Decode(request.body), formData);
-			if (formData.submit == "Login") {
+			if (formData.submit == 'Login') {
-				let account = gDatabase.get("user:" + formData.name);
+				let account = gDatabase.get('user:' + formData.name);
 				account = account ? JSON.parse(account) : account;
 				if (formData.register == '1') {
-					if (!account &&
+					if (
+						!account &&
 						isNameValid(formData.name) &&
-						formData.password == formData.confirm) {
+						formData.password == formData.confirm
+					) {
 						let users = new Set();
 						let users_original = gDatabase.get('users');
 						try {
 							users = new Set(JSON.parse(users_original));
-						} catch {
+						} catch {}
-						}
 						if (!users.has(formData.name)) {
 							users.add(formData.name);
 						}
@@ -168,10 +201,12 @@ function handler(request, response) {
 						loginError = 'Error registering account.';
 					}
 				} else if (formData.change == '1') {
-					if (account &&
+					if (
+						account &&
 						isNameValid(formData.name) &&
 						formData.new_password == formData.confirm &&
-						verifyPassword(formData.password, account.password)) {
+						verifyPassword(formData.password, account.password)
+					) {
 						session = makeJwt({name: formData.name});
 						account = {password: hashPassword(formData.new_password)};
 						gDatabase.set('user:' + formData.name, JSON.stringify(account));
@@ -179,9 +214,11 @@ function handler(request, response) {
 						loginError = 'Error changing password.';
 					}
 				} else {
-					if (account &&
+					if (
+						account &&
 						account.password &&
-						verifyPassword(formData.password, account.password)) {
+						verifyPassword(formData.password, account.password)
+					) {
 						session = makeJwt({name: formData.name});
 						if (noAdministrator()) {
 							makeAdministrator(formData.name);
@@ -199,10 +236,14 @@ function handler(request, response) {
 		let cookie = `session=${session}; path=/; Max-Age=${kRefreshInterval}; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; HttpOnly`;
 		let entry = readSession(session);
 		if (entry && formData.return) {
-			response.writeHead(303, {"Location": formData.return, "Set-Cookie": cookie});
+			response.writeHead(303, {
+				Location: formData.return,
+				'Set-Cookie': cookie,
+			});
 			response.end();
 		} else {
-			File.readFile("core/auth.html").then(function(data) {
+			File.readFile('core/auth.html')
+				.then(function (data) {
 					let html = utf8Decode(data);
 					let auth_data = {
 						session_is_new: sessionIsNew,
@@ -211,20 +252,36 @@ function handler(request, response) {
 						code_of_conduct: core.globalSettings.code_of_conduct,
 						have_administrator: !noAdministrator(),
 					};
-				html = utf8Encode(html.replace('$AUTH_DATA', JSON.stringify(auth_data)));
+					html = utf8Encode(
-				response.writeHead(200, {"Content-Type": "text/html; charset=utf-8", "Set-Cookie": cookie, "Content-Length": html.length});
+						html.replace('$AUTH_DATA', JSON.stringify(auth_data))
+					);
+					response.writeHead(200, {
+						'Content-Type': 'text/html; charset=utf-8',
+						'Set-Cookie': cookie,
+						'Content-Length': html.length,
+					});
 					response.end(html);
-			}).catch(function(error) {
+				})
-				response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Connection": "close"});
+				.catch(function (error) {
-				response.end("404 File not found");
+					response.writeHead(404, {
+						'Content-Type': 'text/plain; charset=utf-8',
+						Connection: 'close',
+					});
+					response.end('404 File not found');
 				});
 		}
-	} else if (request.uri == "/login/logout") {
+	} else if (request.uri == '/login/logout') {
-		response.writeHead(303, {"Set-Cookie": `session=; path=/; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly`, "Location": "/login" + (request.query ? "?" + request.query : "")});
+		response.writeHead(303, {
+			'Set-Cookie': `session=; path=/; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly`,
+			Location: '/login' + (request.query ? '?' + request.query : ''),
+		});
 		response.end();
 	} else {
-		response.writeHead(200, {"Content-Type": "text/plain; charset=utf-8", "Connection": "close"});
+		response.writeHead(200, {
-		response.end("Hello, " + request.client.peerName + ".");
+			'Content-Type': 'text/plain; charset=utf-8',
+			Connection: 'close',
+		});
+		response.end('Hello, ' + request.client.peerName + '.');
 	}
 }
 
@@ -233,14 +290,18 @@ function getPermissions(session) {
 	let entry = readSession(session);
 	if (entry) {
 		permissions = getPermissionsForUser(entry.name);
-		permissions.authenticated = entry.name !== "guest";
+		permissions.authenticated = entry.name !== 'guest';
 	}
 	return permissions || {};
 }
 
 function getPermissionsForUser(userName) {
 	let permissions = {};
-	if (core.globalSettings && core.globalSettings.permissions && core.globalSettings.permissions[userName]) {
+	if (
+		core.globalSettings &&
+		core.globalSettings.permissions &&
+		core.globalSettings.permissions[userName]
+	) {
 		for (let i in core.globalSettings.permissions[userName]) {
 			permissions[core.globalSettings.permissions[userName][i]] = true;
 		}
@@ -252,10 +313,12 @@ function query(headers) {
 	let session = getCookies(headers).session;
 	let entry;
 	let autologin = tildefriends.args.autologin;
-	if (entry = autologin ? {name: autologin} : readSession(session)) {
+	if ((entry = autologin ? {name: autologin} : readSession(session))) {
 		return {
 			session: entry,
-			permissions: autologin ? getPermissionsForUser(autologin) : getPermissions(session),
+			permissions: autologin
+				? getPermissionsForUser(autologin)
+				: getPermissions(session),
 		};
 	}
 }

core/form.js

@@ -1,10 +1,10 @@
 function decode(encoded) {
-	let result = "";
+	let result = '';
 	for (let i = 0; i < encoded.length; i++) {
 		let c = encoded[i];
-		if (c == "+") {
+		if (c == '+') {
-			result += " ";
+			result += ' ';
-		} else if (c == "%") {
+		} else if (c == '%') {
 			result += String.fromCharCode(parseInt(encoded.slice(i + 1, i + 3), 16));
 			i += 2;
 		} else {

core/http.js

@@ -1,11 +1,11 @@
 function parseUrl(url) {
 	// XXX: Hack.
-	let match = url.match(new RegExp("(\\w+)://([^/:]+)(?::(\\d+))?(.*)"));
+	let match = url.match(new RegExp('(\\w+)://([^/:]+)(?::(\\d+))?(.*)'));
 	return {
 		protocol: match[1],
 		host: match[2],
 		path: match[4],
-		port: match[3] ? parseInt(match[3]) : match[1] == "http" ? 80 : 443,
+		port: match[3] ? parseInt(match[3]) : match[1] == 'http' ? 80 : 443,
 	};
 }
 
@@ -21,7 +21,7 @@ function parseResponse(data) {
 		} else if (!firstLine) {
 			firstLine = line;
 		} else {
-			let colon = line.indexOf(":");
+			let colon = line.indexOf(':');
 			headers[line.substring(colon)] = line.substring(colon + 1);
 		}
 	}
@@ -37,7 +37,9 @@ export function fetch(url, options, allowed_hosts) {
 		let socket = new Socket();
 		let buffer = new Uint8Array(0);
 
-		return socket.connect(parsed.host, parsed.port).then(function() {
+		return socket
+			.connect(parsed.host, parsed.port)
+			.then(function () {
 				socket.read(function (data) {
 					if (data && data.length) {
 						let newBuffer = new Uint8Array(buffer.length + data.length);
@@ -72,14 +74,21 @@ export function fetch(url, options, allowed_hosts) {
 				if (parsed.port == 443) {
 					return socket.startTls();
 				}
-		}).then(function() {
+			})
-			let body = typeof options?.body == 'string' ? utf8Encode(options.body) : (options.body || new Uint8Array(0));
+			.then(function () {
-			let headers = utf8Encode(`${options?.method ?? 'GET'} ${parsed.path} HTTP/1.0\r\nHost: ${parsed.host}\r\nConnection: close\r\nContent-Length: ${body.length}\r\n\r\n`);
+				let body =
+					typeof options?.body == 'string'
+						? utf8Encode(options.body)
+						: options.body || new Uint8Array(0);
+				let headers = utf8Encode(
+					`${options?.method ?? 'GET'} ${parsed.path} HTTP/1.0\r\nHost: ${parsed.host}\r\nConnection: close\r\nContent-Length: ${body.length}\r\n\r\n`
+				);
 				let fullRequest = new Uint8Array(headers.length + body.length);
 				fullRequest.set(headers, 0);
 				fullRequest.set(body, headers.length);
 				socket.write(fullRequest);
-		}).catch(function(error) {
+			})
+			.catch(function (error) {
 				reject(error);
 			});
 	});

core/httpd.js

@@ -1,598 +0,0 @@
-import * as core from './core.js';
-
-let gHandlers = [];
-let gSocketHandlers = [];
-let gBadRequests = {};
-
-const kRequestTimeout = 5000;
-const kStallTimeout = 60000;
-
-function logError(error) {
-	print("ERROR " + error);
-	if (error.stackTrace) {
-		print(error.stackTrace);
-	}
-}
-
-function addHandler(handler) {
-	let added = false;
-	for (let i in gHandlers) {
-		if (gHandlers[i].path == handler.path) {
-			gHandlers[i] = handler;
-			added = true;
-			break;
-		}
-	}
-	if (!added) {
-		gHandlers.push(handler);
-		added = true;
-	}
-}
-
-function all(prefix, handler) {
-	addHandler({
-		owner: this,
-		path: prefix,
-		invoke: handler,
-	});
-}
-
-function registerSocketHandler(prefix, handler) {
-	gSocketHandlers.push({
-		owner: this,
-		path: prefix,
-		invoke: handler,
-	});
-}
-
-function Request(method, uri, version, headers, body, client) {
-	this.method = method;
-	let index = uri.indexOf("?");
-	if (index != -1) {
-		this.uri = uri.slice(0, index);
-		this.query = uri.slice(index + 1);
-	} else {
-		this.uri = uri;
-		this.query = undefined;
-	}
-	this.version = version || '';
-	this.headers = headers;
-	this.client = {peerName: client.peerName, tls: client.tls};
-	this.body = body;
-	return this;
-}
-
-function findHandler(request) {
-	let matchedHandler = null;
-	for (let name in gHandlers) {
-		let handler = gHandlers[name];
-		if (request.uri == handler.path || request.uri.slice(0, handler.path.length + 1) == handler.path + '/') {
-			matchedHandler = handler;
-			break;
-		}
-	}
-	return matchedHandler;
-}
-
-function findSocketHandler(request) {
-	let matchedHandler = null;
-	for (let name in gSocketHandlers) {
-		let handler = gSocketHandlers[name];
-		if (request.uri == handler.path || request.uri.slice(0, handler.path.length + 1) == handler.path + '/') {
-			matchedHandler = handler;
-			break;
-		}
-	}
-	return matchedHandler;
-}
-
-function Response(request, client) {
-	let kStatusText = {
-		101: "Switching Protocols",
-		200: 'OK',
-		303: 'See other',
-		304: 'Not Modified',
-		400: 'Bad Request',
-		401: 'Unauthorized',
-		403: 'Forbidden',
-		404: 'File not found',
-		500: 'Internal server error',
-	};
-	let _started = false;
-	let _finished = false;
-	let _keepAlive = false;
-	let _chunked = false;
-	return {
-		writeHead: function(status) {
-			if (_started) {
-				throw new Error("Response.writeHead called multiple times.");
-			}
-			let reason;
-			let headers;
-			if (arguments.length == 3) {
-				reason = arguments[1];
-				headers = arguments[2];
-			} else {
-				reason = kStatusText[status];
-				headers = arguments[1];
-			}
-			let lowerHeaders = {};
-			let requestVersion = request.version.split("/")[1].split(".");
-			let responseVersion = (requestVersion[0] >= 1 && requestVersion[0] >= 1) ? "1.1" : "1.0";
-			let headerString = "HTTP/" + responseVersion + " " + status + " " + reason + "\r\n";
-			headers['Server'] = `Tilde Friends/${version().number}`;
-			for (let i in headers) {
-				headerString += i + ": " + headers[i] + "\r\n";
-				lowerHeaders[i.toLowerCase()] = headers[i];
-			}
-			if ("connection" in lowerHeaders) {
-				_keepAlive = lowerHeaders["connection"].toLowerCase() == "keep-alive";
-			} else {
-				_keepAlive = ((request.version == "HTTP/1.0" && ("connection" in lowerHeaders && lowerHeaders["connection"].toLowerCase() == "keep-alive")) ||
-					(request.version == "HTTP/1.1" && (!("connection" in lowerHeaders) || lowerHeaders["connection"].toLowerCase() != "close")));
-				headerString += "Connection: " + (_keepAlive ? "keep-alive" : "close") + "\r\n";
-			}
-			_chunked = _keepAlive && !("content-length" in lowerHeaders);
-			if (_chunked) {
-				headerString += "Transfer-Encoding: chunked\r\n";
-			}
-			headerString += "\r\n";
-			_started = true;
-			client.write(headerString).catch(function() {});
-		},
-		end: function(data) {
-			if (_finished) {
-				throw new Error("Response.end called multiple times.");
-			}
-			if (data) {
-				if (_chunked) {
-					client.write(data.length.toString(16) + "\r\n" + data + "\r\n" + "0\r\n\r\n").catch(function() {});
-				} else {
-					client.write(data).catch(function() {});
-				}
-			} else if (_chunked) {
-				client.write("0\r\n\r\n").catch(function() {});
-			}
-			_finished = true;
-			if (!_keepAlive) {
-				client.shutdown().catch(function() {});
-			}
-		},
-		reportError: function(error) {
-			if (!_started) {
-				client.write("HTTP/1.1 500 Internal Server Error\r\nContent-Type: text/plain; charset=utf-8\r\n\r\n").catch(function() {});
-			}
-			if (!_finished) {
-				client.write("500 Internal Server Error\r\n\r\n" + error?.stackTrace).catch(function() {});
-			}
-			logError(client.peerName + " - - [" + new Date() + "] " + error);
-		},
-		isConnected: function() { return client.isConnected; },
-	};
-}
-
-function handleRequest(request, response) {
-	let handler = findHandler(request);
-
-	print(request.client.peerName + " - - [" + new Date() + "] " + request.method + " " + request.uri + " " + request.version + " \"" + request.headers["user-agent"] + "\"");
-
-	if (handler) {
-		try {
-			Promise.resolve(handler.invoke(request, response)).catch(function(error) {
-				response.reportError(error);
-				request.client.close();
-			});
-		} catch (error) {
-			response.reportError(error);
-			request.client.close();
-		}
-	} else {
-		response.writeHead(200, {"Content-Type": "text/plain; charset=utf-8"});
-		response.end("No handler found for request: " + request.uri);
-	}
-}
-
-function handleWebSocketRequest(request, response, client) {
-	let buffer = new Uint8Array(0);
-	let frame;
-	let frameOpCode = 0x0;
-
-	let handler = findSocketHandler(request);
-	if (!handler) {
-		client.close();
-		return;
-	}
-
-	if (client) {
-		response.send = function(message, opCode) {
-			if (opCode === undefined) {
-				opCode = 0x2;
-			}
-			if (opCode == 0x1 && (typeof message == "string" || message instanceof String)) {
-				message = utf8Encode(message);
-			}
-			let fin = true;
-			let packet = [(fin ? (1 << 7) : 0) | (opCode & 0xf)];
-			let mask = false;
-			if (message.length < 126) {
-				packet.push((mask ? (1 << 7) : 0) | message.length);
-			} else if (message.length < (1 << 16)) {
-				packet.push((mask ? (1 << 7) : 0) | 126);
-				packet.push((message.length >> 8) & 0xff);
-				packet.push(message.length & 0xff);
-			} else {
-				let high = 0; //(message.length / (1 ** 32)) & 0xffffffff;
-				let low = message.length & 0xffffffff;
-				packet.push((mask ? (1 << 7) : 0) | 127);
-				packet.push((high >> 24) & 0xff);
-				packet.push((high >> 16) & 0xff);
-				packet.push((high >> 8) & 0xff);
-				packet.push((high >> 0) & 0xff);
-				packet.push((low >> 24) & 0xff);
-				packet.push((low >> 16) & 0xff);
-				packet.push((low >> 8) & 0xff);
-				packet.push(low & 0xff);
-			}
-
-			let array = new Uint8Array(packet.length + message.length);
-			array.set(packet, 0);
-			array.set(message, packet.length);
-			try {
-				return client.write(array);
-			} catch (error) {
-				client.close();
-				throw error;
-			}
-		}
-	}
-	response.onMessage = null;
-
-	let extra_headers = handler.invoke(request, response);
-
-	if (client) {
-		client.read(function(data) {
-			if (data) {
-				let newBuffer = new Uint8Array(buffer.length + data.length);
-				newBuffer.set(buffer, 0);
-				newBuffer.set(data, buffer.length);
-				buffer = newBuffer;
-
-				while (buffer.length >= 2) {
-					let bits0 = buffer[0];
-					let bits1 = buffer[1];
-					if (bits1 & (1 << 7) == 0) {
-						// Unmasked message.
-						client.close();
-					}
-					let opCode = bits0 & 0xf;
-					let fin = bits0 & (1 << 7);
-					let payloadLength = bits1 & 0x7f;
-					let maskStart = 2;
-
-					if (payloadLength == 126) {
-						payloadLength = 0;
-						for (let i = 0; i < 2; i++) {
-							payloadLength <<= 8;
-							payloadLength |= buffer[2 + i];
-						}
-						maskStart = 4;
-					} else if (payloadLength == 127) {
-						payloadLength = 0;
-						for (let i = 0; i < 8; i++) {
-							payloadLength <<= 8;
-							payloadLength |= buffer[2 + i];
-						}
-						maskStart = 10;
-					}
-					let havePayload = buffer.length >= payloadLength + 2 + 4;
-					if (havePayload) {
-						let mask =
-							buffer[maskStart + 0] |
-							buffer[maskStart + 1] << 8 |
-							buffer[maskStart + 2] << 16 |
-							buffer[maskStart + 3] << 24;
-						let dataStart = maskStart + 4;
-						let payload = buffer.slice(dataStart, dataStart + payloadLength);
-						let decoded = maskBytes(payload, mask);
-						buffer = buffer.slice(dataStart + payloadLength);
-
-						if (frame) {
-							let newBuffer = new Uint8Array(frame.length + decoded.length);
-							newBuffer.set(frame, 0);
-							newBuffer.set(decoded, frame.length);
-							frame = newBuffer;
-						} else {
-							frame = decoded;
-						}
-
-						if (opCode) {
-							frameOpCode = opCode;
-						}
-
-						if (fin) {
-							if (response.onMessage) {
-								response.onMessage({
-									data: frameOpCode == 0x1 ? utf8Decode(frame) : frame,
-									opCode: frameOpCode,
-								});
-							}
-							frame = undefined;
-						}
-					} else {
-						break;
-					}
-				}
-			} else {
-				response.onClose();
-				client.close();
-			}
-		});
-		client.onError(function(error) {
-			logError(client.peerName + " - - [" + new Date() + "] " + error);
-			response.onError(error);
-		});
-	}
-
-	let headers = {
-		"Upgrade": "websocket",
-		"Connection": "Upgrade",
-		"Sec-WebSocket-Accept": webSocketAcceptResponse(request.headers["sec-websocket-key"]),
-	};
-	if (request.headers["sec-websocket-version"] != "13") {
-		headers["Sec-WebSocket-Version"] = "13";
-	}
-	response.writeHead(101, Object.assign({}, headers, extra_headers));
-}
-
-function webSocketAcceptResponse(key) {
-	let kMagic = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
-	return base64Encode(sha1Digest(key + kMagic));
-}
-
-function badRequest(client, reason) {
-	let now = new Date();
-	let count = 0;
-	let old = gBadRequests[client.peerName];
-	if (!old) {
-		gBadRequests[client.peerName] = {
-			expire: new Date(now.getTime() + 1 * 60 * 1000),
-			count: 1,
-			reason: reason,
-		};
-		count = 1;
-	} else {
-		old.count++;
-		old.reason = reason;
-		count = old.count;
-	}
-	new Response({version: '1.0'}, client).reportError(reason + ': ' + count);
-	client.close();
-}
-
-function allowRequest(client) {
-	let old = gBadRequests[client.peerName];
-	if (old) {
-		let now = new Date();
-		if (old.expire < now) {
-			delete gBadRequests[client.peerName];
-			return true;
-		} else {
-			return old.count < 3;
-		}
-	} else {
-		return true;
-	}
-}
-
-function handleConnection(client) {
-	if (!allowRequest(client)) {
-		print('Rejecting client for too many bad requests: ', client.peerName, gBadRequests[client.peerName].reason);
-		client.info = 'rejected';
-		client.close();
-		return;
-	}
-
-	client.info = 'accepted';
-	let inputBuffer = new Uint8Array(0);
-	let request;
-	let headers = {};
-	let parsing_header = true;
-	let bodyToRead = -1;
-	let body;
-	let readCount = 0;
-	let isWebsocket = false;
-
-	client.setActivityTimeout(kRequestTimeout);
-
-	function reset() {
-		request = undefined;
-		headers = {};
-		parsing_header = true;
-		bodyToRead = -1;
-		body = undefined;
-		client.info = 'reset';
-		client.setActivityTimeout(kRequestTimeout);
-	}
-
-	function finish() {
-		client.info = 'finishing';
-		let requestObject = new Request(request[0], request[1], request[2], headers, body, client);
-		let response = new Response(requestObject, client);
-		try {
-			handleRequest(requestObject, response)
-			if (client.isConnected) {
-				reset();
-			}
-		} catch (error) {
-			response.reportError(error);
-			client.close();
-		}
-	}
-
-	client.onError(function(error) {
-		logError(client.peerName + " - - [" + new Date() + "] " + error);
-	});
-
-	client.read(function(data) {
-		readCount++;
-		if (data) {
-			let newBuffer = new Uint8Array(inputBuffer.length + data.length);
-			newBuffer.set(inputBuffer, 0);
-			newBuffer.set(data, inputBuffer.length);
-			inputBuffer = newBuffer;
-
-			if (parsing_header)
-			{
-				let result = parseHttpRequest(inputBuffer, inputBuffer.length - data.length);
-				if (result) {
-					if (typeof result === 'number') {
-						if (result == -2) {
-							/* More. */
-						} else {
-							badRequest(client, `Bad request(parse=${result}, length=${inputBuffer.length - data.length}).`);
-							return;
-						}
-					} else if (typeof result === 'object')  {
-						client.setActivityTimeout(kStallTimeout);
-						request = [
-							result.method,
-							result.path,
-							`HTTP/1.${result.minor_version}`,
-						];
-
-						headers = Object.fromEntries(Object.entries(result.headers).map(x => [x[0].toLowerCase(), x[1]]));
-						parsing_header = false;
-						inputBuffer = inputBuffer.slice(result.bytes_parsed);
-
-						if (!client.tls && tildefriends.https_port && core.globalSettings.http_redirect && !result.path.startsWith('/.well-known/')) {
-							let requestObject = new Request(request[0], request[1], request[2], headers, body, client);
-							let response = new Response(requestObject, client);
-							response.writeHead(303, {"Location": `${core.globalSettings.http_redirect}${result.path}`, "Content-Length": "0"});
-							response.end();
-							return;
-						}
-
-						if (headers["content-length"] != undefined) {
-							bodyToRead = parseInt(headers["content-length"]);
-							if (bodyToRead > 16 * 1024 * 1024) {
-								badRequest(client, 'Request too large: ' + bodyToRead + '.');
-								return;
-							}
-							body = new Uint8Array(bodyToRead);
-							client.info = 'waiting for body';
-						} else if (headers["connection"]
-							&& headers["connection"].toLowerCase().split(",").map(x => x.trim()).indexOf("upgrade") != -1
-							&& headers["upgrade"]
-							&& headers["upgrade"].toLowerCase() == "websocket") {
-							isWebsocket = true;
-							client.info = 'websocket';
-							let requestObject = new Request(request[0], request[1], request[2], headers, body, client);
-							let response = new Response(requestObject, client);
-							handleWebSocketRequest(requestObject, response, client);
-							/* Prevent the timeout from disconnecting us. */
-							client.setActivityTimeout();
-						} else {
-							finish();
-						}
-					}
-				}
-			}
-
-			if (!parsing_header && inputBuffer.length)
-			{
-				let offset = body.length - bodyToRead;
-				let length = Math.min(inputBuffer.length, body.length - offset);
-				if (inputBuffer.length > body.length - offset) {
-					body.set(inputBuffer.slice(0, length), offset);
-					inputBuffer = inputBuffer.slice(length);
-				} else {
-					body.set(inputBuffer, offset);
-					inputBuffer = inputBuffer.slice(inputBuffer.length);
-				}
-				bodyToRead -= length;
-				if (bodyToRead <= 0) {
-					finish();
-				}
-			}
-		} else {
-			client.info = 'EOF';
-			client.close();
-		}
-	});
-}
-
-let kBacklog = 8;
-let kHost = platform() == 'haiku' ? 'localhost' : '::';
-
-function start() {
-	let socket = new Socket();
-	socket.bind(kHost, tildefriends.http_port).then(function(port) {
-		print("bound to", port);
-		print("checking", tildefriends.args.out_http_port_file);
-		if (tildefriends.args.out_http_port_file) {
-			print("going to write the file");
-			File.writeFile(tildefriends.args.out_http_port_file, port.toString() + '\n').then(function(r) {
-				print("wrote port file", tildefriends.args.out_http_port_file, r);
-			}).catch(function() {
-				print("failed to write port file");
-			});
-		}
-		let listenResult = socket.listen(kBacklog, async function() {
-			try {
-				let client = await socket.accept();
-				client.noDelay = true;
-				handleConnection(client);
-			} catch (error) {
-				logError("[" + new Date() + "] accept error " + error);
-			}
-		});
-	}).catch(function(error) {
-		logError("[" + new Date() + "] bind error " + error);
-	});
-
-	if (tildefriends.https_port) {
-		let tls = {};
-		let secureSocket = new Socket();
-		secureSocket.bind(kHost, tildefriends.https_port).then(function() {
-			return secureSocket.listen(kBacklog, async function() {
-				try {
-					let client = await secureSocket.accept();
-					client.noDelay = true;
-					client.tls = true;
-					const kCertificatePath = "data/httpd/certificate.pem";
-					const kPrivateKeyPath = "data/httpd/privatekey.pem";
-
-					let stat = await Promise.all([
-						await File.stat(kCertificatePath),
-						await File.stat(kPrivateKeyPath),
-					]);
-					if (!tls.context ||
-						tls.certStat.mtime != stat[0].mtime ||
-						tls.certStat.size != stat[0].size ||
-						tls.keyStat.mtime != stat[1].mtime ||
-						tls.keyStat.size != stat[1].size) {
-						print("Reloading " + kCertificatePath + " and " + kPrivateKeyPath);
-						let privateKey = utf8Decode(await File.readFile(kPrivateKeyPath));
-						let certificate = utf8Decode(await File.readFile(kCertificatePath));
-
-						tls.context = new TlsContext();
-						tls.context.setPrivateKey(privateKey);
-						tls.context.setCertificate(certificate);
-						tls.certStat = stat[0];
-						tls.keyStat = stat[1];
-					}
-
-					let result = client.startTls(tls.context);
-					handleConnection(client);
-					return result;
-				} catch (error) {
-					logError("[" + new Date() + "] " + error);
-				}
-			});
-		}).catch(function(error) {
-			logError("[" + new Date() + "] bind error " + error);
-		});
-	}
-}
-
-export { all, start, registerSocketHandler };