Fill in some blanks in the readme.

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
+...

.gitignore

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

GNUmakefile

@@ -3,9 +3,9 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 12
-VERSION_NUMBER := 0.0.12
-VERSION_NAME := Where everybody knows your name.
+VERSION_CODE := 16
+VERSION_NUMBER := 0.0.16-wip
+VERSION_NAME := Medium English breakfast tea.
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -21,23 +21,41 @@ BUILD_TYPES := debug release
 HAVE_ANDROID = $(if $(shell which $(ANDROID_SDK)/platform-tools/adb),1,0)
 HAVE_LINUX_IOS = $(if $(shell which deps/ios_toolchain/target/bin deps/ios_toolchain/target/bin/arm-apple-darwin11-clang),1,0)
 HAVE_WIN = $(if $(shell which x86_64-w64-mingw32-gcc-win32),1,0)
+else ifeq ($(UNAME_S),Haiku)
+BUILD_TYPES := debug release
+CFLAGS += -Dstatic_assert=_Static_assert
+LDFLAGS += \
+	-lbsd \
+	-lnetwork
+else ifeq ($(UNAME_S),OpenBSD)
+BUILD_TYPES := debug release
+CFLAGS += \
+	-Wno-unknown-warning-option
+LDFLAGS += \
+	-lexecinfo \
+	-lc++abi
+HAVE_ANDROID := 0
+HAVE_LINUX_IOS := 0
+HAVE_WIN := 0
 else
 $(error Unexpected host platform $(UNAME_S).)
 endif
 
 CFLAGS += \
+	-std=gnu11 \
 	-Wall \
 	-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_NDK ?= $(ANDROID_SDK)/ndk/26.0.10792818
+ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-34
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.1.10909125
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
 
@@ -142,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 += \
@@ -190,6 +208,13 @@ $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/inc
 $(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib
 
 ifeq ($(UNAME_M),x86_64)
+ifneq ($(UNAME_S),Haiku)
+debug: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+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
@@ -257,23 +282,42 @@ UV_SOURCES_unix := \
 	deps/libuv/src/unix/fs.c \
 	deps/libuv/src/unix/getaddrinfo.c \
 	deps/libuv/src/unix/getnameinfo.c \
-	deps/libuv/src/unix/linux.c \
 	deps/libuv/src/unix/loop-watcher.c \
 	deps/libuv/src/unix/loop.c \
 	deps/libuv/src/unix/pipe.c \
 	deps/libuv/src/unix/poll.c \
 	deps/libuv/src/unix/process.c \
-	deps/libuv/src/unix/procfs-exepath.c \
-	deps/libuv/src/unix/proctitle.c \
 	deps/libuv/src/unix/random-devurandom.c \
 	deps/libuv/src/unix/random-getrandom.c \
-	deps/libuv/src/unix/random-sysctl-linux.c \
 	deps/libuv/src/unix/signal.c \
 	deps/libuv/src/unix/stream.c \
 	deps/libuv/src/unix/tcp.c \
 	deps/libuv/src/unix/thread.c \
 	deps/libuv/src/unix/tty.c \
 	deps/libuv/src/unix/udp.c
+ifeq ($(UNAME_S),Linux)
+	UV_SOURCES_unix += \
+		deps/libuv/src/unix/linux.c \
+		deps/libuv/src/unix/procfs-exepath.c \
+		deps/libuv/src/unix/proctitle.c \
+		deps/libuv/src/unix/random-sysctl-linux.c
+else ifeq ($(UNAME_S),Haiku)
+	UV_SOURCES_unix += \
+		deps/libuv/src/unix/bsd-ifaddrs.c \
+		deps/libuv/src/unix/haiku.c \
+		deps/libuv/src/unix/no-fsevents.c \
+		deps/libuv/src/unix/no-proctitle.c \
+		deps/libuv/src/unix/posix-hrtime.c \
+		deps/libuv/src/unix/posix-poll.c
+else ifeq ($(UNAME_S),OpenBSD)
+	UV_SOURCES_unix += \
+		deps/libuv/src/unix/bsd-ifaddrs.c \
+		deps/libuv/src/unix/kqueue.c \
+		deps/libuv/src/unix/no-proctitle.c \
+		deps/libuv/src/unix/openbsd.c \
+		deps/libuv/src/unix/posix-hrtime.c \
+		deps/libuv/src/unix/random-getentropy.c
+endif
 UV_SOURCES_android := \
 	deps/libuv/src/unix/random-getentropy.c
 UV_SOURCES_win := \
@@ -336,10 +380,18 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-incompatible-pointer-types \
 	-Wno-maybe-uninitialized \
 	-Wno-sign-compare \
+	-Wno-unused-but-set-parameter \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
-	-Wno-unused-variable \
+	-Wno-unused-variable
+ifeq ($(UNAME_S),Linux)
+$(UV_OBJS): CFLAGS += \
 	-D_GNU_SOURCE
+else ifeq ($(UNAME_S),Haiku)
+$(UV_OBJS): CFLAGS += \
+	-D_BSD_SOURCE \
+	-Wno-format-truncation
+endif
 
 SODIUM_SOURCES := \
 	deps/libsodium/src/libsodium/crypto_aead/aegis128l/aead_aegis128l.c \
@@ -403,8 +455,10 @@ $(SODIUM_OBJS): CFLAGS += \
 	-Wno-attributes \
 	-Ideps/libsodium/builds/msvc \
 	-Ideps/libsodium/src/libsodium/include/sodium
-#(SODIUM_OBJS_unix): CFLAGS += \
+ifneq ($(UNAME_S),OpenBSD)
+$(filter-out $(BUILD_DIR)/win%,$(SODIUM_OBJS)): CFLAGS += \
 	-DHAVE_ALLOCA_H
+endif
 
 SQLITE_SOURCES := deps/sqlite/sqlite3.c
 SQLITE_OBJS := $(call get_objs,SQLITE_SOURCES)
@@ -452,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 \
@@ -473,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 \
@@ -528,9 +589,14 @@ LDFLAGS += \
 	-pthread \
 	-lm
 debug release $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
-	-ldl \
 	-lssl \
 	-lcrypto
+ifneq ($(UNAME_S),Haiku)
+ifneq ($(UNAME_S),OpenBSD)
+debug release $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
+	-ldl
+endif
+endif
 $(WINDOWS_TARGETS): LDFLAGS += \
 	-lssl \
 	-lcrypto \
@@ -582,33 +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 "#define VERSION_NUMBER \"$(VERSION_NUMBER)\"\n#define VERSION_NAME \"$(VERSION_NAME)\"\n" > $@
+	@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)"/' \
@@ -619,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
@@ -635,21 +702,22 @@ 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/gg% apps/welcome%, $(shell find $(PACKAGE_DIRS) -type f))
+RAW_FILES := $(filter-out apps/blog% apps/gg% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release
@@ -663,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
@@ -671,22 +739,22 @@ out/apk/TildeFriends-arm-%.unsigned.apk:
 	@cp out/apk/res.apk $@
 	@cp out/apk/classes.dex out/apk-arm-$(BUILD_TYPE)/
 	@cd out/apk-arm-$(BUILD_TYPE) && zip -u ../../$@ -q -9 -r . && cd ../../
-	@zip -u $@ -q -9 -x '*.map' --exclude=apps/gg* --exclude=apps/welcome* -r $(PACKAGE_DIRS) $(RAW_FILES)
+	@zip -u $@ -q -9 $(RAW_FILES)
 
 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] $@
-	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86_64/
-	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86/
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86_64/tildefriends
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86/tildefriends
+	@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
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86/tildefriends.so
 	@cp out/apk/res.apk $@
 	@cp out/apk/classes.dex out/apk-x86-$(BUILD_TYPE)/
 	@cd out/apk-x86-$(BUILD_TYPE) && zip -u ../../$@ -q -9 -r . && cd ../../
-	@zip -u $@ -q -9 -x '*.map' --exclude=apps/gg* --exclude=apps/welcome* -r $(PACKAGE_DIRS) $(RAW_FILES)
+	@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
@@ -706,7 +774,7 @@ out/%.app/tildefriends.png: src/ios/tildefriends.png
 	@cp -v $< $@
 
 out/%/data.zip: $(RAW_FILES)
-	@zip -u $@ -q -9 -x '*.map' -r $(PACKAGE_DIRS) $(RAW_FILES)
+	@zip -u $@ -q -9 $(RAW_FILES)
 
 out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/tildefriends-%.app/data.zip
 	@mkdir -p $(dir $@)
@@ -716,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/
@@ -744,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
@@ -786,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,6 +1,8 @@
 # Tilde Friends
 Tilde Friends is a tool for making and sharing.
 
+A public instance lives at https://www.tildefriends.net/.
+
 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.
 
@@ -11,14 +13,18 @@ Scuttlebutt, as well as a platform for writing and running web applications.
    browser.
 
 ## Building
+Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku.  Builds for
+all of those host platforms plus mingw64, iOS, and android.
+
 1. Requires openssl (`libssl-dev`, in debian-speak).  All other dependencies
    are kept up to date in the tree.
 2. To build, run `make debug` or `make release`.  An executable will be
    generated in a subdirectory of `out/`.
 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 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
@@ -26,11 +32,11 @@ at <http://localhost:12345/>.  `tildefriends -h` lists further options.
 
 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/`>.
+<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

apps/api.json

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

apps/apps.json

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

apps/apps/app.js

@@ -1,25 +1,83 @@
+/**
+ * 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());
-	var core_apps = await fetch_info(await core.apps('core'));
-	var doc = `<!DOCTYPE html>
-<html>
-<head>
-	<style>
+	const apps = await fetch_info(await core.apps());
+	const core_apps = await fetch_info(await core.apps('core'));
+	const shared_apps = await fetch_shared_apps();
+
+	const stylesheet = `
+		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 +92,87 @@ async function main() {
 			max-width: 64px;
 			text-overflow: ellipsis ellipsis;
 			overflow: hidden;
+			color: whitesmoke;
 		}
-	</style>
-</head>
-<body style="background: #888">
-<h1 id="apps_title">Apps</h1>
-<div id="apps" class="container"></div>
-<h1>Core Apps</h1>
-<div id="core_apps" class="container"></div>
-</body>
-<script>
-	function populate_apps(id, name, apps) {
-		var list = document.getElementById(id);
-		for (let app of Object.keys(apps).sort()) {
-			let div = list.appendChild(document.createElement('div'));
-			div.classList.add('app');
+	`;
 
-			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.target = '_top';
-			div.appendChild(icon_a);
+	const body = `
+		<h1 style="text-shadow: #808080 0 0 10px;">Welcome to Tilde Friends.</h1>
 
-			let a = document.createElement('a');
-			a.appendChild(document.createTextNode(app));
-			a.href = '/~' + name + '/' + app + '/';
-			a.target = '_top';
-			div.appendChild(a);
+		<h2>your apps</h2>
+		<div id="apps" class="container"></div>
+
+		<h2>shared apps</h2>
+		<div id="shared_apps" class="container"></div>
+
+		<h2>core apps</h2>
+		<div id="core_apps" class="container"></div>
+	`;
+
+	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 = 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 = 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)});
-</script>
-</html>`;
-	app.setDocument(doc);
+
+		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>`;
+
+	// 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

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

apps/blog/app.js

@@ -0,0 +1,8 @@
+import * as blog from './blog.js';
+
+async function main() {
+	let blogs = await blog.get_posts();
+	await app.setDocument(blog.render_html(blogs));
+}
+
+main();

apps/blog/blog.js

@@ -0,0 +1,189 @@
+import * as commonmark from './commonmark.min.js';
+
+function escape(text) {
+	return (text ?? '').replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+}
+
+function escapeAttribute(text) {
+	return (text ?? '').replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('>', '&gt;').replaceAll('"', '&quot;').replaceAll("'", '&#39;');
+}
+
+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 || '');
+	let walker = parsed.walker();
+	let event, node;
+	while ((event = walker.next())) {
+		node = event.node;
+		if (event.entering) {
+			if (node.destination?.startsWith('&')) {
+				node.destination = '/' + node.destination + '/view?filename=' + node.firstChild?.literal;
+			} else if (node.destination?.startsWith('@') || node.destination?.startsWith('%')) {
+				node.destination = '/~core/ssb/#' + escape(node.destination);
+			}
+		}
+	}
+	return writer.render(parsed);
+}
+
+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>
+				</div>
+			</body>
+		</html>
+	`;
+}
+
+function render_blog_post(blog_post) {
+	return `
+		<div>
+			<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>
+	`;
+}
+
+export function render_html(blogs) {
+	return `<!DOCTYPE html>
+		<html>
+			<head>
+				<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="_top">
+			</head>
+			<body>
+				<div style="display: flex; flex-direction: row; align-items: center; gap: 1em">
+					<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')}
+			</body>
+		</html>`;
+}
+
+function render_blog_post_atom(blog_post) {
+	return `<entry>
+		<title>${escape(blog_post.title)}</title>
+		<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>
+		<author>
+			<name>${escape(blog_post.name)}</name>
+			<feed>${escape(blog_post.author)}</feed>
+		</author>
+	</entry>`;
+}
+
+export function render_atom(blogs) {
+	return `<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+	<title>🪵Tilde Blog</title>
+	<subtitle>A subtitle.</subtitle>
+	<link href="${core.url}/atom" rel="self"/>
+	<link href="${core.url}"/>
+	<id>${core.url}</id>
+	<updated>${new Date().toString()}</updated>
+	${blogs.map(blog_post => render_blog_post_atom(blog_post)).join('\n')}
+</feed>`;
+}
+
+export async function get_posts() {
+	let blogs = [];
+	let ids = await ssb.getIdentities();
+	await ssb.sqlAsync(`
+		WITH
+			blogs AS (
+				SELECT
+					messages.author,
+					messages.id,
+					json_extract(messages.content, '$.title') AS title,
+					json_extract(messages.content, '$.summary') AS summary,
+					json_extract(messages.content, '$.blog') AS blog,
+					messages.timestamp
+				FROM messages_fts('blog')
+				JOIN messages ON messages.rowid = messages_fts.rowid
+				WHERE json_extract(messages.content, '$.type') = 'blog'),
+			public AS (
+				SELECT author FROM (
+					SELECT
+						messages.author,
+						RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank,
+						json_extract(messages.content, '$.publicWebHosting') AS is_public
+					FROM messages_fts('about')
+					JOIN messages ON messages.rowid = messages_fts.rowid
+					WHERE json_extract(messages.content, '$.type') = 'about' AND is_public IS NOT NULL)
+				WHERE author_rank = 1 AND is_public),
+			names AS (
+				SELECT author, name FROM (
+					SELECT
+						messages.author,
+						RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank,
+						json_extract(messages.content, '$.name') AS name
+					FROM messages_fts('about')
+					JOIN messages ON messages.rowid = messages_fts.rowid
+					WHERE json_extract(messages.content, '$.type') = 'about' AND
+						json_extract(messages.content, '$.about') = messages.author AND
+						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
+	`, [JSON.stringify(ids)], function(row) {
+		blogs.push(row);
+	});
+	return blogs;
+}

apps/blog/handler.js

@@ -0,0 +1,31 @@
+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'});
+				return;
+			}
+		}
+		respond({data: blog.render_html(blogs), content_type: 'text/html; charset=utf-8'});
+	}
+}
+
+main().catch(function(error) {
+	respond({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/identity.json

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

apps/identity/app.js

@@ -0,0 +1,87 @@
+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.json

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

apps/issues/script.js

@@ -136,7 +136,7 @@ class TfIssuesAppElement extends LitElement {
 					break;
 			}
 		}
-		this.issues = Object.values(issues).sort((x, y) => 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) {
@@ -149,7 +149,7 @@ class TfIssuesAppElement extends LitElement {
 	render_issue_table_row(issue) {
 		return html`
 			<tr>
-				<td>${issue.open ? 'open' : 'closed'}</td>
+				<td>${issue.open ? '☐ open' : '☑ closed'}</td>
 				<td 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]}

apps/journal.json

@@ -0,0 +1,5 @@
+{
+  "type": "tildefriends-app",
+  "emoji": "📝",
+  "previous": "&2hdIDbBrAg63T2X1MzdGSF7yiqHvlnfF0PnInQLp0DA=.sha256"
+}

apps/journal/app.js

@@ -0,0 +1,173 @@
+import * as tfrpc from '/tfrpc.js';
+
+let g_hash;
+let g_collection_notifies = {};
+
+tfrpc.register(async function getOwnerIdentities() {
+	return ssb.getOwnerIdentities();
+});
+
+tfrpc.register(async function getIdentities() {
+	return ssb.getIdentities();
+});
+
+tfrpc.register(async function query(sql, args) {
+	let result = [];
+	await ssb.sqlAsync(sql, args, function callback(row) {
+		result.push(row);
+	});
+	return result;
+});
+
+tfrpc.register(async function localStorageGet(key) {
+	return app.localStorageGet(key);
+});
+
+tfrpc.register(async function localStorageSet(key, value) {
+	return app.localStorageSet(key, value);
+});
+
+tfrpc.register(async function following(ids, depth) {
+	return ssb.following(ids, depth);
+});
+
+tfrpc.register(async function appendMessage(id, message) {
+	return ssb.appendMessageWithIdentity(id, message);
+});
+
+tfrpc.register(async function store_blob(blob) {
+	if (Array.isArray(blob)) {
+		blob = Uint8Array.from(blob);
+	}
+	return await ssb.blobStore(blob);
+});
+
+tfrpc.register(async function get_blob(id) {
+	return utf8Decode(await ssb.blobGet(id));
+});
+
+let g_new_message_resolve;
+let g_new_message_promise = new Promise(function(resolve, reject) {
+	g_new_message_resolve = resolve;
+});
+
+function new_message() {
+	return g_new_message_promise;
+}
+
+ssb.addEventListener('message', function(id) {
+	let resolve = g_new_message_resolve;
+	g_new_message_promise = new Promise(function(resolve, reject) {
+		g_new_message_resolve = resolve;
+	});
+	if (resolve) {
+		resolve();
+	}
+});
+
+core.register('message', async function message_handler(message) {
+	if (message.event == 'hashChange') {
+		print('hash change', message.hash);
+		g_hash = message.hash;
+		await tfrpc.rpc.hash_changed(message.hash);
+	}
+});
+
+tfrpc.register(function set_hash(hash) {
+	if (g_hash != hash) {
+		return app.setHash(hash);
+	}
+});
+
+tfrpc.register(function get_hash(id, message) {
+	return g_hash;
+});
+
+tfrpc.register(async function try_decrypt(id, content) {
+	return await ssb.privateMessageDecrypt(id, content);
+});
+tfrpc.register(async function encrypt(id, recipients, content) {
+	return await ssb.privateMessageEncrypt(id, recipients, content);
+});
+
+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) {
+			x = await ssb.privateMessageDecrypt(id, content);
+			if (x) {
+				content = JSON.parse(x);
+				break;
+			}
+		}
+		if (!x) {
+			return;
+		}
+		if (content.type !== kind ||
+			(parent && content.parent !== parent)) {
+			return;
+		}
+	}
+	if (content?.key) {
+		if (content?.tombstone) {
+			delete collection[content.key];
+		} else {
+			collection[content.key] = Object.assign(collection[content.key] || {}, content);
+		}
+	} else {
+		collection[message.id] = Object.assign(content, {id: message.id});
+	}
+	return true;
+}
+
+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) {
+		rowid = row.rowid;
+	});
+	while (true) {
+		if (rowid == max_rowid) {
+			await new_message();
+			await ssb.sqlAsync('SELECT MAX(rowid) AS rowid FROM messages', [], function(row) {
+				rowid = row.rowid;
+			});
+		}
+
+		let modified = false;
+		let rows = [];
+		await ssb.sqlAsync(`
+			SELECT messages.id, author, content, timestamp
+			FROM messages
+			JOIN json_each(?1) AS id ON messages.author = id.value
+			WHERE
+				messages.rowid > ?2 AND
+				messages.rowid <= ?3 AND
+				((json_extract(messages.content, '$.type') = ?4 AND
+				(?5 IS NULL OR json_extract(messages.content, '$.parent') = ?5)) OR
+				content LIKE '"%')
+			`,
+			[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)) {
+				modified = true;
+			}
+		}
+		if (modified) {
+			break;
+		}
+	}
+	return [rowid, data];
+});
+
+async function main() {
+	await app.setDocument(utf8Decode(await getFile('index.html')));
+}
+
+main();

apps/journal/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<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 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>
+	</body>
+</html>

apps/journal/tf-id-picker.js

@@ -0,0 +1,36 @@
+import {LitElement, html} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+/*
+** Provide a list of IDs, and this lets the user pick one.
+*/
+class TfIdentityPickerElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			selected: {type: String},
+		};
+	}
+
+	constructor() {
+		super();
+		this.ids = [];
+	}
+
+	changed(event) {
+		this.selected = event.srcElement.value;
+		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>`)}
+			</select>
+		`;
+	}
+}
+
+customElements.define('tf-id-picker', TfIdentityPickerElement);

apps/journal/tf-journal-app.js

@@ -0,0 +1,75 @@
+import {LitElement, html, keyed, live} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+class TfJournalAppElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			owner_ids: {type: Array},
+			whoami: {type: String},
+			journals: {type: Object},
+		};
+	}
+
+	constructor() {
+		super();
+		this.ids = [];
+		this.owner_ids = [];
+		this.journals = {};
+		this.load();
+	}
+
+	async load() {
+		this.ids = await tfrpc.rpc.getIdentities();
+		this.whoami = await tfrpc.rpc.localStorageGet('journal_whoami');
+		await this.read_journals();
+	}
+
+	async read_journals() {
+		let max_rowid;
+		let journals;
+		while (true)
+		{
+			[max_rowid, journals] = await tfrpc.rpc.collection([this.whoami], 'journal-entry', undefined, max_rowid, journals);
+			this.journals = Object.assign({}, journals);
+			console.log('JOURNALS', this.journals);
+		}
+	}
+
+	async on_whoami_changed(event) {
+		let new_id = event.srcElement.selected;
+		await tfrpc.rpc.localStorageSet('journal_whoami', new_id);
+		this.whoami = new_id;
+	}
+
+	async on_journal_publish(event) {
+		let key = event.detail.key;
+		let text = event.detail.text;
+		let message = {
+			type: 'journal-entry',
+			key: key,
+			text: text,
+		};
+		message.recps = [this.whoami];
+		print(message);
+		message = await tfrpc.rpc.encrypt(this.whoami, message.recps, JSON.stringify(message));
+		print(message);
+		await tfrpc.rpc.appendMessage(this.whoami, message);
+	}
+
+	render() {
+		console.log('RENDER APP', this.journals);
+		let self = this;
+		return html`
+			<div>
+				<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>
+		`;
+	}
+}
+
+customElements.define('tf-journal-app', TfJournalAppElement);

apps/journal/tf-journal-entry.js

@@ -0,0 +1,84 @@
+import {LitElement, html, unsafeHTML, range} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+class TfJournalEntryElement extends LitElement {
+	static get properties() {
+		return {
+			whoami: {type: String},
+			key: {type: String},
+			journals: {type: Object},
+			text: {type: String},
+		};
+	}
+
+	constructor() {
+		super();
+		this.journals = {};
+		this.key = new Date().toISOString().split('T')[0];
+	}
+
+	markdown(md) {
+		var reader = new commonmark.Parser({safe: true});
+		var writer = new commonmark.HtmlRenderer();
+		var parsed = reader.parse(md || '');
+		return writer.render(parsed);
+	}
+
+	on_discard(event) {
+		this.text = undefined;
+	}
+
+	async on_publish() {
+		console.log('publish', this.text);
+		this.dispatchEvent(new CustomEvent('publish', {
+			bubbles: true,
+			detail: {
+				key: this.shadowRoot.getElementById('date_picker').value,
+				text: this.text,
+			},
+		}));
+	}
+
+	back_dates(count) {
+		let now = new Date();
+		let result = [];
+		for (let i = 0; i < count; i++) {
+			let next = new Date(now);
+			next.setDate(now.getDate() - i);
+			result.push(next.toISOString().split('T')[0]);
+		}
+		return result;
+	}
+
+	on_edit(event) {
+		this.text = event.srcElement.value;
+	}
+
+	on_date_change(event) {
+		this.key = event.srcElement.value;
+		this.text = this.journals[this.key]?.text;
+	}
+
+	render() {
+		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`
+					<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 @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>
+				<div style="flex: 1 1">${unsafeHTML(this.markdown(this.text ?? this.journals?.[this.key]?.text))}</div>
+			</div>
+		`;
+	}
+}
+
+customElements.define('tf-journal-entry', TfJournalEntryElement);

apps/ssb.json

@@ -1,5 +1,5 @@
 {
   "type": "tildefriends-app",
   "emoji": "🐌",
-  "previous": "&HrGonbL2IZBtoP3zh1glMUO16+PZ4/t0KFTpkNMYoPI=.sha256"
+  "previous": "&DUxMMCJcuhm6S9jg/eKgEyWodkITu6Tg9g5I5wgLWFU=.sha256"
 }

apps/ssb/app.js

@@ -30,6 +30,9 @@ tfrpc.register(async function getIdentities() {
 tfrpc.register(async function getAllIdentities() {
 	return ssb.getAllIdentities();
 });
+tfrpc.register(async function following(ids, depth) {
+	return ssb.following(ids, depth);
+});
 tfrpc.register(async function getBroadcasts() {
 	return ssb.getBroadcasts();
 });

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/index.html

@@ -3,15 +3,15 @@
 	<head>
 		<title>Tilde Friends</title>
 		<base target="_top">
-		<link rel="stylesheet" href="tribute.css" />
+		<link rel="stylesheet" href="tribute.css"/>
 		<style>
 			.tribute-container {
 				color: #000;
 			}
 		</style>
 	</head>
-	<body>
-		<tf-app/>
+	<body style="background-color: #223a5e">
+		<tf-app class="w3-deep-purple"/>
 		<script>window.litDisableBundleWarning = true;</script>
 		<script src="filesaver.min.js"></script>
 		<script src="commonmark.min.js"></script>

apps/ssb/tf-app.js

@@ -75,78 +75,6 @@ class TfElement extends LitElement {
 		}
 	}
 
-	async contacts_internal(id, last_row_id, following, max_row_id) {
-		let result = Object.assign({}, following[id] || {});
-		result.following = result.following || {};
-		result.blocking = result.blocking || {};
-		let contacts = await tfrpc.rpc.query(
-			`
-				SELECT content FROM messages
-				WHERE author = ? AND
-				rowid > ? AND
-				rowid <= ? AND
-				json_extract(content, '$.type') = 'contact'
-				ORDER BY sequence
-			`,
-			[id, last_row_id, max_row_id]);
-		for (let row of contacts) {
-			let contact = JSON.parse(row.content);
-			if (contact.following === true) {
-				result.following[contact.contact] = true;
-			} else if (contact.following === false) {
-				delete result.following[contact.contact];
-			} else if (contact.blocking === true) {
-				result.blocking[contact.contact] = true;
-			} else if (contact.blocking === false) {
-				delete result.blocking[contact.contact];
-			}
-		}
-		following[id] = result;
-		return result;
-	}
-
-	async contact(id, last_row_id, following, max_row_id) {
-		return await this.contacts_internal(id, last_row_id, following, max_row_id);
-	}
-
-	async following_deep_internal(ids, depth, blocking, last_row_id, following, max_row_id) {
-		let contacts = await Promise.all([...new Set(ids)].map(x => this.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 deeper = depth > 1 ? await this.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())];
-	}
-
-	async following_deep(ids, depth, blocking) {
-		const k_cache_version = 5;
-		let cache = await tfrpc.rpc.databaseGet('following');
-		cache = cache ? JSON.parse(cache) : {};
-		if (cache.version !== k_cache_version) {
-			cache = {
-				version: k_cache_version,
-				following: {},
-				last_row_id: 0,
-			};
-		}
-		let max_row_id = (await tfrpc.rpc.query(`
-			SELECT MAX(rowid) AS max_row_id FROM messages
-		`, []))[0].max_row_id;
-		let result = await this.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);
-		/* 2023-02-20: Exceeding message size. */
-		//if (store.length < 512 * 1024) {
-			await tfrpc.rpc.databaseSet('following', store);
-		//}
-		return [result, cache.following];
-	}
-
 	async fetch_about(ids, users) {
 		const k_cache_version = 1;
 		let cache = await tfrpc.rpc.databaseGet('about');
@@ -228,6 +156,7 @@ class TfElement extends LitElement {
 			]);
 		if (messages && messages.length) {
 			this.unread = [...this.unread, ...messages];
+			this.unread = this.unread.slice(this.unread.length - 1024);
 		}
 	}
 
@@ -255,8 +184,10 @@ class TfElement extends LitElement {
 
 	render_id_picker() {
 		return html`
-			<tf-id-picker id="picker" selected=${this.whoami} .ids=${this.ids} @change=${this._handle_whoami_changed}></tf-id-picker>
-			<button @click=${this.create_identity} id="create_identity">Create Identity</button>
+			<div style="display: flex; gap: 8px">
+				<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>
 		`;
 	}
 
@@ -283,9 +214,21 @@ class TfElement extends LitElement {
 	async load() {
 		let whoami = this.whoami;
 		let tags = this.load_recent_tags();
-		let [following, users] = await this.following_deep([whoami], 2, {});
-		users = await this.fetch_about(following.sort(), users);
-		this.following = following;
+		let following = await tfrpc.rpc.following([whoami], 2);
+		let users = {};
+		let by_count = [];
+		for (let [id, v] of Object.entries(following)) {
+			users[id] = {
+				following: v.of,
+				blocking: v.ob,
+				followed: v.if,
+				blocked: v.ib,
+			};
+			by_count.push({count: v.of, id: id});
+		}
+		console.log(by_count.sort((x, y) => y.count - x.count).slice(0, 20));
+		users = await this.fetch_about(Object.keys(following).sort(), users);
+		this.following = Object.keys(following);
 		this.users = users;
 		await tags;
 		console.log(`load finished ${whoami} => ${this.whoami}`);
@@ -342,13 +285,19 @@ class TfElement extends LitElement {
 			});
 		}
 
+		const k_tabs = {
+			'📰': 'news',
+			'📡': 'connections',
+			'@': 'mentions',
+			'🔍': 'search',
+			'👩‍💻': 'query',
+		};
+
 		let tabs = html`
-			<div>
-				<input type="button" class="tab" value="News" ?disabled=${self.tab == 'news'} @click=${() => self.set_tab('news')}></input>
-				<input type="button" class="tab" value="Connections" ?disabled=${self.tab == 'connections'} @click=${() => self.set_tab('connections')}></input>
-				<input type="button" class="tab" value="Mentions" ?disabled=${self.tab == 'mentions'} @click=${() => self.set_tab('mentions')}></input>
-				<input type="button" class="tab" value="Search" ?disabled=${self.tab == 'search'} @click=${() => self.set_tab('search')}></input>
-				<input type="button" class="tab" value="Query" ?disabled=${self.tab == 'query'} @click=${() => self.set_tab('query')}></input>
+			<div class="w3-bar w3-black">
+				${Object.entries(k_tabs).map(([k, v]) => html`
+				<button title=${v} 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 =

apps/ssb/tf-compose.js

@@ -314,7 +314,7 @@ class TfComposeElement extends LitElement {
 		return html`
 			<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>
@@ -357,12 +357,12 @@ class TfComposeElement extends LitElement {
 
 		if (this.apps) {
 			return html`
-				<div>
-					<select id="select">
+				<div class="w3-card-4 w3-margin w3-padding">
+					<select id="select" class="w3-select w3-dark-grey">
 						${Object.keys(self.apps).map(app => html`<option value=${app}>${app}</option>`)}
 					</select>
-					<input type="button" value="Attach" @click=${attach_selected_app}></input>
-					<input type="button" value="Cancel" @click=${() => this.apps = null}></input>
+					<button class="w3-button w3-dark-grey" @click=${attach_selected_app}>Attach</button>
+					<button class="w3-button w3-dark-grey" @click=${() => this.apps = null}>Cancel</button>
 				</div>
 				`;
 		}
@@ -374,9 +374,9 @@ 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 +392,17 @@ class TfComposeElement extends LitElement {
 		let draft = this.get_draft();
 		if (draft.content_warning !== undefined) {
 			return html`
-				<div>
-					<input type="checkbox" id="cw" @change=${() => self.set_content_warning(undefined)} checked></input>
-					<label for="cw">CW</label>
-					<input type="text" id="content_warning" @input=${this.input} @change=${this.change} value=${draft.content_warning}></input>
+				<div class="w3-container w3-padding">
+					<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>
+					</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,13 +432,13 @@ 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`
 					<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>`)}
 			</ul>
 		`;
@@ -454,28 +456,34 @@ class TfComposeElement extends LitElement {
 		let draft = self.get_draft();
 		let content_warning =
 			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">
+				<p id="content_warning_preview">${draft.content_warning}</p>
+			</div>` :
 			undefined;
 		let encrypt = draft.encrypt_to !== undefined ?
 			undefined :
-			html`<input type="button" value="🔐" @click=${() => this.set_encrypt([])}></input>`;
+			html`<button class="w3-button w3-dark-grey" @click=${() => this.set_encrypt([])}>🔐</button>`;
 		let result = html`
-			${this.render_encrypt()}
-			<div style="display: flex; flex-direction: row; width: 100%">
-				<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%">
-					${content_warning}
-					<div id="preview"></div>
+			<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%; gap: 4px">
+					<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))}
+				${this.render_attach_app()}
+				${this.render_content_warning()}
+				<button class="w3-button w3-dark-grey" id="submit" @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>
-			${Object.values(draft.mentions || {}).map(x => self.render_mention(x))}
-			${this.render_content_warning()}
-			${this.render_attach_app()}
-			<input type="button" id="submit" value="Submit" @click=${this.submit}></input>
-			<input type="button" value="Attach" @click=${this.attach}></input>
-			${this.render_attach_app_button()}
-			${encrypt}
-			<input type="button" value="Discard" @click=${this.discard}></input>
 		`;
 		return result;
 	}

apps/ssb/tf-id-picker.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';
 
 /*
 ** Provide a list of IDs, and this lets the user pick one.
@@ -9,12 +10,16 @@ class TfIdentityPickerElement extends LitElement {
 		return {
 			ids: {type: Array},
 			selected: {type: String},
+			users: {type: Object},
 		};
 	}
 
+	static styles = styles;
+
 	constructor() {
 		super();
 		this.ids = [];
+		this.users = {};
 	}
 
 	changed(event) {
@@ -26,8 +31,8 @@ class TfIdentityPickerElement extends LitElement {
 
 	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>`)}
+			<select 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

@@ -213,9 +213,9 @@ class TfMessageElement extends LitElement {
 		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>`)}`;
 			}
 		}
 	}
@@ -250,22 +250,29 @@ 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`<button class="w3-button w3-dark-grey" @click=${() => self.format = 'raw'}>Raw</button>`;
 				break;
 			default:
-				raw_button = html`<input type="button" value="Raw" @click=${() => self.format = 'raw'}></input>`;
+				if (this.message.decrypted) {
+					raw_button = html`<button class="w3-button w3-dark-grey" @click=${() => self.format = 'decrypted'}>Decrypted</button>`;
+				} else {
+					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>
 					${raw_button}
@@ -276,14 +283,14 @@ class TfMessageElement extends LitElement {
 		}
 		if (this.message?.type === 'contact_group') {
 			return html`
-				<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere">
+				<div class="w3-card-4" style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere">
 					${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`
-				<div style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px; overflow-wrap: anywhere">
+				<div class="w3-card-4" 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`
@@ -344,7 +351,7 @@ class TfMessageElement extends LitElement {
 						.drafts=${this.drafts}
 						@tf-discard=${this.discard_reply}></tf-compose>
 				` : html`
-					<input type="button" value="Reply" @click=${this.show_reply}></input>
+					<button class="w3-button w3-dark-grey" @click=${this.show_reply}>Reply</button>
 				`;
 				let self = this;
 				let body;
@@ -358,9 +365,12 @@ class TfMessageElement extends LitElement {
 					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 =
 					html`
@@ -394,7 +404,7 @@ 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}
@@ -404,10 +414,10 @@ class TfMessageElement extends LitElement {
 						</div>
 						${payload}
 						${this.render_votes()}
-						<div>
+						<p>
 							${reply}
-							<input type="button" value="React" @click=${this.react}></input>
-						</div>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>React</button>
+						</p>
 						${this.render_children()}
 					</div>
 				`;
@@ -429,7 +439,7 @@ 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}
@@ -439,9 +449,9 @@ class TfMessageElement extends LitElement {
 						</div>
 						${content.text}
 						${this.render_votes()}
-						<div>
-							<input type="button" value="React" @click=${this.react}></input>
-						</div>
+						<p>
+							<button class="w3-button w3-dark-grey" @click=${this.react}>React</button>
+						</p>
 						${this.render_children()}
 					</div>
 				`;
@@ -477,6 +487,17 @@ 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 {
@@ -492,7 +513,7 @@ 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>
@@ -502,7 +523,12 @@ class TfMessageElement extends LitElement {
 
 						<div>${body}</div>
 						${this.render_mentions()}
+						<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') {
@@ -526,7 +552,11 @@ class TfMessageElement extends LitElement {
 				`);
 			} else if (typeof(this.message.content) == 'string') {
 				if (this.message?.decrypted) {
-					return small_frame(html`<span>🔓</span><pre>${JSON.stringify(this.decrypted, null, 2)}</pre>`);
+					if (this.format == 'decrypted') {
+						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>`);
+					}
 				} else {
 					return small_frame(html`<span>🔒</span>`);
 				}

apps/ssb/tf-profile.js

@@ -12,6 +12,8 @@ class TfProfileElement extends LitElement {
 			users: {type: Object},
 			size: {type: Number},
 			server_follows_me: {type: Boolean},
+			following: {type: Boolean},
+			blocking: {type: Boolean},
 		};
 	}
 
@@ -28,11 +30,39 @@ class TfProfileElement extends LitElement {
 		this.server_follows_me = undefined;
 	}
 
+	async load() {
+		if (this.whoami !== this._follow_whoami) {
+			this._follow_whoami = this.whoami;
+			this.following = undefined;
+			this.blocking = undefined;
+
+			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.following = result?.[0]?.following ?? false;
+			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.blocking = result?.[0]?.blocking ?? false;
+		}
+	}
+
 	async initial_load() {
 		this.server_follows_me = undefined;
 		let server_id = await tfrpc.rpc.getServerIdentity();
 		let followed = await tfrpc.rpc.query(`
-			SELECT json_extract(content, '$.following') AS following FROM messages
+			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
@@ -76,6 +106,7 @@ class TfProfileElement extends LitElement {
 			name: original.name,
 			description: original.description,
 			image: original.image,
+			publicWebHosting: original.publicWebHosting,
 		};
 		console.log(this.editing);
 	}
@@ -138,6 +169,7 @@ class TfProfileElement extends LitElement {
 		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(
@@ -152,47 +184,49 @@ 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>
-					<input type="button" value="Discard" @click=${this.discard_edits}></input>
+					<button class="w3-button w3-dark-grey" @click=${this.save_edits}>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 &&
-			this.users[this.whoami]?.following) {
+			this.following !== undefined) {
 			follow =
-				this.users[this.whoami].following[this.id] ?
-				html`<input type="button" value="Unfollow" @click=${this.unfollow}></input>` :
-				html`<input type="button" value="Follow" @click=${this.follow}></input>`;
+				this.following ?
+				html`<button class="w3-button w3-dark-grey" @click=${this.unfollow}>Unfollow</button>` :
+				html`<button class="w3-button w3-dark-grey" @click=${this.follow}>Follow</button>`;
 		}
 		if (this.id !== this.whoami &&
-			this.users[this.whoami]?.blocking) {
+			this.blocking !== undefined) {
 			block =
-				this.users[this.whoami].blocking[this.id] ?
-				html`<input type="button" value="Unblock" @click=${this.unblock}></input>` :
-				html`<input type="button" value="Block" @click=${this.block}></input>`;
+				this.blocking ?
+				html`<button class="w3-button w3-dark-grey" @click=${this.unblock}>Unblock</button>` :
+				html`<button class="w3-button w3-dark-grey" @click=${this.block}>Block</button>`;
 		}
 		let edit_profile = this.editing ? html`
-			<div style="flex: 1 0 50%; display: flex; flex-direction: column">
-				<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>
-				</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>
-				<div>
-					<label for="public_web_hosting">Public Web Hosting:</label>
-					<input type="checkbox" id="public_web_hosting" value=${this.editing.public_web_hosting} @input=${event => this.editing = Object.assign({}, this.editing, {publicWebHosting: event.srcElement.checked})}></input>
-				</div>
-				<div>
-					<input type="button" value="Attach Image" @click=${this.attach_image}></input>
+			<div style="flex: 1 0 50%; display: flex; flex-direction: column; gap: 8px">
+				<div class="w3-container">
+					<div>
+						<label for="name">Name:</label>
+						<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 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 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>
+						<button class="w3-button w3-dark-grey" @click=${this.attach_image}>Attach Image</button>
+					</div>
 				</div>
 			</div>` : null;
 		let image = typeof(profile.image) == 'string' ? profile.image : profile.image?.link;
@@ -208,10 +242,10 @@ class TfProfileElement extends LitElement {
 				</div>
 			</div>
 			<div>
-				Following ${Object.keys(profile.following || {}).length} identities.
-				Followed by ${Object.values(self.users).filter(x => (x.following || {})[self.id]).length} identities.
-				Blocking ${Object.keys(profile.blocking || {}).length} identities.
-				Blocked by ${Object.values(self.users).filter(x => (x.blocking || {})[self.id]).length} identities.
+				Following ${profile.following} identities.
+				Followed by ${profile.followed} identities.
+				Blocking ${profile.blocking} identities.
+				Blocked by ${profile.blocked} identities.
 			</div>
 			<div>
 				${edit}

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,258 @@ div.img_caption::after {
 	content: ' ±';
 }
 
-blockquote {
-	border-left: 4px solid #fff;
-	margin-left: 0px;
-	padding-left: 8px;
+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;
+	padding: 8px;
+	padding-left: 12px;
+}
+`;
+
+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;
@@ -55,7 +58,7 @@ 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 +67,7 @@ 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,7 +81,7 @@ 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})`}
 			<ul>
@@ -91,35 +94,35 @@ class TfTabConnectionsElement extends LitElement {
 	render() {
 		let self = this;
 		return html`
-			<h2>New Connection</h2>
-			<div style="display: flex; flex-direction: column">
-				<textarea id="code"></textarea>
+			<div class="w3-container">
+				<h2>New Connection</h2>
+				<textarea class="w3-input w3-dark-grey" id="code"></textarea>
+				<button class="w3-button w3-dark-grey" @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))}
+				</ul>
+				<h2>Connections</h2>
+				<ul>
+					${this.connections.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`
+						<li>
+							<button class="w3-button w3-dark-grey" @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>`)}
+				</ul>
 			</div>
-			<input type="button" @click=${() => tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)} value="Connect"></input>
-			<h2>Broadcasts</h2>
-			<ul>
-				${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`
-					<li>${this.render_connection(x)}</li>
-				`)}
-			</ul>
-			<h2>Stored Connections (WIP)</h2>
-			<ul>
-				${this.stored_connections.map(x => html`
-					<li>
-						<input type="button" @click=${() => self.forget_stored_connection(x)} value="Forget"></input>
-						<input type="button" @click=${() => tfrpc.rpc.connect(x)} value="Connect"></input>
-						${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>`)}
-			</ul>
 		`;
 	}
 }

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

@@ -65,34 +65,39 @@ class TfTabNewsFeedElement extends LitElement {
 					this.hash.substring(1),
 				]);
 		} else {
-			return await tfrpc.rpc.query(
-				`
-					WITH news AS (SELECT messages.*
-					FROM messages
-					JOIN json_each(?) AS following ON messages.author = following.value
-					WHERE messages.timestamp > ? AND messages.timestamp < ?
-					ORDER BY messages.timestamp DESC)
-					SELECT messages.*
-						FROM news
-						JOIN messages_refs ON news.id = messages_refs.ref
-						JOIN messages ON messages_refs.message = messages.id
-					UNION
-					SELECT messages.*
-						FROM news
-						JOIN messages_refs ON news.id = messages_refs.message
-						JOIN messages ON messages_refs.ref = messages.id
-					UNION
-					SELECT news.* FROM news
-				`,
-				[
-					JSON.stringify(this.following),
-					this.start_time,
-					/*
-					** Don't show messages more than a day into the future to prevent
-					** messages with far-future timestamps from staying at the top forever.
-					*/
-					new Date().valueOf() + 24 * 60 * 60 * 1000,
-				]);
+			let promises = [];
+			const k_following_limit = 256;
+			for (let i = 0; i < this.following.length; i += k_following_limit) {
+				promises.push(tfrpc.rpc.query(
+					`
+						WITH news AS (SELECT messages.*
+						FROM messages
+						JOIN json_each(?) AS following ON messages.author = following.value
+						WHERE messages.timestamp > ? AND messages.timestamp < ?
+						ORDER BY messages.timestamp DESC)
+						SELECT messages.*
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.ref
+							JOIN messages ON messages_refs.message = messages.id
+						UNION
+						SELECT messages.*
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.message
+							JOIN messages ON messages_refs.ref = messages.id
+						UNION
+						SELECT news.* FROM news
+					`,
+					[
+						JSON.stringify(this.following.slice(i, i + k_following_limit)),
+						this.start_time,
+						/*
+						** Don't show messages more than a day into the future to prevent
+						** messages with far-future timestamps from staying at the top forever.
+						*/
+						new Date().valueOf() + 24 * 60 * 60 * 1000,
+					]));
+			}
+			return [].concat(...(await Promise.all(promises)));
 		}
 	}
 
@@ -128,6 +133,7 @@ class TfTabNewsFeedElement extends LitElement {
 	}
 
 	async decrypt(messages) {
+		console.log('decrypt');
 		let result = [];
 		for (let message of messages) {
 			let content;
@@ -162,7 +168,7 @@ class TfTabNewsFeedElement extends LitElement {
 		if (!this.messages ||
 			this._messages_hash !== this.hash ||
 			this._messages_following !== this.following) {
-			console.log(`loading messages for ${this.whoami}`);
+			console.log(`loading messages for ${this.whoami} (following ${this.following.length})`);
 			let self = this;
 			this.messages = [];
 			this._messages_hash = this.hash;
@@ -177,7 +183,9 @@ class TfTabNewsFeedElement extends LitElement {
 		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`

apps/ssb/tf-tab-news.js

@@ -66,7 +66,7 @@ class TfTabNewsElement extends LitElement {
 			}
 			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) {
@@ -106,8 +106,9 @@ class TfTabNewsElement extends LitElement {
 		let profile = this.hash.startsWith('#@') ?
 			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>
-			<a target="_top" href="#" ?hidden=${this.hash.length <= 1}>🏠Home</a>
+			<p class="w3-bar">
+				<button class="w3-bar-item w3-button w3-dark-grey" @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}

apps/ssb/tf-tab-query.js

@@ -99,9 +99,9 @@ class TfTabQueryElement extends LitElement {
 		}
 		let self = this;
 		return html`
-			<div style="display: flex; flex-direction: row">
-				<textarea id="search" rows=8 style="flex: 1" @keydown=${this.search_keydown}>${this.query}</textarea>
-				<input type="button" value="Execute" @click=${(event) => self.search(self.renderRoot.getElementById('search').value)}></input>
+			<div style="display: flex; flex-direction: row; gap: 4px">
+				<textarea 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}>Executing...</div>

apps/ssb/tf-tab-search.js

@@ -75,9 +75,9 @@ class TfTabSearchElement extends LitElement {
 		}
 		let self = this;
 		return html`
-			<div style="display: flex; flex-direction: row">
-				<input type="text" 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>
+			<div style="display: flex; flex-direction: row; gap: 4px">
+				<input type="text" class="w3-input w3-dark-grey" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></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-utils.js

@@ -46,14 +46,14 @@ function image(node, entering) {
 }
 
 export function markdown(md) {
-	var reader = new commonmark.Parser({safe: true});
-	var writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser({safe: true});
+	let writer = new commonmark.HtmlRenderer();
 	writer.image = image;
-	var parsed = reader.parse(md || '');
-	parsed = linkify.transform(parsed);
+	let parsed = reader.parse(md || '');
 	parsed = hashtagify.transform(parsed);
-	var walker = parsed.walker();
-	var event, node;
+	parsed = linkify.transform(parsed);
+	let walker = parsed.walker();
+	let event, node;
 	while ((event = walker.next())) {
 		node = event.node;
 		if (event.entering) {

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

@@ -35,7 +35,7 @@
 						<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 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>
+					<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">
@@ -120,7 +120,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>
@@ -150,11 +150,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>

apps/wiki.json

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

apps/wiki/app.js

@@ -0,0 +1,81 @@
+import * as tfrpc from '/tfrpc.js';
+import * as utils from './utils.js';
+
+let g_hash;
+let g_collection_notifies = {};
+
+tfrpc.register(async function getOwnerIdentities() {
+	return ssb.getOwnerIdentities();
+});
+
+tfrpc.register(async function getIdentities() {
+	return ssb.getIdentities();
+});
+
+tfrpc.register(async function query(sql, args) {
+	let result = [];
+	await ssb.sqlAsync(sql, args, function callback(row) {
+		result.push(row);
+	});
+	return result;
+});
+
+tfrpc.register(async function localStorageGet(key) {
+	return app.localStorageGet(key);
+});
+
+tfrpc.register(async function localStorageSet(key, value) {
+	return app.localStorageSet(key, value);
+});
+
+tfrpc.register(async function following(ids, depth) {
+	return ssb.following(ids, depth);
+});
+
+tfrpc.register(async function appendMessage(id, message) {
+	print('APPENDING', message);
+	return ssb.appendMessageWithIdentity(id, message);
+});
+
+tfrpc.register(async function store_blob(blob) {
+	if (Array.isArray(blob)) {
+		blob = Uint8Array.from(blob);
+	}
+	return await ssb.blobStore(blob);
+});
+
+tfrpc.register(async function get_blob(id) {
+	return utf8Decode(await ssb.blobGet(id));
+});
+
+core.register('message', async function message_handler(message) {
+	if (message.event == 'hashChange') {
+		g_hash = message.hash;
+		await tfrpc.rpc.hash_changed(message.hash);
+	}
+});
+
+tfrpc.register(function set_hash(hash) {
+	if (g_hash != hash) {
+		return app.setHash(hash);
+	}
+});
+
+tfrpc.register(function get_hash(id, message) {
+	return g_hash;
+});
+
+tfrpc.register(async function try_decrypt(id, content) {
+	return await ssb.privateMessageDecrypt(id, content);
+});
+tfrpc.register(async function encrypt(id, recipients, content) {
+	return await ssb.privateMessageEncrypt(id, recipients, content);
+});
+
+tfrpc.register(utils.collection);
+
+async function main() {
+	await app.setDocument(utf8Decode(await getFile('index.html')));
+}
+
+main();

apps/wiki/handler.js

@@ -0,0 +1,73 @@
+import * as utils from './utils.js';
+import * as commonmark from './commonmark.min.js';
+
+function markdown(md) {
+	let reader = new commonmark.Parser({safe: true});
+	let writer = new commonmark.HtmlRenderer();
+	let parsed = reader.parse(md || '');
+	let walker = parsed.walker();
+	let event;
+	while ((event = walker.next())) {
+		let node = event.node;
+		if (event.entering) {
+			if (node.destination?.startsWith('&')) {
+				node.destination = '/' + node.destination + '/view?filename=' + node.firstChild?.literal;
+			} else if (node.type === 'link') {
+				if (node.destination.indexOf(':') == -1 &&
+					node.destination.indexOf('/') == -1) {
+					node.destination = `${node.destination}`;
+				}
+			}
+		}
+	}
+	return writer.render(parsed);
+}
+
+async function main() {
+	let slash = request.path.indexOf('/');
+	if (slash != -1) {
+		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 [max_row_id, wikis] = await utils.collection(ids, 'wiki', null, -1, {});
+		let wiki;
+		for (let w of Object.values(wikis)) {
+			if (w.name === wiki_name && !w.tombstone) {
+				wiki = w;
+				break;
+			}
+		}
+		let wiki_doc;
+		if (wiki) {
+			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;
+					break;
+				}
+			}
+		}
+
+		let md;
+		if (wiki_doc?.blob) {
+			md = utf8Decode(await ssb.blobGet(wiki_doc.blob));
+		}
+
+		await respond({
+			data: `
+				<h1>${wiki_name}: ${wiki_doc_name}</h1>
+				<div>${markdown(md)}</div>
+			`,
+			content_type: 'text/html; charset=utf-8',
+			status_code: 200,
+		});
+	} else {
+		await respond({
+			data: '<h1>File not found</h1>',
+			content_type: 'text/html',
+			status_code: 404,
+		});
+	}
+}
+main();

apps/wiki/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<base target="_top">
+	</head>
+	<body style="color: #fff">
+		<tf-collections-app></tf-collections-app>
+		<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>
+		<script src="tf-wiki-app.js" type="module"></script>
+	</body>
+</html>

apps/wiki/tf-collection.js

@@ -0,0 +1,95 @@
+import {LitElement, html} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+class TfCollectionElement extends LitElement {
+	static get properties() {
+		return {
+			whoami: {type: String},
+			collection: {type: Object},
+			selected_id: {type: String},
+			is_creating: {type: Boolean},
+			is_renaming: {type: Boolean},
+		};
+	}
+
+	on_create(event) {
+		let name = this.shadowRoot.getElementById('create_name').value;
+		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', {
+			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}'?`)) {
+			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', {
+			bubbles: true,
+			detail: {
+				id: id,
+				value: this.collection[id],
+			},
+		}));
+	}
+
+	render() {
+		let self = this;
+		return html`
+			<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>`)}
+				</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>
+					</span>
+				</span>
+				<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>
+				</span>
+				<button @click=${() => self.is_creating = true} ?hidden=${this.is_creating || !this.whoami}>+</button>
+			</span>
+		`;
+	}
+}
+
+customElements.define('tf-collection', TfCollectionElement);

apps/wiki/tf-id-picker.js

@@ -0,0 +1,36 @@
+import {LitElement, html} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+/*
+** Provide a list of IDs, and this lets the user pick one.
+*/
+class TfIdentityPickerElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			selected: {type: String},
+		};
+	}
+
+	constructor() {
+		super();
+		this.ids = [];
+	}
+
+	changed(event) {
+		this.selected = event.srcElement.value;
+		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>`)}
+			</select>
+		`;
+	}
+}
+
+customElements.define('tf-id-picker', TfIdentityPickerElement);

apps/wiki/tf-wiki-app.js

@@ -0,0 +1,312 @@
+import {LitElement, html, keyed} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+
+class TfCollectionsAppElement extends LitElement {
+	static get properties() {
+		return {
+			ids: {type: Array},
+			owner_ids: {type: Array},
+			whoami: {type: String},
+			following: {type: Array},
+
+			wikis: {type: Object},
+			wiki_docs: {type: Object},
+
+			wiki: {type: Object},
+			wiki_doc: {type: Object},
+			hash: {type: String},
+
+			adding_editor: {type: Boolean},
+			expand_editors: {type: Boolean},
+		};
+	}
+
+	constructor() {
+		super();
+		this.ids = [];
+		this.owner_ids = [];
+		this.following = [];
+		this.load();
+		let self = this;
+		tfrpc.register(function hash_changed(hash) {
+			self.notify_hash_changed(hash);
+		});
+		tfrpc.rpc.get_hash().then(hash => self.notify_hash_changed(hash));
+	}
+
+	async load() {
+		this.ids = await tfrpc.rpc.getIdentities();
+		this.owner_ids = await tfrpc.rpc.getOwnerIdentities();
+		this.whoami = await tfrpc.rpc.localStorageGet('collections_whoami');
+		let ids = [...new Set([...this.owner_ids, this.whoami])].sort();
+		this.following = Object.keys(await tfrpc.rpc.following(ids, 1)).sort();
+
+		await this.read_wikis();
+		await this.read_Wiki_docs();
+	}
+
+	async read_wikis() {
+		let max_rowid;
+		let wikis;
+		let start_whoami = this.whoami;
+		while (true)
+		{
+			console.log('read_wikis', this.whoami);
+			[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;
+			}
+			console.log('wikis =>', wikis);
+			this.wikis = wikis;
+			this.update_wiki();
+		}
+	}
+
+	async read_wiki_docs() {
+		if (!this.wiki?.id) {
+			return;
+		}
+		let start_id = this.wiki.id;
+		let max_rowid;
+		let wiki_docs;
+		while (true)
+		{
+			[max_rowid, wiki_docs] = await tfrpc.rpc.collection(this.wiki?.editors, 'wiki-doc', this.wiki?.id, max_rowid, wiki_docs);
+			if (this.wiki?.id !== start_id) {
+				break;
+			}
+			this.wiki_docs = wiki_docs;
+			this.update_wiki_doc();
+		}
+	}
+
+	hash_wiki() {
+		let hash = this.hash ?? '';
+		hash = hash.charAt(0) == '#' ? hash.substring(1) : hash;
+		let parts = hash.split('/');
+		return parts[0];
+	}
+
+	hash_wiki_doc() {
+		let hash = this.hash ?? '';
+		hash = hash.charAt(0) == '#' ? hash.substring(1) : hash;
+		let slash = hash.indexOf('/');
+		return slash != -1 ? hash.substring(slash + 1) : undefined; 
+	}
+
+	update_wiki() {
+		let want_wiki = this.hash_wiki();
+		for (let wiki of Object.values(this.wikis ?? {})) {
+			if (wiki.name === want_wiki) {
+				this.wiki = wiki;
+				this.read_wiki_docs();
+				break;
+			}
+		}
+	}
+
+	update_wiki_doc() {
+		let want_wiki_doc = this.hash_wiki_doc();
+		for (let wiki_doc of Object.values(this.wiki_docs ?? {})) {
+			if (wiki_doc.name === want_wiki_doc) {
+				this.wiki_doc = wiki_doc;
+			}
+		}
+	}
+
+	notify_hash_changed(hash) {
+		this.hash = hash;
+		this.update_wiki();
+		this.update_wiki_doc();
+	}
+
+	async on_whoami_changed(event) {
+		let new_id = event.srcElement.selected;
+		await tfrpc.rpc.localStorageSet('collections_whoami', new_id);
+		this.whoami = new_id;
+	}
+
+	update_hash() {
+		tfrpc.rpc.set_hash(this.wiki_doc ? `${this.wiki.name}/${this.wiki_doc.name}` : `${this.wiki.name}`);
+	}
+
+	async on_wiki_changed(event) {
+		this.wiki = event.detail.value;
+		this.wiki_doc = undefined;
+		this.wiki_docs = undefined;
+		this.adding_editor = false;
+		this.update_hash();
+		this.read_wiki_docs();
+	}
+
+	async on_wiki_create(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki',
+			name: event.detail.name,
+		});
+	}
+
+	async on_wiki_rename(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki',
+			key: event.detail.id,
+			name: event.detail.name,
+		});
+	}
+
+	async on_add_editor(event) {
+		let id = this.shadowRoot.getElementById('add_editor').value;
+		let editors = [...this.wiki.editors];
+		if (editors.indexOf(id) == -1) {
+			editors.push(id);
+			editors.sort();
+		}
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki',
+			key: this.wiki.id,
+			editors: editors,
+		});
+		this.adding_editor = false;
+	}
+
+	async on_remove_editor(id) {
+		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);
+			}
+			await tfrpc.rpc.appendMessage(this.whoami, {
+				type: 'wiki',
+				key: this.wiki.id,
+				editors: editors,
+			});
+		}
+	}
+
+	async on_wiki_tombstone(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki',
+			key: event.detail.id,
+			tombstone: {
+				date: new Date().valueOf(),
+				reason: 'tombstoned by user',
+			},
+		});
+	}
+
+	async on_wiki_doc_create(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki-doc',
+			parent: this.wiki.id,
+			name: event.detail.name,
+		});
+	}
+
+	async on_wiki_doc_rename(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki-doc',
+			parent: this.wiki.id,
+			key: event.detail.id,
+			name: event.detail.name,
+		});
+	}
+
+	async on_wiki_doc_tombstone(event) {
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'wiki-doc',
+			parent: this.wiki.id,
+			key: event.detail.id,
+			tombstone: {
+				date: new Date().valueOf(),
+				reason: 'tombstoned by user',
+			},
+		});
+	}
+
+	async on_wiki_doc_changed(event) {
+		this.wiki_doc = event.detail.value;
+		this.update_hash();
+	}
+
+	updated(changed_properties) {
+		if (changed_properties.has('whoami')) {
+			this.wikis = {};
+			this.wiki_docs = {};
+			this.read_wikis();
+		}
+	}
+
+	render() {
+		let self = this;
+		return html`
+			<style>
+				.toc:hover {
+					background-color: #0cc;
+				}
+				.toc.selected {
+					background-color: #088;
+				}
+			</style>
+			<div>
+				<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
+					.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>`)}
+				${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 : ''}
+					@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>`)}
+				<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>`)}
+							<li>
+								<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>
+								</div>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</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`
+						<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>
+						<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>
+				` : undefined}
+			</div>
+		`;
+	}
+}
+
+customElements.define('tf-collections-app', TfCollectionsAppElement);

apps/wiki/tf-wiki-doc.js

@@ -0,0 +1,271 @@
+import {LitElement, html, unsafeHTML} from './lit-all.min.js';
+import * as tfrpc from '/static/tfrpc.js';
+import * as commonmark from './commonmark.min.js';
+
+class TfWikiDocElement extends LitElement {
+	static get properties() {
+		return {
+			whoami: {type: String},
+			wiki: {type: Object},
+			value: {type: Object},
+			blob: {type: String},
+			blob_original: {type: String},
+			blob_for_value: {type: String},
+			is_editing: {type: Boolean},
+		};
+	}
+
+	constructor() {
+		super();
+	}
+
+	markdown(md) {
+		let reader = new commonmark.Parser({safe: true});
+		let writer = new commonmark.HtmlRenderer();
+		let parsed = reader.parse(md || '');
+		let walker = parsed.walker();
+		let event;
+		while ((event = walker.next())) {
+			let node = event.node;
+			if (event.entering) {
+				if (node.destination?.startsWith('&')) {
+					node.destination = '/' + 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}`;
+					}
+				}
+			}
+		}
+		return writer.render(parsed);
+	}
+
+	title(md) {
+		let lines = (md || '').split('\n');
+		for (let line of lines) {
+			let m = line.match(/#+ (.*)/);
+			if (m) {
+				return m[1];
+			}
+		}
+	}
+
+	summary(md) {
+		let lines = (md || '').split('\n');
+		let result = [];
+		let have_content = false;
+		for (let line of lines) {
+			if (have_content && !line.trim().length) {
+				return result.join('\n');
+			}
+			if (!line.startsWith('#') && line.trim().length) {
+				have_content = true;
+			}
+			if (!line.startsWith('#')) {
+				result.push(line);
+			}
+		}
+		return result.join('\n');
+	}
+
+	thumbnail(md) {
+		let m = md ? md.match(/\!\[image:[^\]]+\]\((\&.{44}\.sha256)\).*/) : undefined;
+		return m ? m[1] : undefined;
+	}
+
+	async load_blob() {
+		let blob = await tfrpc.rpc.get_blob(this.value?.blob);
+		if (blob.endsWith('.box')) {
+			let d = await tfrpc.rpc.try_decrypt(this.whoami, blob);
+			if (d) {
+				blob = d;
+			}
+		}
+		this.blob = blob;
+		this.blob_original = blob;
+	}
+
+	on_edit(event) {
+		this.blob = event.srcElement.value;
+	}
+
+	on_discard(event) {
+		this.blob = this.blob_original;
+		this.is_editing = false;
+	}
+
+	async append_message(draft) {
+		let blob = this.blob;
+		if (draft || this.value?.private) {
+			blob = await tfrpc.rpc.encrypt(this.whoami, this.wiki.editors, blob);
+		}
+		let id = await tfrpc.rpc.store_blob(blob);
+		let message = {
+			type: 'wiki-doc',
+			key: this.value.id,
+			parent: this.value.parent,
+			blob: id,
+			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));
+		}
+		await tfrpc.rpc.appendMessage(this.whoami, message);
+		this.is_editing = false;
+	}
+
+	async on_save_draft() {
+		return this.append_message(true);
+	}
+
+	async on_publish() {
+		return this.append_message(false);
+	}
+
+	async on_blog_publish() {
+		let blob = this.blob;
+		let id = await tfrpc.rpc.store_blob(blob);
+		let message = {
+			type: 'blog',
+			key: this.value.id,
+			parent: this.value.parent,
+			title: this.title(blob),
+			summary: this.summary(blob),
+			thumbnail: this.thumbnail(blob),
+			blog: id,
+			mentions: this.blob.match(/(&.{44}.sha256)/g)?.map(x => ({link: x})),
+		};
+		await tfrpc.rpc.appendMessage(this.whoami, message);
+		this.is_editing = false;
+	}
+
+	convert_to_format(buffer, type, mime_type) {
+		return new Promise(function(resolve, reject) {
+			let img = new Image();
+			img.onload = function() {
+				let canvas = document.createElement('canvas');
+				let width_scale = Math.min(img.width, 1024) / img.width;
+				let height_scale = Math.min(img.height, 1024) / img.height;
+				let scale = Math.min(width_scale, height_scale);
+				canvas.width = img.width * scale;
+				canvas.height = img.height * scale;
+				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));
+				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 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);
+					if (!best_buffer || test_buffer.length < best_buffer.length) {
+						best_buffer = test_buffer;
+						best_type = format;
+					}
+				}
+				buffer = best_buffer;
+				type = best_type;
+				let id = await tfrpc.rpc.store_blob(buffer);
+				let name = type.split('/')[0] + ':' + file.name;
+				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);
+		}
+	}
+
+	paste(event) {
+		let self = this;
+		for (let item of event.clipboardData.items) {
+			let file = item.getAsFile();
+			if (file) {
+				self.add_file(event.srcElement, file);
+				event.preventDefault();
+			}
+		}
+	}
+
+	render() {
+		let value = JSON.stringify(this.value);
+		if (this.blob_for_value != value) {
+			this.blob_for_value = value;
+			this.blob = undefined;
+			this.blob_original = undefined;
+			this.load_blob();
+		}
+		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 ?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 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' : ''}"
+					@input=${this.on_edit}
+					@paste=${this.paste}
+					.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">
+						<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))}
+				</div>
+			</div>
+		`;
+	}
+}
+
+customElements.define('tf-wiki-doc', TfWikiDocElement);

apps/wiki/utils.js

@@ -0,0 +1,105 @@
+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 || [])) {
+			x = await ssb.privateMessageDecrypt(id, content);
+			if (x) {
+				try {
+					content = JSON.parse(x);
+					content.draft = true;
+					break;
+				} catch {
+					return;
+				}
+			}
+		}
+		if (!x) {
+			return;
+		}
+		if (content.type !== kind ||
+			(parent && content.parent !== parent)) {
+			return;
+		}
+	} else {
+		content.draft = false;
+	}
+	if (content?.key) {
+		if (content?.tombstone) {
+			delete collection[content.key];
+		} else {
+			collection[content.key] = Object.assign(collection[content.key] || {}, content);
+		}
+	} else {
+		collection[message.id] = Object.assign(content, {id: message.id});
+		if (!collection[message.id].editors) {
+			collection[message.id].editors = [message.author];
+		}
+	}
+	return true;
+}
+
+let g_new_message_resolve;
+let g_new_message_promise = new Promise(function(resolve, reject) {
+	g_new_message_resolve = resolve;
+});
+
+function new_message() {
+	return g_new_message_promise;
+}
+
+ssb.addEventListener('message', function(id) {
+	let resolve = g_new_message_resolve;
+	g_new_message_promise = new Promise(function(resolve, reject) {
+		g_new_message_resolve = resolve;
+	});
+	if (resolve) {
+		resolve();
+	}
+});
+
+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) {
+		rowid = row.rowid;
+	});
+	while (true) {
+		if (rowid == max_rowid) {
+			await new_message();
+			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(`
+				SELECT messages.id, author, content, timestamp
+				FROM messages
+				JOIN json_each(?1) AS id ON messages.author = id.value
+				WHERE
+					messages.rowid > ?2 AND
+					messages.rowid <= ?3 AND
+					((json_extract(messages.content, '$.type') = ?4 AND
+					(?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) {
+			rows.push(row);
+		});
+		max_rowid = rowid;
+		for (let row of rows) {
+			if (await process_message(whoami, data, row, kind, parent)) {
+				modified = true;
+			}
+		}
+		if (first || modified) {
+			break;
+		}
+	}
+	return [rowid, data];
+}

core/app.js

@@ -67,11 +67,8 @@ function socket(request, response, client) {
 		if (process && process.task) {
 			process.task.kill();
 		}
-	}
-
-	response.onError = async function(error) {
-		if (process && process.task) {
-			process.task.kill();
+		if (process) {
+			process.timeout = 0;
 		}
 	}
 
@@ -157,7 +154,7 @@ function socket(request, response, client) {
 						process.lastPing = now;
 					}
 
-					if (again) {
+					if (again && process.timeout) {
 						setTimeout(ping, process.timeout);
 					}
 				}
@@ -202,11 +199,9 @@ function socket(request, response, client) {
 		}
 	}
 
-	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

@@ -11,7 +11,7 @@
 		<tf-auth id="auth"></tf-auth>
 		<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

@@ -45,12 +45,12 @@ 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()
 				if (now < result.exp) {
 					print(`JWT valid for another ${(result.exp - now) / 1000} seconds.`);
@@ -64,8 +64,6 @@ function readSession(session) {
 		} else {
 			print('Invalid JWT header.');
 		}
-	} else {
-		print('No session JWT.');
 	}
 }
 
@@ -196,7 +194,7 @@ function handler(request, response) {
 			}
 		}
 
-		let cookie = `session=${session}; path=/; Max-Age=${kRefreshInterval}; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict`;
+		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});
@@ -220,7 +218,7 @@ function handler(request, response) {
 			});
 		}
 	} 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`, "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"});

core/client.js

@@ -1,5 +1,6 @@
-import {LitElement, html, css, svg} from '/static/lit/lit-all.min.js';
+import {LitElement, html, css, svg} from '/lit/lit-all.min.js';
 
+let cm6;
 let gSocket;
 
 let gCurrentFile;
@@ -104,16 +105,17 @@ class TfNavigationElement extends LitElement {
 	render_permissions() {
 		if (this.show_permissions) {
 			return html`
+				<link type="text/css" rel="stylesheet" href="/static/w3.css">
 				<div style="position: absolute; top: 0; padding: 0; margin: 0; z-index: 100; display: flex; justify-content: center; width: 100%">
 					<div style="background-color: #444; padding: 1em; margin: 0 auto; border-left: 4px solid #fff; border-right: 4px solid #fff; border-bottom: 4px solid #fff">
 						<div>This app has the following permissions:</div>
 						${Object.keys(this.permissions).map(key => html`
 							<div>
 								<span>${key}</span>: ${this.permissions[key] ? '✅ Allowed' : '❌ Denied'}
-								<button @click=${() => this.reset_permission(key)} style='min-width: 3em; min-height: 3em">Reset</button>
+								<button @click=${() => this.reset_permission(key)} class='w3-button w3-red">Reset</button>
 							</div>
 						`)}
-						<button @click=${() => this.show_permissions = false} style="min-width: 3em; min-height: 3em">Close</button>
+						<button @click=${() => this.show_permissions = false} class="w3-button w3-blue">Close</button>
 					</div>
 				</div>
 			`;
@@ -125,14 +127,27 @@ class TfNavigationElement extends LitElement {
 		return html`
 			<style>
 				${k_global_style}
+				.tooltip {
+					position: absolute;
+					z-index: 1;
+					display: none;
+					border: 1px solid black;
+					padding: 4px;
+					color: black;
+					background: white;
+				}
+
+				.tooltip_parent:hover .tooltip {
+					display: inline-block;
+				}
 			</style>
 			<div style="margin: 4px; display: flex; flex-direction: row; flex-wrap: nowrap; gap: 3px; align-items: center">
 				<span style="cursor: pointer" @click=${() => this.show_version = !this.show_version}>😎</span>
 				<span ?hidden=${!this.show_version} style="flex: 0 0; white-space: nowrap" title=${this.version?.name + ' ' + Object.entries(this.version || {}).filter(x => ['name', 'number'].indexOf(x[0]) == -1).map(x => `\n* ${x[0]}: ${x[1]}`)}>${this.version?.number}</span>
-				<a accesskey="h" data-tip="Open home app." href="/" style="color: #fff; white-space: nowrap">TF</a>
-				<a accesskey="a" data-tip="Open apps list." href="/~core/apps/">apps</a>
-				<a accesskey="e" data-tip="Toggle the app editor." href="#" @click=${this.toggle_edit}>edit</a>
-				<a accesskey="p" data-tip="View and change permissions." href="#" @click=${() => self.show_permissions = !self.show_permissions}>🎛️</a>
+				<a accesskey="h" @mouseover=${set_access_key_title} data-tip="Open home app." href="/" style="color: #fff; white-space: nowrap">TF</a>
+				<a accesskey="a" @mouseover=${set_access_key_title} data-tip="Open apps list." href="/~core/apps/">apps</a>
+				<a accesskey="e" @mouseover=${set_access_key_title} data-tip="Toggle the app editor." href="#" @click=${this.toggle_edit}>edit</a>
+				<a accesskey="p" @mouseover=${set_access_key_title} data-tip="View and change permissions." href="#" @click=${() => self.show_permissions = !self.show_permissions}>🎛️</a>
 				<span style="display: inline-block; vertical-align: top; white-space: pre; color: ${this.status.color ?? kErrorColor}">${this.status.message}</span>
 				<span id="requests"></span>
 				${this.render_permissions()}
@@ -188,9 +203,8 @@ class TfFilesElement extends LitElement {
 			let buffer = await file.arrayBuffer();
 			let text = new TextDecoder('latin1').decode(buffer);
 			gFiles[file.name] = {
-				doc: new CodeMirror.Doc(text, guessMode(file.name)),
+				doc: new cm6.EditorState.create({doc: text, extensions: cm6.extensions}),
 				buffer: buffer,
-				generation: -1,
 				isNew: true,
 			};
 			gCurrentFile = file.name;
@@ -269,32 +283,20 @@ class TfFilesPaneElement extends LitElement {
 	render() {
 		let self = this;
 		let expander = this.expanded ?
-			html`<span @click=${() => self.set_expanded(false)} class="expander">«</span>` :
-			html`<span @click=${() => self.set_expanded(true)} class="expander">»</span>`;
+			html`<div class="w3-button w3-bar-item w3-blue" style="flex: 0 0 auto; display: flex; flex-direction: row" @click=${() => self.set_expanded(false)}>
+				<span style="flex: 1 1" font-weight: bold; text-align: center; flex: 1">Files</span>
+				<span style="flex: 0 0">«</span>
+			</div>` :
+			html`<div class="w3-button w3-bar-item w3-blue" @click=${() => self.set_expanded(true)}>»</div>`;
 		let content = html`
-			<div id="files_content">
-				<tf-files .files=${self.files} current=${self.current} @file_click=${event => openFile(event.detail.file)}></tf-files>
-				<br>
-				<div><button @click=${() => newFile()}>New File</button></div>
-				<div><button @click=${() => removeFile()}>Remove File</button></div>
-			</div>
+			<tf-files style="flex: 1 1; overflow: auto" .files=${self.files} current=${self.current} @file_click=${event => openFile(event.detail.file)}></tf-files>
+			<div><button class="w3-bar-item w3-button w3-blue" style="width: 100%; flex: 0 0" @click=${() => newFile()} accesskey="n" @mouseover=${set_access_key_title} data-tip="Add a new, empty file to the app">📄 New File</button></div>
+			<div><button class="w3-bar-item w3-button w3-blue" style="width: 100%; flex: 0 0" @click=${() => removeFile()} accesskey="r" @mouseover=${set_access_key_title} data-tip="Remove the selected file from the app">🚮 Remove File</button></div>
 		`;
 		return html`
-			<style>
-				.expander {
-					font-weight: bold;
-					width: 100%;
-					right: 0;
-					flex: 0;
-					padding: 0.25em;
-					cursor: pointer;
-				}
-			</style>
-			<div>
-				<div style="display: flex; flex-direction: row">
-					${this.expanded ? html`<span style="font-weight: bold; text-align: center; flex: 1">Files</span>` : undefined}
-					${expander}
-				</div>
+			<link type="text/css" rel="stylesheet" href="/static/w3.css">
+			<div style="display: flex; flex-direction: column; height: 100%">
+				${expander}
 				${this.expanded ? content : undefined}
 			</div>
 		`;
@@ -422,7 +424,7 @@ function is_edit_only() {
 	return window.location.search == '?editonly=1' || window.innerWidth < 1024;
 }
 
-function edit() {
+async function edit() {
 	if (editing()) {
 		return;
 	}
@@ -431,33 +433,17 @@ function edit() {
 	document.getElementById("editPane").style.display = 'flex';
 	document.getElementById('viewPane').style.display =  is_edit_only() ? 'none' : 'flex';
 
-	ensureLoaded([
-		{tagName: "script", attributes: {src: "/codemirror/codemirror.min.js"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/base16-dark.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/matchesonscrollbar.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/dialog.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/codemirror.min.css"}},
-		{tagName: "link", attributes: {rel: "stylesheet", href: "/codemirror/lint.css"}},
-		{tagName: "script", attributes: {src: "/codemirror/trailingspace.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/dialog.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/search.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/searchcursor.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/jump-to-line.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/matchesonscrollbar.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/annotatescrollbar.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/javascript.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/css.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/xml.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/htmlmixed.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/lint.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/jshint.min.js"}},
-		{tagName: "script", attributes: {src: "/codemirror/javascript-lint.min.js"}},
-	], function() {
-		load().catch(function(error) {
-			alert(error);
-			closeEditor();
-		});
-	});
+	try {
+		if (!gEditor) {
+			cm6 = await import('/codemirror/cm6.js');
+			gEditor = cm6.TildeFriendsEditorView(document.getElementById("editor"));
+		}
+		gEditor.onDocChange = updateFiles;
+		await load();
+	} catch (error) {
+		alert(`${error.message}\n\n${error.stack}`);
+		closeEditor();
+	}
 }
 
 function trace() {
@@ -478,72 +464,49 @@ function loadFile(name, id) {
 		}
 		return response.text();
 	}).then(function(text) {
-		gFiles[name].doc = new CodeMirror.Doc(text, guessMode(name));
+		gFiles[name].doc = cm6.EditorState.create({doc: text, extensions: cm6.extensions});
+		gFiles[name].original = gFiles[name].doc.doc.toString();
 		if (!Object.values(gFiles).some(x => !x.doc)) {
 			openFile(Object.keys(gFiles).sort()[0]);
 		}
 	});
 }
 
-function load(path) {
-	return fetch((path || url()) + 'view').then(function(response) {
-		if (!response.ok) {
-			if (response.status == 404) {
-				return null;
-			} else {
-				throw new Error(response.status + ' ' + response.statusText);
-			}
-		}
-		return response.json();
-	}).then(function(json) {
-		if (!gEditor) {
-			gEditor = CodeMirror.fromTextArea(document.getElementById("editor"), {
-				'theme': 'base16-dark',
-				'lineNumbers': true,
-				'tabSize': 4,
-				'indentUnit': 4,
-				'indentWithTabs': true,
-				'showTrailingSpace': true,
-				'gutters': ['CodeMirror-lint-markers'],
-				'mode': {'js': 'javascript'}[(path || url()).split('.').pop()],
-				'lint': {
-					'options': {
-						'esversion': 2021,
-					},
-				},
-			});
-			gEditor.on('changes', function() {
-				updateFiles();
-			});
-		}
-		gFiles = {};
-		let isApp = false;
-		let promises = [];
+async function load(path) {
+	let response = await fetch((path || url()) + 'view');
+	let json;
+	if (response.ok) {
+		json = await response.json();
+	} else if (response.status != 404) {
+		throw new Error(response.status + ' ' + response.statusText);
+	}
+	gFiles = {};
+	let isApp = false;
+	let promises = [];
 
-		if (json && json['type'] == 'tildefriends-app') {
-			isApp = true;
-			Object.keys(json['files']).forEach(function(name) {
-				gFiles[name] = {};
-				promises.push(loadFile(name, json['files'][name]));
-			});
-			if (Object.keys(json['files']).length == 0) {
-				document.getElementById("editPane").style.display = 'flex';
-			}
-			gApp = json;
-			gApp.emoji = gApp.emoji || '📦';
-			document.getElementById('icon').value = gApp.emoji;
-		}
-		if (!isApp) {
+	if (json && json['type'] == 'tildefriends-app') {
+		isApp = true;
+		Object.keys(json['files']).forEach(function(name) {
+			gFiles[name] = {};
+			promises.push(loadFile(name, json['files'][name]));
+		});
+		if (Object.keys(json['files']).length == 0) {
 			document.getElementById("editPane").style.display = 'flex';
-			let text = '// New script.\n';
-			gCurrentFile = 'app.js';
-			gFiles[gCurrentFile] = {
-				doc: new CodeMirror.Doc(text, guessMode(gCurrentFile)),
-			};
-			openFile(gCurrentFile);
 		}
-		return Promise.all(promises);
-	});
+		gApp = json;
+		gApp.emoji = gApp.emoji || '📦';
+		document.getElementById('icon').innerHTML = gApp.emoji;
+	}
+	if (!isApp) {
+		document.getElementById("editPane").style.display = 'flex';
+		let text = '// New script.\n';
+		gCurrentFile = 'app.js';
+		gFiles[gCurrentFile] = {
+			doc: cm6.EditorState.create({doc: text, extensions: cm6.extensions}),
+		};
+		openFile(gCurrentFile);
+	}
+	return Promise.all(promises);
 }
 
 function closeEditor() {
@@ -559,8 +522,8 @@ function explodePath() {
 function save(save_to) {
 	document.getElementById("save").disabled = true;
 	if (gCurrentFile) {
-		gFiles[gCurrentFile].doc = gEditor.getDoc();
-		if (!gFiles[gCurrentFile].isNew && !gFiles[gCurrentFile].doc.isClean(gFiles[gCurrentFile].doc.changeGeneration())) {
+		gFiles[gCurrentFile].doc = gEditor.state;
+		if (!gFiles[gCurrentFile].isNew && !gFiles[gCurrentFile].doc.doc.toString() == gFiles[gCurrentFile].original) {
 			delete gFiles[gCurrentFile].buffer;
 		}
 	}
@@ -578,7 +541,7 @@ function save(save_to) {
 	let promises = [];
 	for (let name of Object.keys(gFiles)) {
 		let file = gFiles[name];
-		if (!file.isNew && file.doc.isClean(file.generation)) {
+		if (!file.isNew && file.doc.doc.toString() == file.original) {
 			continue;
 		}
 
@@ -589,7 +552,7 @@ function save(save_to) {
 			headers: {
 				'Content-Type': 'application/binary',
 			},
-			body: file.buffer ?? file.doc.getValue(),
+			body: file.buffer ?? file.doc.doc.toString(),
 		}).then(function(response) {
 			if (!response.ok) {
 				throw new Error('Saving "' + name + '": ' + response.status + ' ' + response.statusText);
@@ -634,7 +597,7 @@ function save(save_to) {
 	}).finally(function() {
 		document.getElementById("save").disabled = false;
 		Object.values(gFiles).forEach(function(file) {
-			file.generation = file.doc.changeGeneration();
+			file.original = file.doc.doc.toString();
 		});
 		updateFiles();
 	});
@@ -644,7 +607,7 @@ function changeIcon() {
 	let value = prompt('Enter a new app icon emoji:');
 	if (value !== undefined) {
 		gApp.emoji = value || '📦';
-		document.getElementById('icon').value = gApp.emoji;
+		document.getElementById('icon').innerHTML = gApp.emoji;
 	}
 }
 
@@ -732,6 +695,8 @@ function api_requestPermission(permission, id) {
 	let check = document.createElement('input');
 	check.id = 'permissions_remember_check';
 	check.type = 'checkbox';
+	check.classList.add('w3-check');
+	check.classList.add('w3-blue');
 	div.appendChild(check);
 	let label = document.createElement('label');
 	label.htmlFor = check.id;
@@ -757,8 +722,8 @@ function api_requestPermission(permission, id) {
 		div = document.createElement('div');
 		for (let option of k_options) {
 			let button = document.createElement('button');
-			button.style.minWidth = '3em';
-			button.style.minHeight = '3em';
+			button.classList.add('w3-button');
+			button.classList.add('w3-blue');
 			button.innerText = option.text;
 			button.id = option.id;
 			button.onclick = function() {
@@ -1015,11 +980,13 @@ function connectSocket(path) {
 }
 
 function openFile(name) {
-	let newDoc = (name && gFiles[name]) ? gFiles[name].doc : new CodeMirror.Doc("", guessMode(name));
-	let oldDoc = gEditor.swapDoc(newDoc);
+	let newDoc = (name && gFiles[name]) ? gFiles[name].doc : cm6.EditorState.create({doc: "", extensions: cm6.extensions});
+	let oldDoc = gEditor.state;
+	gEditor.setState(newDoc);
+
 	if (gFiles[gCurrentFile]) {
 		gFiles[gCurrentFile].doc = oldDoc;
-		if (!gFiles[gCurrentFile].isNew && gFiles[gCurrentFile].doc.isClean(oldDoc.generation)) {
+		if (!gFiles[gCurrentFile].isNew && gFiles[gCurrentFile].doc.doc.toString() == oldDoc.doc.toString()) {
 			delete gFiles[gCurrentFile].buffer;
 		}
 	}
@@ -1032,7 +999,7 @@ function updateFiles() {
 	let files = document.getElementsByTagName("tf-files-pane")[0];
 	if (files) {
 		files.files = Object.fromEntries(Object.keys(gFiles).map(file => [file, {
-			clean: gFiles[file].doc.isClean(gFiles[file].generation),
+			clean: (file == gCurrentFile ? gEditor.state.doc.toString() : gFiles[file].doc.doc.toString()) == gFiles[file].original,
 		}]));
 		files.current = gCurrentFile;
 	}
@@ -1041,8 +1008,7 @@ function updateFiles() {
 
 function makeNewFile(name) {
 	gFiles[name] = {
-		doc: new CodeMirror.Doc("", guessMode(name)),
-		generation: -1,
+		doc: cm6.EditorState.create({extensions: cm6.extensions}),
 	};
 	openFile(name);
 }
@@ -1061,6 +1027,119 @@ function removeFile() {
 	}
 }
 
+async function appExport() {
+	let JsZip = (await import('/static/jszip.min.js')).default;
+	let owner = window.location.pathname.split('/')[1].replace('~', '');
+	let name = window.location.pathname.split('/')[2];
+	let zip = new JsZip();
+	zip.file(`${name}.json`, JSON.stringify({
+		type: "tildefriends-app",
+		emoji: gApp.emoji || '📦',
+	}));
+	for (let file of Object.keys(gFiles)) {
+		zip.file(`${name}/${file}`, gFiles[file].buffer ?? gFiles[file].doc.doc.toString());
+	}
+	let content = await zip.generateAsync({
+		type: 'base64',
+		compression: 'DEFLATE',
+	});
+	let a = document.createElement('a');
+	a.href = `data:application/zip;base64,${content}`;
+	a.download = `${owner}_${name}.zip`;
+	a.click();
+}
+
+async function save_file_to_blob_id(name, file) {
+	console.log(`Saving ${name}.`);
+	let response = await fetch('/save', {
+		method: 'POST',
+		headers: {
+			'Content-Type': 'application/binary',
+		},
+		body: file,
+	});
+	if (!response.ok) {
+		throw new Error('Saving "' + name + '": ' + response.status + ' ' + response.statusText);
+	}
+	let blob_id = await response.text();
+	if (blob_id.charAt(0) == '/') {
+		blob_id = blob_id.substr(1);
+	}
+	return blob_id;
+}
+
+async function appImport() {
+	let JsZip = (await import('/static/jszip.min.js')).default;
+	let input = document.createElement('input');
+	input.type = 'file';
+	input.click();
+	input.onchange = async function() {
+		try {
+			for (let file of input.files) {
+				if (file.type != 'application/zip') {
+					console.log(`This does not look like a .zip (${file.type}).`);
+					continue;
+				}
+				let buffer = new Uint8Array(await file.arrayBuffer());
+				console.log('ZIP', file.name, file.type, buffer, buffer?.byteLength, buffer?.length);
+				let zip = new JsZip();
+				await zip.loadAsync(buffer);
+				let app_object;
+				let app_name;
+				for (let [name, object] of Object.entries(zip.files)) {
+					if (name.endsWith('.json') && name.indexOf('/') == -1) {
+						try {
+							let parsed = JSON.parse(await object.async('text'));
+							if (parsed.type == 'tildefriends-app') {
+								app_object = parsed;
+								app_name = name.substring(0, name.length - '.json'.length);
+								break;
+							}
+						} catch (e) {
+							console.log(e);
+						}
+					}
+				}
+				if (app_object) {
+					app_object.files = {};
+					for (let [name, object] of Object.entries(zip.files)) {
+						if (!name.startsWith(app_name + '/') || name.endsWith('/')) {
+							continue;
+						}
+						app_object.files[name.substring(app_name.length + '/'.length)] = await save_file_to_blob_id(name, await object.async('arrayBuffer'));
+					}
+					let path = '/' + await save_file_to_blob_id(`${app_name}.json`, JSON.stringify(app_object)) + '/';
+					console.log('Redirecting to:', path);
+					window.location.pathname = path;
+				}
+			}
+		} catch (e) {
+			alert(e.toString());
+		}
+	}
+}
+
+async function sourcePretty() {
+	let prettier = (await import('/prettier/standalone.mjs')).default;
+	let babel = (await import('/prettier/babel.mjs')).default;
+	let estree = (await import('/prettier/estree.mjs')).default;
+	let source = gEditor.state.doc.toString();
+	let formatted = await prettier.format(source, {
+		parser: 'babel',
+		plugins: [babel, estree],
+		useTabs: true,
+	});
+	if (source !== formatted) {
+		gEditor.dispatch({
+			changes: {
+				from: 0,
+				to: gEditor.state.doc.length,
+				insert: formatted,
+			}
+		});
+	}
+}
+
 window.addEventListener("load", function() {
 	window.addEventListener("hashchange", hashChange);
 	window.addEventListener("focus", focus);
@@ -1072,34 +1151,13 @@ window.addEventListener("load", function() {
 	document.getElementById('save').addEventListener('click', () => save());
 	document.getElementById('icon').addEventListener('click', () => changeIcon());
 	document.getElementById('delete').addEventListener('click', () => deleteApp());
+	document.getElementById('export').addEventListener('click', () => appExport());
+	document.getElementById('import').addEventListener('click', () => appImport());
+	document.getElementById('pretty').addEventListener('click', () => sourcePretty());
 	document.getElementById('trace_button').addEventListener('click', function(event) {
 		event.preventDefault();
 		trace();
 	});
-	for (let tag of document.getElementsByTagName('a')) {
-		if (tag.accessKey) {
-			tag.classList.add('tooltip_parent');
-			let tooltip = document.createElement('div');
-			tooltip.classList.add('tooltip');
-			if (tag.dataset.tip) {
-				let description = document.createElement('div');
-				description.innerText = tag.dataset.tip;
-				tooltip.appendChild(description);
-			}
-			let parts = tag.accessKeyLabel ? tag.accessKeyLabel.split('+') : [];
-			for (let i = 0; i < parts.length; i++)
-			{
-				let key = parts[i];
-				let kbd = document.createElement('kbd');
-				kbd.innerText = key;
-				tooltip.appendChild(kbd);
-				if (i < parts.length - 1) {
-					tooltip.appendChild(document.createTextNode('+'));
-				}
-			}
-			tag.appendChild(tooltip);
-		}
-	}
 	connectSocket(window.location.pathname);
 
 	if (window.localStorage.getItem('editing') == '1') {

core/core.js

@@ -2,12 +2,12 @@ import * as app from './app.js';
 import * as auth from './auth.js';
 import * as form from './form.js';
 import * as http from './http.js';
-import * as httpd from './httpd.js';
 
-let gProcessIndex = 0;
 let gProcesses = {};
 let gStatsTimer = false;
 
+const k_content_security_policy = 'sandbox allow-downloads allow-top-navigation-by-user-activation';
+
 const k_mime_types = {
 	'css': 'text/css',
 	'html': 'text/html',
@@ -30,15 +30,11 @@ const k_magic_bytes = [
 	{bytes: [null, null, null, null, 0x66, 0x74, 0x79, 0x70, 0x6d, 0x70, 0x34, 0x32], type: 'audio/mpeg'},
 	{bytes: [null, null, null, null, 0x66, 0x74, 0x79, 0x70, 0x69, 0x73, 0x6f, 0x6d], type: 'video/mp4'},
 	{bytes: [null, null, null, null, 0x66, 0x74, 0x79, 0x70, 0x6d, 0x70, 0x34, 0x32], type: 'video/mp4'},
+	{bytes: [0x4d, 0x54, 0x68, 0x64], type: 'audio/midi'},
 ];
 
 let k_static_files = [
 	{uri: '/', path: 'index.html', type: 'text/html; charset=UTF-8'},
-	{uri: '/style.css', type: 'text/css; charset=UTF-8'},
-	{uri: '/favicon.png', type: 'image/png'},
-	{uri: '/client.js', type: 'text/javascript; charset=UTF-8'},
-	{uri: '/tfrpc.js', type: 'text/javascript; charset=UTF-8', headers: {'Access-Control-Allow-Origin': 'null'}},
-	{uri: '/robots.txt', type: 'text/plain; charset=UTF-8'},
 ];
 
 const k_global_settings = {
@@ -47,6 +43,11 @@ const k_global_settings = {
 		default_value: '/~core/apps/',
 		description: 'Default path.',
 	},
+	index_map: {
+		type: 'textarea',
+		default_value: undefined,
+		description: 'Mappings from hostname to redirect path, one per line, as in: "www.tildefriends.net=/~core/index/"',
+	},
 	room: {
 		type: 'boolean',
 		default_value: true,
@@ -120,8 +121,7 @@ function invoke(handlers, argv) {
 
 function broadcastEvent(eventName, argv) {
 	let promises = [];
-	for (let i in gProcesses) {
-		let process = gProcesses[i];
+	for (let process of Object.values(gProcesses)) {
 		if (process.eventHandlers[eventName]) {
 			promises.push(invoke(process.eventHandlers[eventName], argv));
 		}
@@ -132,8 +132,7 @@ function broadcastEvent(eventName, argv) {
 function broadcast(message) {
 	let sender = this;
 	let promises = [];
-	for (let i in gProcesses) {
-		let process = gProcesses[i];
+	for (let process of Object.values(gProcesses)) {
 		if (process != sender
 			&& process.packageOwner == sender.packageOwner
 			&& process.packageName == sender.packageName) {
@@ -146,9 +145,7 @@ function broadcast(message) {
 
 function getUser(caller, process) {
 	return {
-		name: process.userName,
 		key: process.key,
-		index: process.index,
 		packageOwner: process.packageOwner,
 		packageName: process.packageName,
 		credentials: process.credentials,
@@ -203,8 +200,6 @@ async function getProcessBlob(blobId, key, options) {
 			print("Creating task for " + blobId + " " + key);
 			process = {};
 			process.key = key;
-			process.index = gProcessIndex++;
-			process.userName = 'user' + process.index;
 			process.credentials = options.credentials || {};
 			process.task = new Task();
 			process.eventHandlers = {};
@@ -315,6 +310,10 @@ async function getProcessBlob(blobId, key, options) {
 							throw Error(`Permission denied: ${permission}.`);
 						}
 					},
+					app: {
+						owner: options?.packageOwner,
+						name: options?.packageName,
+					},
 					url: options?.url,
 				}
 			};
@@ -391,6 +390,29 @@ async function getProcessBlob(blobId, key, options) {
 					return ssb.createIdentity(process.credentials.session.name);
 				}
 			};
+			imports.ssb.addIdentity = function(id) {
+				if (process.credentials &&
+					process.credentials.session &&
+					process.credentials.session.name) {
+					return Promise.resolve(imports.core.permissionTest('ssb_id_add')).then(function() {
+						return ssb.addIdentity(process.credentials.session.name, id);
+					});
+				}
+			};
+			imports.ssb.deleteIdentity = function(id) {
+				if (process.credentials &&
+					process.credentials.session &&
+					process.credentials.session.name) {
+					return Promise.resolve(imports.core.permissionTest('ssb_id_delete')).then(function() {
+						return ssb.deleteIdentity(process.credentials.session.name, id);
+					});
+				}
+			};
+			imports.ssb.getOwnerIdentities = function() {
+				if (options.packageOwner) {
+					return ssb.getIdentities(options.packageOwner);
+				}
+			};
 			imports.ssb.getIdentities = function() {
 				if (process.credentials &&
 					process.credentials.session &&
@@ -398,6 +420,15 @@ async function getProcessBlob(blobId, key, options) {
 					return ssb.getIdentities(process.credentials.session.name);
 				}
 			};
+			imports.ssb.getPrivateKey = function(id) {
+				if (process.credentials &&
+					process.credentials.session &&
+					process.credentials.session.name) {
+					return Promise.resolve(imports.core.permissionTest('ssb_id_export')).then(function() {
+						return ssb.getPrivateKey(process.credentials.session.name, id);
+					});
+				}
+			};
 			imports.ssb.appendMessageWithIdentity = function(id, message) {
 				if (process.credentials &&
 					process.credentials.session &&
@@ -525,78 +556,6 @@ function startsWithBytes(data, bytes) {
 	}
 }
 
-async function staticFileHandler(request, response, blobId, uri) {
-	for (let i in k_static_files) {
-		if (uri === k_static_files[i].uri) {
-			let path = k_static_files[i].path || uri.substring(1);
-			let type = k_static_files[i].type || guessTypeFromName(path);
-
-			let stat = await File.stat('core/' + path);
-			let id = `${stat.mtime}_${stat.size}`;
-
-			if (request.headers['if-none-match'] === '"' + id + '"') {
-				response.writeHead(304, {'Content-Length': '0'});
-				response.end();
-			} else {
-				let data = await File.readFile('core/' + path);
-				response.writeHead(200, Object.assign(
-					{
-						'Content-Type': type,
-						'Content-Length': data.byteLength,
-						'etag': '"' + id + '"',
-					},
-					k_static_files[i].headers || {}));
-				response.end(data);
-			}
-			return;
-		}
-	}
-
-	response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
-	response.end("File not found");
-}
-
-async function staticDirectoryHandler(request, response, directory, uri) {
-	let filename = uri || 'index.html';
-	if (filename.indexOf('..') != -1) {
-		response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
-		response.end("File not found");
-		return;
-	}
-
-	try {
-		let stat = await File.stat(directory + filename);
-		let id = `${stat.mtime}_${stat.size}`;
-
-		if (request.headers['if-none-match'] === '"' + id + '"') {
-			response.writeHead(304, {'Content-Length': '0'});
-			response.end();
-		} else {
-			let data = await File.readFile(directory + filename);
-			response.writeHead(200, {
-				'Content-Type': k_mime_types[filename.split('.').pop()] || 'text/plain',
-				'Content-Length': data.byteLength,
-				'etag': '"' + id + '"',
-			});
-			response.end(data);
-		}
-	} catch {
-		response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": "File not found".length});
-		response.end("File not found");
-	}
-}
-
-async function wellKnownHandler(request, response, path) {
-	let data = await File.readFile("data/global/.well-known/" + path);
-	if (data) {
-		response.writeHead(200, {"Content-Type": "text/plain", "Content-Length": data.length});
-		response.end(data);
-	} else {
-		response.writeHead(404, {"Content-Type": "text/plain", "Content-Length": "File not found".length});
-		response.end("File not found");
-	}
-}
-
 function guessTypeFromName(path) {
 	let extension = path.split('.').pop();
 	return k_mime_types[extension];
@@ -689,7 +648,7 @@ async function blobHandler(request, response, blobId, uri) {
 	}
 
 	if (!uri) {
-		response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + request.headers.host + blobId + '/', "Content-Length": "0"});
+		response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + (request.headers['x-forwarded-host'] ?? request.headers.host) + blobId + '/', "Content-Length": "0"});
 		response.end();
 		return;
 	}
@@ -700,7 +659,7 @@ async function blobHandler(request, response, blobId, uri) {
 		let match;
 		let query = form.decodeForm(request.query);
 		let headers = {
-			'Content-Security-Policy': 'sandbox',
+			'Content-Security-Policy': k_content_security_policy,
 		};
 		if (query.filename && query.filename.match(/^[A-Za-z0-9\.-]*$/)) {
 			headers['Content-Disposition'] = `attachment; filename=${query.filename}`;
@@ -857,13 +816,13 @@ async function blobHandler(request, response, blobId, uri) {
 			}
 			sendData(response, answer?.data, answer?.content_type, Object.assign(answer?.headers ?? {}, {
 				'Access-Control-Allow-Origin': '*',
-				'Content-Security-Policy': 'sandbox',
+				'Content-Security-Policy': k_content_security_policy,
 			}), answer.status_code);
 		} else if (id) {
 			if (request.headers['if-none-match'] && request.headers['if-none-match'] == '"' + id + '"') {
 				let headers = {
 					'Access-Control-Allow-Origin': '*',
-					'Content-Security-Policy': 'sandbox',
+					'Content-Security-Policy': k_content_security_policy,
 					'Content-Length': '0',
 				};
 				response.writeHead(304, headers);
@@ -872,7 +831,7 @@ async function blobHandler(request, response, blobId, uri) {
 				let headers = {
 					'ETag': '"' + id + '"',
 					'Access-Control-Allow-Origin': '*',
-					'Content-Security-Policy': 'sandbox',
+					'Content-Security-Policy': k_content_security_policy,
 				};
 				data = await getBlobOrContent(id);
 				let type = guessTypeFromName(uri) || guessTypeFromMagicBytes(data);
@@ -931,58 +890,65 @@ function enableStats(process, enabled) {
 	}
 }
 
-function stringResponse(response, data) {
-	let bytes = utf8Encode(data);
-	response.writeHead(200, {
-		"Content-Type": "application/json; charset=utf-8",
-		"Content-Length": bytes.byteLength.toString(),
-		"Access-Control-Allow-Origin": "*",
-	});
-	return response.end(bytes);
-}
-
 loadSettings().then(function() {
+	if (tildefriends.https_port && gGlobalSettings.http_redirect) {
+		httpd.set_http_redirect(gGlobalSettings.http_redirect);
+	}
 	httpd.all("/login", auth.handler);
-	httpd.all("", function(request, response) {
+	httpd.all("/login/logout", auth.handler);
+	httpd.all("/app/socket", app.socket);
+	httpd.all("", function default_http_handler(request, response) {
 		let match;
 		if (request.uri === "/" || request.uri === "") {
-			response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + request.headers.host + gGlobalSettings.index, "Content-Length": "0"});
+			let host = request.headers['x-forwarded-host'] ?? request.headers.host;
+			try {
+				for (let line of (gGlobalSettings.index_map || '').split('\n')) {
+					let parts = line.split('=');
+					if (parts.length == 2 && host.match(new RegExp(parts[0], 'i'))) {
+						response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + host + parts[1], "Content-Length": "0"});
+						return response.end();
+					}
+				}
+			} catch (e) {
+				print(e);
+			}
+			response.writeHead(303, {"Location": (request.client.tls ? 'https://' : 'http://') + host + gGlobalSettings.index, "Content-Length": "0"});
 			return response.end();
 		} else if (match = /^(\/~[^\/]+\/[^\/]+)(\/?.*)$/.exec(request.uri)) {
 			return blobHandler(request, response, match[1], match[2]);
 		} else if (match = /^\/([&\%][^\.]{44}(?:\.\w+)?)(\/?.*)/.exec(request.uri)) {
 			return blobHandler(request, response, match[1], match[2]);
-		} else if (match = /^\/static\/lit\/([\.\w-/]*)$/.exec(request.uri)) {
-			return staticDirectoryHandler(request, response, 'deps/lit/', match[1]);
-		} else if (match = /^\/codemirror\/([\.\w-/]*)$/.exec(request.uri)) {
-			return staticDirectoryHandler(request, response, 'deps/codemirror/', match[1]);
-		} else if (match = /^\/speedscope\/([\.\w-/]*)$/.exec(request.uri)) {
-			return staticDirectoryHandler(request, response, 'deps/speedscope/', match[1]);
-		} else if (match = /^\/static(\/.*)/.exec(request.uri)) {
-			return staticFileHandler(request, response, null, match[1]);
-		} else if (request.uri == "/robots.txt") {
-			return staticFileHandler(request, response, null, request.uri);
 		} else if (match = /^(.*)(\/(?:save|delete)?)$/.exec(request.uri)) {
 			return blobHandler(request, response, match[1], match[2]);
-		} else if (match = /^\/trace$/.exec(request.uri)) {
-			return stringResponse(response, trace());
-		} else if (match = /^\/disconnections$/.exec(request.uri)) {
-			return stringResponse(response, JSON.stringify(disconnectionsDebug(), null, 2));
-		} else if (match = /^\/debug$/.exec(request.uri)) {
-			return stringResponse(response, JSON.stringify(getDebug(), null, 2));
-		} else if (match = /^\/hitches$/.exec(request.uri)) {
-			return stringResponse(response, JSON.stringify(getHitches(), null, 2));
-		} else if (match = /^\/mem$/.exec(request.uri)) {
-			return stringResponse(response, JSON.stringify(getAllocations(), null, 2));
-		} else if ((match = /^\/.well-known\/(.*)/.exec(request.uri)) && request.uri.indexOf("..") == -1) {
-			return wellKnownHandler(request, response, match[1]);
 		} else {
 			let data = "File not found.";
 			response.writeHead(404, {"Content-Type": "text/plain; charset=utf-8", "Content-Length": data.length.toString()});
 			return response.end(data);
 		}
 	});
-	httpd.registerSocketHandler("/app/socket", app.socket);
+	let port = httpd.start(tildefriends.http_port);
+	if (tildefriends.args.out_http_port_file) {
+		print("Writing the port file.");
+		File.writeFile(tildefriends.args.out_http_port_file, port.toString() + '\n').then(function(r) {
+			print("Wrote the port file:", tildefriends.args.out_http_port_file, r);
+		}).catch(function() {
+			print("Failed to write the port file.");
+		});
+	}
+
+	if (tildefriends.https_port) {
+		async function start_tls() {
+			const kCertificatePath = "data/httpd/certificate.pem";
+			const kPrivateKeyPath = "data/httpd/privatekey.pem";
+			let privateKey = utf8Decode(await File.readFile(kPrivateKeyPath));
+			let certificate = utf8Decode(await File.readFile(kCertificatePath));
+			let context = new TlsContext();
+			context.setPrivateKey(privateKey);
+			context.setCertificate(certificate);
+			httpd.start(tildefriends.https_port, context);
+		}
+		start_tls();
+	}
 }).catch(function(error) {
 	print('Failed to load settings.');
 	printError({print: print}, error);

core/httpd.js

@@ -1,593 +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;
-	}
-
-	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);
-
-	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";
-	let kAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-	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 = '::';
-
-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() + "] [" + client.peerName + "] " + error);
-			}
-		});
-	}).catch(function(error) {
-		logError("[" + new Date() + "] bind error " + error);
-	});
-}
-
-export { all, registerSocketHandler };

core/index.html

@@ -3,31 +3,40 @@
 	<head>
 		<title>Tilde Friends</title>
 		<link type="text/css" rel="stylesheet" href="/static/style.css">
+		<link type="text/css" rel="stylesheet" href="/static/w3.css">
 		<link type="image/png" rel="shortcut icon" href="/static/favicon.png">
 		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<script>
+			function set_access_key_title(event) {
+				if (!event.srcElement.title) {
+					event.srcElement.title = `${event.srcElement.dataset.tip} [${(event.srcElement.accessKeyLabel || ('⌨️' + event.srcElement.accessKey)).toUpperCase()}]`;
+				}
+			}
+		</script>
 	</head>
-	<body style="display: flex; flex-flow: column">
+	<body style="display: flex; flex-flow: column; width: 100vw; height: 100vh; position: absolute; max-width: 100%; max-height: 100%">
 		<tf-navigation></tf-navigation>
-		<div id="content" class="hbox" style="flex: 1 1; width: 100%">
-			<div id="editPane" class="vbox" style="flex: 1 1; display: none">
-				<div class="navigation hbox">
-					<input type="button" id="closeEditor" name="closeEditor" value="Close">
-					<input type="button" id="save" name="save" value="Save">
-					<input type="button" id="icon" name="icon" value="📦">
-					<input type="text" id="name" name="name" style="flex: 1 1; min-width: 1em"></input>
-					<input type="button" id="delete" name="delete" value="Delete">
-					<input type="button" id="trace_button" value="Trace">
+		<div id="content" class="hbox" style="flex: 1 0; overflow: auto">
+			<div id="editPane" class="vbox" style="flex: 0 1 100%; display: none; overflow: auto">
+				<div class="navigation w3-bar" style="display: flex">
+					<button class="w3-bar-item w3-button w3-blue" id="closeEditor" name="closeEditor" accesskey="c" onmouseover="set_access_key_title(event)" data-tip="Close the editor">Close</button>
+					<button class="w3-bar-item w3-button w3-blue" id="save" name="save" accesskey="s" onmouseover="set_access_key_title(event)" data-tip="Save the app under the given path">Save</button>
+					<button class="w3-bar-item w3-button w3-blue" id="icon" name="icon" accesskey="i" onmouseover="set_access_key_title(event)" data-tip="Set an icon/emoji for the app">📦</button>
+					<button class="w3-bar-item w3-button w3-blue" id="export" name="export" accesskey="e" onmouseover="set_access_key_title(event)" data-tip="Export app to .zip file">Export</button>
+					<button class="w3-bar-item w3-button w3-blue" id="import" name="import" accesskey="i" onmouseover="set_access_key_title(event)" data-tip="Import app from .zip file">Import</button>
+					<button class="w3-bar-item w3-button w3-blue" id="pretty" name="pretty" accesskey="p" onmouseover="set_access_key_title(event)" data-tip="Clean up source formatting">🧼</button>
+					<input class="w3-bar-item w3-input w3-border w3-blue" type="text" id="name" name="name" style="flex: 1 1; min-width: 1em"></input>
+					<button class="w3-bar-item w3-button w3-blue" id="delete" name="delete" accesskey="d" onmouseover="set_access_key_title(event)" data-tip="Delete the app">Delete</button>
+					<button class="w3-bar-item w3-button w3-blue" id="trace_button" accesskey="t" onmouseover="set_access_key_title(event)" data-tip="Open a performance trace for the server">Trace</button>
 				</div>
-				<div class="hbox" style="height: 100%">
-					<tf-files-pane></tf-files-pane>
-					<div id="docPane" style="display: flex; flex: 1 1 50%; flex-flow: column">
-						<div style="flex: 1 1 50%; position: relative">
-							<textarea id="editor" class="main"></textarea>
-						</div>
+				<div class="hbox" style="flex: 1 1; overflow: auto">
+					<div style="overflow: auto">
+						<tf-files-pane style="overflow: auto"></tf-files-pane>
 					</div>
+					<div style="flex: 1 1; overflow: auto"><div id="editor" style="width: 100%; height: 100%"></div></div>
 				</div>
 			</div>
-			<div id="viewPane" class="vbox" style="flex: 1 1; overflow: auto">
+			<div id="viewPane" class="vbox" style="flex: 0 1 100%; overflow: auto">
 				<iframe id="document" sandbox="allow-forms allow-scripts allow-top-navigation allow-modals allow-popups allow-downloads" style="width: 100%; height: 100%; border: 0"></iframe>
 			</div>
 		</div>

core/robots.txt

@@ -1,3 +0,0 @@
-User-Agent: *
-Disallow: /*/*/edit
-Allow: /

core/style.css

@@ -64,14 +64,8 @@ a:active {
 	color: #eee8d5;
 }
 
-.CodeMirror {
+.cm-editor {
 	height: 100%;
-	padding: 0;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	position: absolute;
 }
 
 .cm-tab {
@@ -125,34 +119,6 @@ a:active {
 .cyan { color: #2aa198; }
 .green { color: #859900; }
 
-.tooltip {
-	position: absolute;
-	z-index: 1;
-	display: none;
-	border: 1px solid black;
-	padding: 4px;
-	color: black;
-	background: white;
-}
-
-.tooltip_parent:hover .tooltip {
-	display: inline-block;
-}
-
-kbd {
-	background-color: #eee;
-	border-radius: 3px;
-	border: 1px solid #b4b4b4;
-	box-shadow: 0 1px 1px rgba(0, 0, 0, .2), 0 2px 0 0 rgba(255, 255, 255, .7) inset;
-	color: #333;
-	display: inline-block;
-	font-size: .85em;
-	font-weight: 700;
-	line-height: 1;
-	padding: 2px 4px;
-	white-space: nowrap;
-}
-
 .permissions {
 	position: absolute;
 	display: block;

core/w3.css

@@ -0,0 +1,235 @@
+/* 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}

deps/codemirror/annotatescrollbar.min.js

@@ -1 +0,0 @@
-!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],t):t(CodeMirror)}(function(t){"use strict";function e(t,e){function i(t){clearTimeout(n.doRedraw),n.doRedraw=setTimeout(function(){n.redraw()},t)}this.cm=t,this.options=e,this.buttonHeight=e.scrollButtonHeight||t.getOption("scrollButtonHeight"),this.annotations=[],this.doRedraw=this.doUpdate=null,this.div=t.getWrapperElement().appendChild(document.createElement("div")),this.div.style.cssText="position: absolute; right: 0; top: 0; z-index: 7; pointer-events: none",this.computeScale();var n=this;t.on("refresh",this.resizeHandler=function(){clearTimeout(n.doUpdate),n.doUpdate=setTimeout(function(){n.computeScale()&&i(20)},100)}),t.on("markerAdded",this.resizeHandler),t.on("markerCleared",this.resizeHandler),!1!==e.listenForChanges&&t.on("changes",this.changeHandler=function(){i(250)})}t.defineExtension("annotateScrollbar",function(t){return new e(this,t="string"==typeof t?{className:t}:t)}),t.defineOption("scrollButtonHeight",0),e.prototype.computeScale=function(){var t=this.cm,t=(t.getWrapperElement().clientHeight-t.display.barHeight-2*this.buttonHeight)/t.getScrollerElement().scrollHeight;if(t!=this.hScale)return this.hScale=t,!0},e.prototype.update=function(t){this.annotations=t,this.redraw()},e.prototype.redraw=function(t){!1!==t&&this.computeScale();var n=this.cm,e=this.hScale,i=document.createDocumentFragment(),o=this.annotations,r=n.getOption("lineWrapping"),a=r&&1.5*n.defaultTextHeight(),s=null,h=null;function l(t,e){var i;return s!=t.line&&(s=t.line,h=n.getLineHandle(t.line),(i=n.getLineHandleVisualStart(h))!=h&&(s=n.getLineNumber(i),h=i)),h.widgets&&h.widgets.length||r&&h.height>a?n.charCoords(t,"local")[e?"top":"bottom"]:n.heightAtLine(h,"local")+(e?0:h.height)}var d=n.lastLine();if(n.display.barWidth)for(var c,p=0;p<o.length;p++){var u=o[p];if(!(u.to.line>d)){for(var m,f,g=c||l(u.from,!0)*e,H=l(u.to,!1)*e;p<o.length-1&&!(o[p+1].to.line>d)&&!(H+.9<(c=l(o[p+1].from,!0)*e));)H=l((u=o[++p]).to,!1)*e;H!=g&&(m=Math.max(H-g,3),(f=i.appendChild(document.createElement("div"))).style.cssText="position: absolute; right: 0px; width: "+Math.max(n.display.barWidth-1,2)+"px; top: "+(g+this.buttonHeight)+"px; height: "+m+"px",f.className=this.options.className,u.id&&f.setAttribute("annotation-id",u.id))}}this.div.textContent="",this.div.appendChild(i)},e.prototype.clear=function(){this.cm.off("refresh",this.resizeHandler),this.cm.off("markerAdded",this.resizeHandler),this.cm.off("markerCleared",this.resizeHandler),this.changeHandler&&this.cm.off("changes",this.changeHandler),this.div.parentNode.removeChild(this.div)}});

deps/codemirror/base16-dark.min.css

@@ -1 +0,0 @@
-.cm-s-base16-dark.CodeMirror{background:#151515;color:#e0e0e0}.cm-s-base16-dark div.CodeMirror-selected{background:#303030}.cm-s-base16-dark .CodeMirror-line::selection,.cm-s-base16-dark .CodeMirror-line>span::selection,.cm-s-base16-dark .CodeMirror-line>span>span::selection{background:rgba(48,48,48,.99)}.cm-s-base16-dark .CodeMirror-line::-moz-selection,.cm-s-base16-dark .CodeMirror-line>span::-moz-selection,.cm-s-base16-dark .CodeMirror-line>span>span::-moz-selection{background:rgba(48,48,48,.99)}.cm-s-base16-dark .CodeMirror-gutters{background:#151515;border-right:0}.cm-s-base16-dark .CodeMirror-guttermarker{color:#ac4142}.cm-s-base16-dark .CodeMirror-guttermarker-subtle{color:#505050}.cm-s-base16-dark .CodeMirror-linenumber{color:#505050}.cm-s-base16-dark .CodeMirror-cursor{border-left:1px solid #b0b0b0}.cm-s-base16-dark.cm-fat-cursor .CodeMirror-cursor{background-color:#8e8d8875!important}.cm-s-base16-dark .cm-animate-fat-cursor{background-color:#8e8d8875!important}.cm-s-base16-dark span.cm-comment{color:#8f5536}.cm-s-base16-dark span.cm-atom{color:#aa759f}.cm-s-base16-dark span.cm-number{color:#aa759f}.cm-s-base16-dark span.cm-attribute,.cm-s-base16-dark span.cm-property{color:#90a959}.cm-s-base16-dark span.cm-keyword{color:#ac4142}.cm-s-base16-dark span.cm-string{color:#f4bf75}.cm-s-base16-dark span.cm-variable{color:#90a959}.cm-s-base16-dark span.cm-variable-2{color:#6a9fb5}.cm-s-base16-dark span.cm-def{color:#d28445}.cm-s-base16-dark span.cm-bracket{color:#e0e0e0}.cm-s-base16-dark span.cm-tag{color:#ac4142}.cm-s-base16-dark span.cm-link{color:#aa759f}.cm-s-base16-dark span.cm-error{background:#ac4142;color:#b0b0b0}.cm-s-base16-dark .CodeMirror-activeline-background{background:#202020}.cm-s-base16-dark .CodeMirror-matchingbracket{text-decoration:underline;color:#fff!important}

deps/codemirror/dialog.min.css

@@ -1 +0,0 @@
-.CodeMirror-dialog{position:absolute;left:0;right:0;background:inherit;z-index:15;padding:.1em .8em;overflow:hidden;color:inherit}.CodeMirror-dialog-top{border-bottom:1px solid #eee;top:0}.CodeMirror-dialog-bottom{border-top:1px solid #eee;bottom:0}.CodeMirror-dialog input{border:none;outline:0;background:0 0;width:20em;color:inherit;font-family:monospace}.CodeMirror-dialog button{font-size:70%}

deps/codemirror/dialog.min.js

@@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(s){function f(e,o,n){var e=e.getWrapperElement(),t=e.appendChild(document.createElement("div"));return t.className=n?"CodeMirror-dialog CodeMirror-dialog-bottom":"CodeMirror-dialog CodeMirror-dialog-top","string"==typeof o?t.innerHTML=o:t.appendChild(o),s.addClass(e,"dialog-opened"),t}function p(e,o){e.state.currentNotificationClose&&e.state.currentNotificationClose(),e.state.currentNotificationClose=o}s.defineExtension("openDialog",function(e,o,n){n=n||{},p(this,null);var t=f(this,e,n.bottom),i=!1,r=this;function u(e){"string"==typeof e?l.value=e:i||(i=!0,s.rmClass(t.parentNode,"dialog-opened"),t.parentNode.removeChild(t),r.focus(),n.onClose&&n.onClose(t))}var l=t.getElementsByTagName("input")[0];return l?(l.focus(),n.value&&(l.value=n.value,!1!==n.selectValueOnOpen&&l.select()),n.onInput&&s.on(l,"input",function(e){n.onInput(e,l.value,u)}),n.onKeyUp&&s.on(l,"keyup",function(e){n.onKeyUp(e,l.value,u)}),s.on(l,"keydown",function(e){n&&n.onKeyDown&&n.onKeyDown(e,l.value,u)||((27==e.keyCode||!1!==n.closeOnEnter&&13==e.keyCode)&&(l.blur(),s.e_stop(e),u()),13==e.keyCode&&o(l.value,e))}),!1!==n.closeOnBlur&&s.on(t,"focusout",function(e){null!==e.relatedTarget&&u()})):(e=t.getElementsByTagName("button")[0])&&(s.on(e,"click",function(){u(),r.focus()}),!1!==n.closeOnBlur&&s.on(e,"blur",u),e.focus()),u}),s.defineExtension("openConfirm",function(e,o,n){p(this,null);var t=f(this,e,n&&n.bottom),i=t.getElementsByTagName("button"),r=!1,u=this,l=1;function a(){r||(r=!0,s.rmClass(t.parentNode,"dialog-opened"),t.parentNode.removeChild(t),u.focus())}i[0].focus();for(var c=0;c<i.length;++c){var d=i[c];!function(o){s.on(d,"click",function(e){s.e_preventDefault(e),a(),o&&o(u)})}(o[c]),s.on(d,"blur",function(){--l,setTimeout(function(){l<=0&&a()},200)}),s.on(d,"focus",function(){++l})}}),s.defineExtension("openNotification",function(e,o){p(this,r);var n,t=f(this,e,o&&o.bottom),i=!1,e=o&&void 0!==o.duration?o.duration:5e3;function r(){i||(i=!0,clearTimeout(n),s.rmClass(t.parentNode,"dialog-opened"),t.parentNode.removeChild(t))}return s.on(t,"click",function(e){s.e_preventDefault(e),r()}),e&&(n=setTimeout(r,e)),r})});

deps/codemirror/htmlmixed.min.js

@@ -1 +0,0 @@
-!function(t){"object"==typeof exports&&"object"==typeof module?t(require("../../lib/codemirror"),require("../xml/xml"),require("../javascript/javascript"),require("../css/css")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../xml/xml","../javascript/javascript","../css/css"],t):t(CodeMirror)}(function(m){"use strict";var l={script:[["lang",/(javascript|babel)/i,"javascript"],["type",/^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^module$|^$/i,"javascript"],["type",/./,"text/plain"],[null,null,"javascript"]],style:[["lang",/^css$/i,"css"],["type",/^(text\/)?(x-)?(stylesheet|css)$/i,"css"],["type",/./,"text/plain"],[null,null,"css"]]};var a={};function d(t,e){e=t.match(a[t=e]||(a[t]=new RegExp("\\s+"+t+"\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*")));return e?/^\s*(.*?)\s*$/.exec(e[2])[1]:""}function g(t,e){return new RegExp((e?"^":"")+"</\\s*"+t+"\\s*>","i")}function o(t,e){for(var a in t)for(var n=e[a]||(e[a]=[]),l=t[a],o=l.length-1;0<=o;o--)n.unshift(l[o])}m.defineMode("htmlmixed",function(i,t){var c=m.getMode(i,{name:"xml",htmlMode:!0,multilineTagIndentFactor:t.multilineTagIndentFactor,multilineTagIndentPastTag:t.multilineTagIndentPastTag,allowMissingTagName:t.allowMissingTagName}),s={},e=t&&t.tags,a=t&&t.scriptTypes;if(o(l,s),e&&o(e,s),a)for(var n=a.length-1;0<=n;n--)s.script.unshift(["type",a[n].matches,a[n].mode]);function u(t,e){var a,o,r,n=c.token(t,e.htmlState),l=/\btag\b/.test(n);return l&&!/[<>\s\/]/.test(t.current())&&(a=e.htmlState.tagName&&e.htmlState.tagName.toLowerCase())&&s.hasOwnProperty(a)?e.inTag=a+" ":e.inTag&&l&&/>$/.test(t.current())?(a=/^([\S]+) (.*)/.exec(e.inTag),e.inTag=null,l=">"==t.current()&&function(t,e){for(var a=0;a<t.length;a++){var n=t[a];if(!n[0]||n[1].test(d(e,n[0])))return n[2]}}(s[a[1]],a[2]),l=m.getMode(i,l),o=g(a[1],!0),r=g(a[1],!1),e.token=function(t,e){return t.match(o,!1)?(e.token=u,e.localState=e.localMode=null):(a=t,n=r,t=e.localMode.token(t,e.localState),e=a.current(),-1<(l=e.search(n))?a.backUp(e.length-l):e.match(/<\/?$/)&&(a.backUp(e.length),a.match(n,!1)||a.match(e)),t);var a,n,l},e.localMode=l,e.localState=m.startState(l,c.indent(e.htmlState,"",""))):e.inTag&&(e.inTag+=t.current(),t.eol()&&(e.inTag+=" ")),n}return{startState:function(){return{token:u,inTag:null,localMode:null,localState:null,htmlState:m.startState(c)}},copyState:function(t){var e;return t.localState&&(e=m.copyState(t.localMode,t.localState)),{token:t.token,inTag:t.inTag,localMode:t.localMode,localState:e,htmlState:m.copyState(c,t.htmlState)}},token:function(t,e){return e.token(t,e)},indent:function(t,e,a){return!t.localMode||/^\s*<\//.test(e)?c.indent(t.htmlState,e,a):t.localMode.indent?t.localMode.indent(t.localState,e,a):m.Pass},innerMode:function(t){return{state:t.localState||t.htmlState,mode:t.localMode||c}}}},"xml","javascript","css"),m.defineMIME("text/html","htmlmixed")});

deps/codemirror/javascript-lint.min.js

@@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror")):"function"==typeof define&&define.amd?define(["../../lib/codemirror"],e):e(CodeMirror)}(function(a){"use strict";a.registerHelper("lint","javascript",function(e,r){if(!window.JSHINT)return window.console&&window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run."),[];if(r.indent||(r.indent=1),JSHINT(e,r,r.globals),e=JSHINT.data().errors,r=[],e)for(var n=e,o=r,i=0;i<n.length;i++){var t,d,s,c=n[i];c&&(c.line<=0?window.console&&window.console.warn("Cannot display JSHint error (invalid line "+c.line+")",c):(t=c.character-1,d=1+t,c.evidence&&-1<(s=c.evidence.substring(t).search(/.\b/))&&(d+=s),s={message:c.reason,severity:c.code&&c.code.startsWith("W")?"warning":"error",from:a.Pos(c.line-1,t),to:a.Pos(c.line-1,d)},o.push(s)))}return r})});

deps/codemirror/jump-to-line.min.js

@@ -1 +0,0 @@
-!function(e){"object"==typeof exports&&"object"==typeof module?e(require("../../lib/codemirror"),require("../dialog/dialog")):"function"==typeof define&&define.amd?define(["../../lib/codemirror","../dialog/dialog"],e):e(CodeMirror)}(function(e){"use strict";function l(e,o){var r=Number(o);return/^[-+]/.test(o)?e.getCursor().line+r:r-1}e.defineOption("search",{bottom:!1}),e.commands.jumpToLine=function(t){var e,o,r,s,i,n=t.getCursor();i=(i=e=t).phrase("Jump to line:")+' <input type="text" style="width: 10em" class="CodeMirror-search-field"/> <span style="color: #888" class="CodeMirror-search-hint">'+i.phrase("(Use line:column or scroll% syntax)")+"</span>",o=t.phrase("Jump to line:"),r=n.line+1+":"+n.ch,s=function(e){var o,r;e&&((o=/^\s*([\+\-]?\d+)\s*\:\s*(\d+)\s*$/.exec(e))?t.setCursor(l(t,o[1]),Number(o[2])):(o=/^\s*([\+\-]?\d+(\.\d+)?)\%\s*/.exec(e))?(r=Math.round(t.lineCount()*Number(o[1])/100),/^[-+]/.test(o[1])&&(r=n.line+r+1),t.setCursor(r-1,n.ch)):(o=/^\s*\:?\s*([\+\-]?\d+)\s*/.exec(e))&&t.setCursor(l(t,o[1]),n.ch))},e.openDialog?e.openDialog(i,s,{value:r,selectValueOnOpen:!0,bottom:e.options.search.bottom}):s(prompt(o,r))},e.keyMap.default["Alt-G"]="jumpToLine"});