ssb: Work in progress trying to get the emoji picker in line with some of the other modal dialogs.

This reverts commit 7f4e2617ee.

.clang-format

@@ -14,7 +14,7 @@ IndentWidth: 4
 MaxEmptyLinesToKeep: 1
 ObjCBlockIndentWidth: 4
 ObjCBreakBeforeNestedBlockParam: false
-SortIncludes: false
+SortIncludes: true
 TabWidth: 4
 UseTab: Always
 ...

.gitea/workflows/build.yaml

@@ -0,0 +1,38 @@
+name: Build Tilde Friends
+run-name: ${{ gitea.actor }} running 🚀
+on: [push]
+
+jobs:
+  Build-All:
+    runs-on: ubuntu-latest
+    container:
+      valid_volumes: ['/opt/keys']
+      volumes:
+        - /opt/keys:/opt/keys
+    steps:
+      - name: check out code
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - run: ln -s /opt/keys .keys
+      - name: Setup JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+        with:
+          packages: 'tools platform-tools build-tools;34.0.0 platforms;android-34 ndk;26.3.11579264'
+      - run: sudo apt update && sudo apt install -y doxygen graphviz mingw-w64 libgpgme11
+      - run: ANDROID_SDK=$HOME/.android/sdk make -j`nproc` all docs
+      - run: docker build .
+      - uses: actions/upload-artifact@v3
+        with:
+          path: out/TildeFriends-release.fdroid.apk
+      - uses: actions/upload-artifact@v3
+        with:
+          path: out/winrelease/tildefriends.exe
+      - uses: actions/upload-artifact@v3
+        with:
+          path: out/tildefriends-x86_64.AppImage

.gitignore

@@ -1,10 +1,18 @@
+build/
+*.core
 db.*
 deps/ios_toolchain/
 deps/openssl/
 dist/
+.flatpak-builder
 .keys
+logs/
 **/node_modules
 out
+repo/
+result
 *.swo
 *.swp
+tmp/
+unsigned/
 .zsign_cache/

.gitmodules

@@ -0,0 +1,31 @@
+[submodule "deps/zlib"]
+	path = deps/zlib
+	url = https://github.com/madler/zlib.git
+[submodule "deps/libsodium"]
+	path = deps/libsodium
+	url = https://github.com/jedisct1/libsodium.git
+[submodule "deps/quickjs"]
+	path = deps/quickjs
+	url = https://github.com/bellard/quickjs.git
+[submodule "deps/crypt_blowfish"]
+	path = deps/crypt_blowfish
+	url = https://github.com/openwall/crypt_blowfish.git
+[submodule "deps/libbacktrace"]
+	path = deps/libbacktrace
+	url = https://github.com/ianlancetaylor/libbacktrace.git
+[submodule "deps/libuv"]
+	path = deps/libuv
+	url = https://github.com/libuv/libuv.git
+[submodule "deps/picohttpparser"]
+	path = deps/picohttpparser
+	url = https://github.com/h2o/picohttpparser.git
+[submodule "deps/openssl_src"]
+	path = deps/openssl_src
+	url = https://github.com/openssl/openssl.git
+	shallow = true
+[submodule "deps/c-ares"]
+	path = deps/c-ares
+	url = https://github.com/c-ares/c-ares.git
+[submodule "docs"]
+	path = docs
+	url = https://dev.tildefriends.net/cory/tildefriends.wiki.git

.prettierignore

@@ -2,6 +2,7 @@ node_modules
 src
 deps
 .clang-format
+flake.lock
 
 # Minified files
 **/*.min.css

GNUmakefile

@@ -3,12 +3,27 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 17
-VERSION_NUMBER := 0.0.17-wip
-VERSION_NAME := Please enjoy responsibly.
+## == Tilde Friends build. ==
+##
+## This is a list of all supported build targets.
+##
+## Consider passing -j$(nproc) or adding it to your $MAKEFLAGS to build in
+## parallel (faster).
+##
+## Useful variables to override:
+## CC := Compiler.
+## AS := Assembler.
+## LD := Linker.
+## ANDROID_SDK := Path to the Android SDK.
 
-SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3450200.zip
-LIBUV_URL := https://dist.libuv.org/dist/v1.48.0/libuv-v1.48.0.tar.gz
+VERSION_CODE := 31
+VERSION_NUMBER := 0.0.26-wip
+VERSION_NAME := This program kills fascists.
+
+SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3470200.zip
+BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
+APPIMAGETOOL_URL := https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
+APPIMAGETOOL_MD5 := e989fadfc4d685fd3d6aeeb9b525d74d  out/appimagetool
 
 PROJECT = tildefriends
 BUILD_DIR ?= out
@@ -16,18 +31,12 @@ UNAME_S := $(shell uname -s)
 UNAME_M := $(shell uname -m)
 
 ANDROID_SDK ?= ~/Android/Sdk
+BUNDLETOOL = out/bundletool.jar
 
-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
+HAVE_WIN := 0
 
-ifeq ($(UNAME_M),aarch64)
-debug: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
-debug: LDFLAGS += -fsanitize=address -fsanitize=undefined
-endif
+export SOURCE_DATE_EPOCH=1
+export TZ=UTC
 
 ifeq ($(UNAME_S),Darwin)
 BUILD_TYPES := macosdebug macosrelease iosdebug iosrelease iossimdebug iossimrelease
@@ -41,7 +50,8 @@ BUILD_TYPES := debug release
 CFLAGS += -Dstatic_assert=_Static_assert
 LDFLAGS += \
 	-lbsd \
-	-lnetwork
+	-lnetwork \
+	-Wno-stringop-overflow
 else ifeq ($(UNAME_S),OpenBSD)
 BUILD_TYPES := debug release
 CFLAGS += \
@@ -51,7 +61,6 @@ LDFLAGS += \
 	-lc++abi
 HAVE_ANDROID := 0
 HAVE_LINUX_IOS := 0
-HAVE_WIN := 0
 else
 $(error Unexpected host platform $(UNAME_S).)
 endif
@@ -61,18 +70,23 @@ CFLAGS += \
 	-Wall \
 	-Wextra \
 	-Wno-unused-parameter \
+	-Wno-unknown-warning-option \
 	-MMD \
 	-MP \
 	-ffunction-sections \
 	-fdata-sections \
 	-fno-exceptions \
 	-g
+LDFLAGS += \
+	-Wno-attributes \
+	-Wno-aggressive-loop-optimizations \
+	-flto=auto
 
-ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
-ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-34
-ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.2.11394342
 ANDROID_MIN_SDK_VERSION := 24
 ANDROID_TARGET_SDK_VERSION := 34
+ANDROID_BUILD_TOOLS := $(ANDROID_SDK)/build-tools/34.0.0
+ANDROID_PLATFORM := $(ANDROID_SDK)/platforms/android-$(ANDROID_TARGET_SDK_VERSION)
+ANDROID_NDK ?= $(ANDROID_SDK)/ndk/26.3.11579264
 
 ANDROID_ARMV7A_TARGETS := \
 	out/androiddebug-armv7a/tildefriends \
@@ -101,7 +115,7 @@ BUILD_TYPES += \
 	androidrelease-x86 \
 	androiddebug-x86_64 \
 	androidrelease-x86_64
-all: out/TildeFriends-arm-debug.apk out/TildeFriends-arm-release.apk out/TildeFriends-x86-debug.apk out/TildeFriends-x86-release.apk
+all: out/TildeFriends-arm-debug.apk out/TildeFriends-arm-release.apk out/TildeFriends-x86-debug.apk out/TildeFriends-x86-release.apk out/TildeFriends-release.fdroid.apk
 endif
 
 WINDOWS_TARGETS := \
@@ -161,19 +175,26 @@ ANDROID_RELEASE_TARGETS := $(filter-out $(DEBUG_TARGETS),$(ANDROID_TARGETS))
 NONANDROID_RELEASE_TARGETS := $(filter-out $(ANDROID_ARM64_TARGETS),$(RELEASE_TARGETS))
 NONANDROID_TARGETS := $(filter-out $(ANDROID_TARGETS),$(ALL_TARGETS))
 NONMACOS_TARGETS := $(filter-out $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS),$(ALL_TARGETS))
+DEADSTRIP_TARGETS := $(filter-out $(ANDROID_TARGETS),$(NONMACOS_TARGETS))
+ifneq ($(UNAME_S),OpenBSD)
+$(NONMACOS_TARGETS): LDFLAGS += -static-libgcc
+endif
 
 $(NONANDROID_TARGETS): CFLAGS += -fno-omit-frame-pointer
-$(filter-out $(ANDROID_TARGETS) $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
+$(filter-out $(WINDOWS_TARGETS),$(ALL_TARGETS)): LDFLAGS += -rdynamic
 $(ANDROID_TARGETS): CFLAGS += \
 	--sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot \
 	-fPIC \
 	-fdebug-compilation-dir . \
 	-fomit-frame-pointer \
 	-fno-asynchronous-unwind-tables \
-	-funwind-tables
+	-funwind-tables \
+	-Wno-unknown-warning-option
 $(ANDROID_TARGETS): LDFLAGS += --sysroot $(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/sysroot -fPIC
 $(DEBUG_TARGETS): CFLAGS += -DDEBUG -Og
-$(RELEASE_TARGETS): CFLAGS += -DNDEBUG
+$(RELEASE_TARGETS): CFLAGS += \
+	-DNDEBUG \
+	-flto
 $(NONANDROID_RELEASE_TARGETS): CFLAGS += -O3
 $(ANDROID_RELEASE_TARGETS): CFLAGS += -Oz
 $(WINDOWS_TARGETS): CC = x86_64-w64-mingw32-gcc-win32
@@ -216,12 +237,27 @@ $(ANDROID_X86_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86/usr/local/lib
 $(ANDROID_X86_64_TARGETS): CFLAGS += -Ideps/openssl/android/x86_64/usr/local/include
 $(ANDROID_X86_64_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
-$(NONMACOS_TARGETS): LDFLAGS += -Wl,--gc-sections
-$(IOS_TARGETS): CFLAGS += -mios-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
-$(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
+$(DEADSTRIP_TARGETS): LDFLAGS += -Wl,--gc-sections
+$(IOS_TARGETS): CFLAGS += -miphoneos-version-min=9.0 -Ideps/openssl/ios/ios64-xcrun/usr/local/include
+$(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=9.0 -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
 $(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
 $(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib
 
+ifeq ($(UNAME_M),x86_64)
+ifeq ($(UNAME_S),Linux)
+all: appimage
+endif
+ifneq ($(UNAME_S),Haiku)
+out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
+endif
+endif
+
+ifeq ($(UNAME_M),aarch64)
+out/debug/tildefriends: CFLAGS += -fsanitize=address -fsanitize=undefined -fno-common
+out/debug/tildefriends: LDFLAGS += -fsanitize=address -fsanitize=undefined
+endif
+
 get_objs = \
 	$(foreach build_type,$(BUILD_TYPES),$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)))))) \
 	$(foreach build_type,debug release,$(addprefix $(BUILD_DIR)/$(build_type)/,$(addsuffix .o,$(basename $(value $(1)_unix))))) \
@@ -237,6 +273,8 @@ APP_SOURCES_ios := $(wildcard src/*.m)
 APP_OBJS := $(call get_objs,APP_SOURCES)
 $(APP_OBJS): CFLAGS += \
 	-Ideps/base64c/include \
+	-Ideps/c-ares/include \
+	-Ideps/c-ares_config \
 	-Ideps/crypt_blowfish \
 	-Ideps/libbacktrace \
 	-Ideps/libsodium \
@@ -255,6 +293,108 @@ $(filter-out $(BUILD_DIR)/android% $(BUILD_DIR)/macos% $(BUILD_DIR)/ios%,$(APP_O
 	-fanalyzer
 endif
 
+ARES_SOURCES := \
+	deps/c-ares/src/lib/ares_addrinfo2hostent.c \
+	deps/c-ares/src/lib/ares_addrinfo_localhost.c \
+	deps/c-ares/src/lib/ares_android.c \
+	deps/c-ares/src/lib/ares_cancel.c \
+	deps/c-ares/src/lib/ares_close_sockets.c \
+	deps/c-ares/src/lib/ares_conn.c \
+	deps/c-ares/src/lib/ares_cookie.c \
+	deps/c-ares/src/lib/ares_data.c \
+	deps/c-ares/src/lib/ares_destroy.c \
+	deps/c-ares/src/lib/ares_free_hostent.c \
+	deps/c-ares/src/lib/ares_free_string.c \
+	deps/c-ares/src/lib/ares_freeaddrinfo.c \
+	deps/c-ares/src/lib/ares_getaddrinfo.c \
+	deps/c-ares/src/lib/ares_getenv.c \
+	deps/c-ares/src/lib/ares_gethostbyaddr.c \
+	deps/c-ares/src/lib/ares_gethostbyname.c \
+	deps/c-ares/src/lib/ares_getnameinfo.c \
+	deps/c-ares/src/lib/ares_hosts_file.c \
+	deps/c-ares/src/lib/ares_init.c \
+	deps/c-ares/src/lib/ares_library_init.c \
+	deps/c-ares/src/lib/ares_metrics.c \
+	deps/c-ares/src/lib/ares_options.c \
+	deps/c-ares/src/lib/ares_parse_into_addrinfo.c \
+	deps/c-ares/src/lib/ares_process.c \
+	deps/c-ares/src/lib/ares_qcache.c \
+	deps/c-ares/src/lib/ares_query.c \
+	deps/c-ares/src/lib/ares_search.c \
+	deps/c-ares/src/lib/ares_send.c \
+	deps/c-ares/src/lib/ares_set_socket_functions.c \
+	deps/c-ares/src/lib/ares_socket.c \
+	deps/c-ares/src/lib/ares_sortaddrinfo.c \
+	deps/c-ares/src/lib/ares_strerror.c \
+	deps/c-ares/src/lib/ares_sysconfig.c \
+	deps/c-ares/src/lib/ares_sysconfig_files.c \
+	deps/c-ares/src/lib/ares_sysconfig_mac.c \
+	deps/c-ares/src/lib/ares_sysconfig_win.c \
+	deps/c-ares/src/lib/ares_update_servers.c \
+	deps/c-ares/src/lib/ares_version.c \
+	deps/c-ares/src/lib/dsa/ares_array.c \
+	deps/c-ares/src/lib/dsa/ares_htable.c \
+	deps/c-ares/src/lib/dsa/ares_htable_asvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_dict.c \
+	deps/c-ares/src/lib/dsa/ares_htable_strvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_szvp.c \
+	deps/c-ares/src/lib/dsa/ares_htable_vpvp.c \
+	deps/c-ares/src/lib/dsa/ares_llist.c \
+	deps/c-ares/src/lib/dsa/ares_slist.c \
+	deps/c-ares/src/lib/event/ares_event_configchg.c \
+	deps/c-ares/src/lib/event/ares_event_epoll.c \
+	deps/c-ares/src/lib/event/ares_event_kqueue.c \
+	deps/c-ares/src/lib/event/ares_event_poll.c \
+	deps/c-ares/src/lib/event/ares_event_select.c \
+	deps/c-ares/src/lib/event/ares_event_thread.c \
+	deps/c-ares/src/lib/event/ares_event_wake_pipe.c \
+	deps/c-ares/src/lib/event/ares_event_win32.c \
+	deps/c-ares/src/lib/inet_net_pton.c \
+	deps/c-ares/src/lib/inet_ntop.c \
+	deps/c-ares/src/lib/legacy/ares_create_query.c \
+	deps/c-ares/src/lib/legacy/ares_expand_name.c \
+	deps/c-ares/src/lib/legacy/ares_expand_string.c \
+	deps/c-ares/src/lib/legacy/ares_fds.c \
+	deps/c-ares/src/lib/legacy/ares_getsock.c \
+	deps/c-ares/src/lib/legacy/ares_parse_a_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_aaaa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_caa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_mx_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_naptr_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_ns_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_ptr_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_soa_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_srv_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_txt_reply.c \
+	deps/c-ares/src/lib/legacy/ares_parse_uri_reply.c \
+	deps/c-ares/src/lib/record/ares_dns_mapping.c \
+	deps/c-ares/src/lib/record/ares_dns_multistring.c \
+	deps/c-ares/src/lib/record/ares_dns_name.c \
+	deps/c-ares/src/lib/record/ares_dns_parse.c \
+	deps/c-ares/src/lib/record/ares_dns_record.c \
+	deps/c-ares/src/lib/record/ares_dns_write.c \
+	deps/c-ares/src/lib/str/ares_buf.c \
+	deps/c-ares/src/lib/str/ares_str.c \
+	deps/c-ares/src/lib/str/ares_strsplit.c \
+	deps/c-ares/src/lib/util/ares_iface_ips.c \
+	deps/c-ares/src/lib/util/ares_math.c \
+	deps/c-ares/src/lib/util/ares_rand.c \
+	deps/c-ares/src/lib/util/ares_threads.c \
+	deps/c-ares/src/lib/util/ares_timeval.c \
+	deps/c-ares/src/lib/util/ares_uri.c \
+	deps/c-ares/src/lib/windows_port.c \
+	deps/c-ares/src/lib/ares_timeout.c
+ARES_OBJS := $(call get_objs,ARES_SOURCES)
+$(ARES_OBJS): CFLAGS += \
+	-Ideps/c-ares/include \
+	-Ideps/c-ares/src/lib \
+	-Ideps/c-ares/src/lib/include \
+	-Ideps/c-ares_config/ \
+	-D_GNU_SOURCE \
+	-Wno-unused-function \
+	-Wno-deprecated-declarations \
+	-Wno-unused-result
+
 BLOWFISH_SOURCES := \
 	deps/crypt_blowfish/crypt_blowfish.c \
 	deps/crypt_blowfish/crypt_gensalt.c \
@@ -382,10 +522,17 @@ $(UV_OBJS): CFLAGS += \
 	-Wno-incompatible-pointer-types \
 	-Wno-maybe-uninitialized \
 	-Wno-sign-compare \
+	-Wno-unknown-attributes \
 	-Wno-unused-but-set-parameter \
 	-Wno-unused-but-set-variable \
 	-Wno-unused-result \
-	-Wno-unused-variable
+	-Wno-unused-variable \
+	-Wno-nonnull
+$(UV_OBJS): CFLAGS += -fno-lto
+$(filter out/win%,$(UV_OBJS)): \
+	CFLAGS += \
+		-Wno-cast-function-type \
+		-Wno-missing-braces
 ifeq ($(UNAME_S),Linux)
 $(UV_OBJS): CFLAGS += \
 	-D_GNU_SOURCE
@@ -578,7 +725,7 @@ $(MINIUNZIP_OBJS): CFLAGS += \
 LDFLAGS += \
 	-pthread \
 	-lm
-debug release $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
+$(LINUX_TARGETS) $(MACOS_TARGETS) $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
 	-lssl \
 	-lcrypto
 ifneq ($(UNAME_S),Haiku)
@@ -613,13 +760,31 @@ $(IOS_TARGETS) $(IOSSIM_TARGETS): LDFLAGS += \
 	-framework UIKit \
 	-framework WebKit
 
-unix: debug release
-win: windebug winrelease
-all: $(BUILD_TYPES)
+##
+## Common targets:
+##
+debug: ## Build a debug executable for the current platform.
+release: ## Build a release executable for the current platform.
+all: $(BUILD_TYPES) ## Build all targets that appear possible to build on this machine.
+unix: debug release ## Build all UNIX targets.
+win: windebug winrelease ## Build all Windows targets.
 .PHONY: all win unix
 
+##
+## Windows targets:
+##
+windebug: ## Build a debug win32 executable.
+winrelease: ## Build a release win32 executable.
+
+##
+## MacOS targets:
+##
+macosdebug: ## Build a MacOS debug executable.
+macosrelease: ## Build a MacOS release executable.
+
 ALL_APP_OBJS := \
 	$(APP_OBJS) \
+	$(ARES_OBJS) \
 	$(BLOWFISH_OBJS) \
 	$(LIBBACKTRACE_OBJS) \
 	$(MINIUNZIP_OBJS) \
@@ -672,7 +837,18 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST))
 		-e 's/android:targetSdkVersion="[[:digit:]]*"/android:targetSdkVersion="$(ANDROID_TARGET_SDK_VERSION)"/' \
 		$@
 
-# Android support.
+##
+## Android targets:
+##
+androiddebug: ## Build a debug 64-bit ARM Android APK.
+androidrelease: ## Build a release 64-bit ARM Android APK.
+androiddebug-armv7a: ## Build a debug 32-bit ARM Android APK.
+androidrelease-armv7a: ## Build a release 32-bit ARM Android APK.
+androiddebug-x86: ## Build a debug x86 Android APK.
+androidrelease-x86: ## Build a release x86 Android APK.
+androiddebug-x86_64: ## Build a debug x86_64 Android APK.
+androidrelease-x86_64: ## Build a release x86_64 Android APK.
+
 out/res/layout_activity_main.xml.flat: src/android/res/layout/activity_main.xml
 	@mkdir -p $(dir $@)
 	@echo "[aapt2] $@"
@@ -684,20 +860,37 @@ out/res/drawable_icon.xml.flat: src/android/res/drawable/icon.xml
 	@$(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
-	@mkdir -p $(dir $@)
-	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat --manifest src/android/AndroidManifest.xml -o out/apk/res.apk --java out/gen/
+	@echo [aapt2 link] res.apk
+	@mkdir -p out/apk/
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--manifest src/android/AndroidManifest.xml \
+		-o out/apk/res.apk \
+		--java out/gen/
+
+out/apk/res.fdroid.apk out/gen_fdroid/com/unprompted/tildefriends/R.java: out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat src/android/AndroidManifest.xml
+	@echo [aapt2 link] res.fdroid.apk
+	@mkdir -p out/apk/
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link -I $(ANDROID_PLATFORM)/android.jar out/res/layout_activity_main.xml.flat out/res/drawable_icon.xml.flat \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--rename-manifest-package com.unprompted.tildefriends.fdroid \
+		--manifest src/android/AndroidManifest.xml \
+		-o out/apk/res.fdroid.apk \
+		--java out/gen_fdroid/
 
 JAVA_FILES := out/gen/com/unprompted/tildefriends/R.java $(wildcard src/android/com/unprompted/tildefriends/*.java)
 CLASS_FILES := $(foreach src,$(JAVA_FILES),out/classes/com/unprompted/tildefriends/$(notdir $(src:.java=.class)))
 
 $(CLASS_FILES) &: $(JAVA_FILES)
 	@echo "[javac] $(CLASS_FILES)"
-	@javac --release 8 -Xlint:deprecation -classpath $(ANDROID_PLATFORM)/android.jar -d out/classes $(JAVA_FILES)
+	@javac --release 8 -encoding UTF-8 -Xlint:deprecation -XDuseUnsharedTable=true -classpath $(ANDROID_PLATFORM)/android.jar:$(ANDROID_BUILD_TOOLS)/core-lambda-stubs.jar -d out/classes $(JAVA_FILES)
 
 out/apk/classes.dex: $(CLASS_FILES)
 	@mkdir -p $(dir $@)
 	@echo "[d8] $@"
-	@$(ANDROID_BUILD_TOOLS)/d8 --$(BUILD_TYPE) --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
+	@$(ANDROID_BUILD_TOOLS)/d8 --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class
 
 PACKAGE_DIRS := \
 	apps/ \
@@ -706,42 +899,118 @@ PACKAGE_DIRS := \
 	deps/prettier/ \
 	deps/lit/
 
-RAW_FILES := $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f))
+RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*')))
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-arm-release.unsigned.apk: BUILD_TYPE := release
 out/apk/TildeFriends-x86-debug.unsigned.apk: BUILD_TYPE := debug
 out/apk/TildeFriends-x86-release.unsigned.apk: BUILD_TYPE := release
+out/apk/TildeFriends-release.fdroid.unsigned.apk: BUILD_TYPE := release
 
 out/apk/TildeFriends-arm-debug.unsigned.apk: out/apk/classes.dex out/androiddebug/tildefriends out/androiddebug-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-arm-release.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-armv7a/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-x86-debug.unsigned.apk: out/apk/classes.dex out/androiddebug-x86_64/tildefriends out/androiddebug-x86/tildefriends $(RAW_FILES) out/apk/res.apk
 out/apk/TildeFriends-x86-release.unsigned.apk: out/apk/classes.dex out/androidrelease-x86_64/tildefriends out/androidrelease-x86/tildefriends $(RAW_FILES) out/apk/res.apk
+out/apk/TildeFriends-release.fdroid.unsigned.apk: out/apk/classes.dex out/androidrelease/tildefriends out/androidrelease-armv7a/tildefriends out/androidrelease-x86_64/tildefriends out/androidrelease-x86/tildefriends $(RAW_FILES) out/apk/res.fdroid.apk
+
+$(BUNDLETOOL):
+	@echo [curl] $(BUNDLETOOL_URL) TO $@
+	@curl -q -L --create-dirs -o $@ $(BUNDLETOOL_URL)
+
+out/TildeFriends.aab: out/apk/classes.dex $(filter-out %debug%, $(ANDROID_TARGETS)) $(RAW_FILES) out/apk/res.apk src/android/AndroidManifest.xml $(BUNDLETOOL)
+	@rm -rf out/aab/staging/
+	@mkdir -p out/aab/staging
+	@$(ANDROID_BUILD_TOOLS)/aapt2 link --proto-format -o out/aab/temporary.apk \
+		-I $(ANDROID_PLATFORM)/android.jar \
+		--min-sdk-version $(ANDROID_MIN_SDK_VERSION) \
+		--target-sdk-version $(ANDROID_TARGET_SDK_VERSION) \
+		--manifest src/android/AndroidManifest.xml \
+		-R out/res/layout_activity_main.xml.flat \
+		-R out/res/drawable_icon.xml.flat \
+		--auto-add-overlay
+	@unzip out/aab/temporary.apk -d out/aab/staging/
+	@mkdir -p out/aab/staging/root/deps
+	@mkdir -p out/aab/staging/classes
+	@mkdir -p out/aab/staging/dex
+	@mkdir -p out/aab/staging/manifest
+	@mv out/aab/staging/AndroidManifest.xml out/aab/staging/manifest/AndroidManifest.xml
+	@cp out/apk/classes.dex out/aab/staging/dex/
+	@rm -fv out/base.zip
+	@mkdir -p out/aab/staging/lib/arm64-v8a out/aab/staging/lib/armeabi-v7a out/aab/staging/lib/x86_64 out/aab/staging/lib/x86
+	@cp out/androidrelease/tildefriends out/aab/staging/lib/arm64-v8a/libtildefriends.so
+	@cp out/androidrelease-armv7a/tildefriends out/aab/staging/lib/armeabi-v7a/libtildefriends.so
+	@cp out/androidrelease-x86_64/tildefriends out/aab/staging/lib/x86_64/libtildefriends.so
+	@cp out/androidrelease-x86/tildefriends out/aab/staging/lib/x86/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/arm64-v8a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/armeabi-v7a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86_64/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/aab/staging/lib/x86/libtildefriends.so
+	@cp -r apps/ out/aab/staging/root/
+	@rm -rf out/aab/staging/root/apps/welcome*
+	@cp -r core/ out/aab/staging/root/
+	@cp -r deps/prettier/ out/aab/staging/root/deps/
+	@cp -r deps/lit/ out/aab/staging/root/deps/
+	@cp -r deps/codemirror/ out/aab/staging/root/deps/
+	@cd out/aab/staging/; zip -r ../base.zip *; cd ../../../
+	@java -jar $(BUNDLETOOL) build-bundle --overwrite --config=src/android/BundleConfig.json --modules=out/aab/base.zip --output=$@
+	@jarsigner -keystore .keys/android.jks $@ androidKey -storepass android
+
+aab: out/TildeFriends.aab ## Build an Android App Bundle.
+.PHONY: aab
+
+out/TildeFriends.apks: out/TildeFriends.aab $(BUNDLETOOL)
+	@java -jar $(BUNDLETOOL) build-apks --bundle out/TildeFriends.aab --overwrite --output $@ --ks .keys/android.jks --ks-key-alias androidKey --ks-pass pass:android
+
+aabgo: out/TildeFriends.apks $(BUNDLETOOL)
+	@java -jar $(BUNDLETOOL) install-apks --apks out/TildeFriends.apks
+	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
 
 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] $@"
-	@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
-	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/tildefriends.so
+	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-arm-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-arm-$(BUILD_TYPE)/
 	@cd out/apk-arm-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
-	@zip -u $@.zip -q $(RAW_FILES)
+	@zip -u $@.zip -q -9 $(RAW_FILES)
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 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/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/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-x86-$(BUILD_TYPE)/lib/x86/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-x86-$(BUILD_TYPE)/lib/x86/libtildefriends.so
 	@cp out/apk/res.apk $@.zip
 	@cp out/apk/classes.dex out/apk-x86-$(BUILD_TYPE)/
 	@cd out/apk-x86-$(BUILD_TYPE) && zip -u ../../$@.zip -q -9 -r . && cd ../../
-	@zip -u $@.zip -q $(RAW_FILES)
+	@zip -u $@.zip -q -9 $(RAW_FILES)
+	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
+
+out/apk/TildeFriends-%.fdroid.unsigned.apk:
+	@rm -rf out/apk-fdroid-$(BUILD_TYPE) out/apk-fdroid-$(BUILD_TYPE)-raw
+	@mkdir -p $(dir $@) out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/ out/apk-fdroid-$(BUILD_TYPE)/lib/x86/ out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/ out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/
+	@echo "[aapt] $@"
+	@cp out/android$(BUILD_TYPE)-x86_64/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-x86/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/x86/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@cp out/android$(BUILD_TYPE)-armv7a/tildefriends out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/x86_64/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/x86/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/arm64-v8a/libtildefriends.so
+	@$(ANDROID_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip out/apk-fdroid-$(BUILD_TYPE)/lib/armeabi-v7a/libtildefriends.so
+	@cp out/apk/res.fdroid.apk $@.zip
+	@cp out/apk/classes.dex out/apk-fdroid-$(BUILD_TYPE)/classes.dex
+	@touch -d @0 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@chmod 755 out/apk-fdroid-$(BUILD_TYPE)/classes.dex out/apk-fdroid-$(BUILD_TYPE)/lib/*/libtildefriends.so
+	@cd out/apk-fdroid-$(BUILD_TYPE) && zip -X -u ../../$@.zip -q classes.dex lib/*/libtildefriends.so && cd ../../
+	@mkdir out/apk-fdroid-$(BUILD_TYPE)-raw
+	@for i in $(RAW_FILES); do mkdir -p $$(dirname out/apk-fdroid-$(BUILD_TYPE)-raw/$$i) && cp $$i out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && touch -d @0 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i && chmod 644 out/apk-fdroid-$(BUILD_TYPE)-raw/$$i; done
+	@cd out/apk-fdroid-$(BUILD_TYPE)-raw && zip -X -u ../../$@.zip -q $(RAW_FILES) && cd ../../
 	@$(ANDROID_BUILD_TOOLS)/zipalign -f 4 $@.zip $@
 
 out/%.apk: out/apk/%.unsigned.apk
@@ -753,15 +1022,32 @@ out/%.zopfli.apk: out/%.apk
 	$(ANDROID_BUILD_TOOLS)/zipalign -f -z 4 $< $@.zopfli
 	@$(ANDROID_BUILD_TOOLS)/apksigner sign --ks .keys/android.jks --ks-key-alias androidKey --ks-pass pass:android --key-pass pass:android --min-sdk-version $(ANDROID_MIN_SDK_VERSION) --out $@ $@.zopfli
 
-release-apk: out/TildeFriends-arm-release.zopfli.apk out/TildeFriends-x86-release.zopfli.apk
+release-apk: out/TildeFriends-arm-release.zopfli.apk out/TildeFriends-x86-release.zopfli.apk ## Build an Android release APK.
 .PHONY: release-apk
 
-releaseapkgo: out/TildeFriends-arm-release.apk
+fdroid: out/apk/TildeFriends-release.fdroid.unsigned.apk ## Build Android APK for distribution on F-Droid.
+.PHONY: fdroid
+
+apkgo: out/TildeFriends-arm-debug.apk ## Build, install, and run a debug Android APK.
 	@adb install -r $<
-	@adb shell am start com.unprompted.tildefriends/.MainActivity
+	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
+.PHONY: apkgo
+
+releaseapkgo: out/TildeFriends-arm-release.apk ## Build, install, and run a release Android APK.
+	@adb install -r $<
+	@adb shell am start com.unprompted.tildefriends/.TildeFriendsActivity
 .PHONY: releaseapkgo
 
-# iOS Support
+apklog: ## Display Android log output.
+	@adb logcat *:S tildefriends
+.PHONY: apklog
+
+##
+## iPhoneOS targets:
+##
+iosdebug: ## Build a debug iPhoneOS executable.
+iosrelease: ## Build a release iPhoneOS executable.
+
 out/%.app/Info.plist: src/ios/Info.plist
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
@@ -769,12 +1055,13 @@ out/%.app/tildefriends.png: src/ios/tildefriends.png
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
 
-out/%/data.zip: $(RAW_FILES)
+out/data.zip: $(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
+out/tildefriends-%.app/tildefriends: out/%/tildefriends out/tildefriends-%.app/Info.plist out/tildefriends-%.app/tildefriends.png out/data.zip
 	@mkdir -p $(dir $@)
 	@cp -v $< $@
+	@cp -v out/data.zip $(@D)/
 ifeq ($(HAVE_LINUX_IOS),1)
 	@zsign -q -k .keys/apple.p12 -f -m src/ios/embedded.mobileprovision $(realpath $(dir $@))
 endif
@@ -787,46 +1074,36 @@ out/tildefriends-%.ipa: out/tildefriends-ios%.app/tildefriends
 	@cd $@.tmp/ && zip -u ../../$@ -q -9 -r ./
 	@rm -rf $@.tmp/
 
-iossimdebug-app: out/tildefriends-iossimdebug.app/tildefriends
-iossimrelease-app: out/tildefriends-iossimrelease.app/tildefriends
-iosdebug-app: out/tildefriends-iosdebug.app/tildefriends
-iosrelease-app: out/tildefriends-iosrelease.app/tildefriends
 
-iosdebug-ipa: out/tildefriends-debug.ipa
-iosrelease-ipa: out/tildefriends-release.ipa
+out/%/tildefriends.standalone: out/%/tildefriends out/data.zip
+	@echo "[standalone] $@"
+	@cat $< out/data.zip > $@
+	@chmod +x $@
+out/%/tildefriends.standalone.exe: out/%/tildefriends.exe out/data.zip
+	@echo "[standalone] $@"
+	@cat $< out/data.zip > $@
+	@chmod +x $@
+
+iossimdebug-app: out/tildefriends-iossimdebug.app/tildefriends ## Build a debug iOS Simulator .app directory.
+iossimrelease-app: out/tildefriends-iossimrelease.app/tildefriends ## Build a release iOS Simulator .app directory.
+iosdebug-app: out/tildefriends-iosdebug.app/tildefriends ## Build a debug iOS .app directory.
+iosrelease-app: out/tildefriends-iosrelease.app/tildefriends ## Build a release iOS .app directory.
+
+iosdebug-ipa: out/tildefriends-debug.ipa ## Build a debug iOS .ipa.
+iosrelease-ipa: out/tildefriends-release.ipa ## Build a release iOS .ipa.
 .PHONY: iossimdebug-app iossimrelease-app iosdebug-app iosrelease-app
 
 ios%go: out/tildefriends-ios%.app/tildefriends
 	ideviceinstaller -i $(realpath $(dir $<))
 
-iossimdebuggo: out/tildefriends-iossimdebug.app/tildefriends
+iossimdebuggo: out/tildefriends-iossimdebug.app/tildefriends ## Build, install, and run an iOS debug build.
 	xcrun simctl install booted out/tildefriends-iossimdebug.app/
 	xcrun simctl launch booted com.unprompted.tildefriends
 .PHONY: iossimdebuggo
 
-apklog:
-	@adb logcat *:S tildefriends
-.PHONY: apklog
-
-fetchdeps:
-	@echo "[fetch] libuv"
-	@test -f out/deps/libuv.tar.gz && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (mkdir -p out/deps/ && curl -q $(LIBUV_URL) -o out/deps/libuv.tar.gz)
-	@test -d deps/libuv/ && test "$$(cat out/deps/libuv.txt 2>/dev/null)" = $(LIBUV_URL) || (rm -rf deps/libuv/ && mkdir -p deps/libuv/ && tar -C deps/libuv/ -m --strip=1 -xf out/deps/libuv.tar.gz)
-	@echo -n $(LIBUV_URL) > out/deps/libuv.txt
-	@echo "[fetch] sqlite"
-	@test -f out/deps/sqlite.zip && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p out/deps/ && curl -q $(SQLITE_URL) -o out/deps/sqlite.zip)
-	@test -d deps/sqlite/ && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p deps/sqlite/ && unzip -qDjo -d deps/sqlite/ out/deps/sqlite.zip)
-	@echo -n $(SQLITE_URL) > out/deps/sqlite.txt
-	@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
-.PHONY: fetchdeps
-
 ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a
 $(ANDROID_DEPS):
-	+@tools/ssl-android
+	+@ANDROID_NDK_ROOT=$(ANDROID_NDK) tools/ssl-android
 $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
 
 ifeq ($(HAVE_WIN),1)
@@ -843,15 +1120,63 @@ $(IOS_DEPS):
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
 endif
 
-clean:
-	rm -rf $(BUILD_DIR)
-.PHONY: clean
+##
+## Linux package targets:
+##
 
-dist: release-apk iosrelease-ipa
-	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
+out/tildefriends-x86_64.AppImage: out/release/tildefriends out/data.zip
+	@echo "[appimage] $$@"
+	@rm -rf out/tildefriends.AppDir
+	@mkdir -p out/tildefriends.AppDir/usr/bin
+	@mkdir -p out/tildefriends.AppDir/usr/share/applications
+	@mkdir -p out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps
+	@mkdir -p out/tildefriends.AppDir/usr/share/tildefriends
+	@echo $(APPIMAGETOOL_MD5) > out/appimagetool.md5
+	@test -x out/appimagetool || curl -q -L -o out/appimagetool $(APPIMAGETOOL_URL) && md5sum -c out/appimagetool.md5 && chmod +x out/appimagetool
+	@echo "[Desktop Entry]\nName=tildefriends\nExec=/usr/bin/tildefriends\nIcon=/usr/share/icons/hicolor/scalable/apps/tildefriends\nType=Application\nCategories=Network" > out/tildefriends.AppDir/tildefriends.desktop
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/usr/share/icons/hicolor/scalable/apps/
+	@cp src/ios/tildefriends.svg out/tildefriends.AppDir/
+	@cp out/release/tildefriends out/tildefriends.AppDir/usr/bin/
+	@cp out/data.zip out/tildefriends.AppDir/usr/share/tildefriends/data.zip
+	@echo "#!/bin/sh\n\$${APPDIR}/usr/bin/tildefriends run -z \$$APPDIR/usr/share/tildefriends/data.zip" > out/tildefriends.AppDir/AppRun
+	@chmod +x out/tildefriends.AppDir/AppRun
+	@cd out; ./appimagetool --appimage-extract; cd ..
+	@cd out; unset SOURCE_DATE_EPOCH; PATH=$$PATH:squashfs-root/usr/bin ARCH=x86_64 squashfs-root/usr/bin/appimagetool -u 'zsync|https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage.zsync' tildefriends.AppDir tildefriends-x86_64.AppImage; cd ..
+
+appimage: out/tildefriends-x86_64.AppImage ## Build an AppImage.
+.PHONY: appimage
+
+flatpak: out/ ## Build a flatpak.
+	flatpak-builder --force-clean --user --install-deps-from=flathub --install --repo=out/flatpak-repo out/flatpak src/com.unprompted.tildefriends.yml
+	flatpak build-bundle out/flatpak-repo out/tildefriends.flatpak com.unprompted.tildefriends
+.PHONY: flatpak
+
+##
+## Targets for release management:
+##
+
+fetchdeps: ## Update various external sources that live in the tree that can't be pulled in as git submodules.
+	@echo "[fetch] sqlite"
+	@test -f out/deps/sqlite.zip && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p out/deps/ && curl -q $(SQLITE_URL) -o out/deps/sqlite.zip)
+	@test -d deps/sqlite/ && test "$$(cat out/deps/sqlite.txt 2>/dev/null)" = $(SQLITE_URL) || (mkdir -p deps/sqlite/ && unzip -qDjo -d deps/sqlite/ out/deps/sqlite.zip)
+	@echo -n $(SQLITE_URL) > out/deps/sqlite.txt
+	@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
+.PHONY: fetchdeps
+
+shots: ## Copy generated screenshots from `tildefriends test -t=auto` into place in the metadata/ directory.
+	@echo [shots] $(wildcard out/screenshot*.png)
+	@cp -f out/screenshot*.png metadata/en-US/images/phoneScreenshots/
+.PHONY: shots
+
+tarball: ## Build an all-inclusive source tarball (.tar.xz).
+	@echo [archive] out/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
-	@mkdir -p dist/ out/tildefriends-$(VERSION_NUMBER)
-	@git archive main | tar -x -C out/tildefriends-$(VERSION_NUMBER)
+	@mkdir -p out/tildefriends-$(VERSION_NUMBER)
+	@git ls-files --recurse-submodules | tar -c -T- | tar -x -C out/tildefriends-$(VERSION_NUMBER)
 	@tar \
 		--exclude=apps/welcome* \
 		--exclude=deps/libbacktrace/Isaac.Newton-Opticks.txt \
@@ -867,32 +1192,79 @@ dist: release-apk iosrelease-ipa
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
 		--exclude=deps/zlib/doc \
-		-caf dist/tildefriends-$(VERSION_NUMBER).tar.xz \
+		-caf out/tildefriends-$(VERSION_NUMBER).tar.xz \
 		-C out/ \
 		tildefriends-$(VERSION_NUMBER)
+.PHONY: tarball
+
+dist: ## Build versions of all distributables for release.
+dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage tarball
+	@mkdir -p dist/
+	@echo "[cp] tildefriends-$(VERSION_NUMBER).tar.xz"
+	@cp out/tildefriends-$(VERSION_NUMBER).tar.xz dist/tildefriends-$(VERSION_NUMBER).tar.xz
 	@echo "[cp] TildeFriends-x86-$(VERSION_NUMBER).apk"
 	@cp out/TildeFriends-x86-release.zopfli.apk dist/TildeFriends-x86-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-arm-$(VERSION_NUMBER).apk"
 	@cp out/TildeFriends-arm-release.zopfli.apk dist/TildeFriends-arm-$(VERSION_NUMBER).apk
 	@echo "[cp] TildeFriends-$(VERSION_NUMBER).ipa"
 	@cp out/tildefriends-release.ipa dist/TildeFriends-$(VERSION_NUMBER).ipa
+	@test $(HAVE_WIN) && echo "[cp] tildefriends-$(VERSION_NUMBER).exe"
+	@test $(HAVE_WIN) && cp out/winrelease/tildefriends.standalone.exe dist/tildefriends-$(VERSION_NUMBER).exe
+	@echo "[cp] TildeFriends-$(VERSION_NUMBER).aab"
+	@cp out/TildeFriends.aab dist/TildeFriends-$(VERSION_NUMBER).aab
+	@echo "[cp] TildeFriends-$(VERSION_NUMBER).fdroid.apk"
+	@cp out/TildeFriends-release.fdroid.apk dist/TildeFriends-$(VERSION_NUMBER).fdroid.apk
+	@echo "[cp] TildeFriends-x86_64-$(VERSION_NUMBER).AppImage"
+	@cp out/tildefriends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage
 .PHONY: dist
 
-dist-test: dist
+dist-test: dist ## Exercise some built distributable files, making sure they work as intended.
 	@tar -xf tildefriends-$(VERSION_NUMBER).tar.xz
 	@$(MAKE) -C tildefriends-$(VERSION_NUMBER)/ debug release
 	@docker build tildefriends-$(VERSION_NUMBER)/
 	@rm -rf tildefriends-$(VERSION_NUMBER)
 .PHONY: dist-test
 
-format:
+##
+## Targets for tidying up:
+##
+
+format: ## Standardize formatting of C source.
 	@clang-format -i $(wildcard src/*.c src/*.h src/*.m)
 .PHONY: format
 
-prettier:
+prettier: ## Standardize formatting of JavaScript and Markdown source.
 	@npm run prettier
 .PHONY: prettier
 
-docs:
+clean: ## Clean all generated files from the out/ directory.
+	rm -rf $(BUILD_DIR)
+.PHONY: clean
+
+##
+## Documentation:
+##
+help: ## Display this help message.
+	@awk \
+	-F: \
+	-vG=$$(tput setaf 2) \
+	-vO=$$(tput setaf 3) \
+	-vB=$$(tput setaf 4) \
+	-vM=$$(tput setaf 5) \
+	-vC=$$(tput setaf 6) \
+	-vR=$$(tput sgr0) ' \
+	/^## ==.*==$$/ { sub(/^## ?/, ""); printf "%s%s%s\n", C, $$0, R } \
+	/^##.*:=.*/ { sub(/^## ?/, ""); sub(/:=/, ":"); printf "  %s%-20s%s %s%s%s\n", M, $$1, R, O, $$2, R } \
+	/^##/ { sub(/^## ?/, ""); print $$0 } \
+	/^[[:alnum:]-]+:.*##/ { \
+		sub(/:.*##\s?/, ":"); \
+		printf "  %s%-20s%s %s%s%s\n", G, $$1, R, O, $$2, R \
+	} \
+	' < $(filter-out %.d,$(MAKEFILE_LIST))
+	@echo "" # Blank line.
+.PHONY: help
+.DEFAULT_GOAL := help
+
+docs: ## Build HTML docs.
 	@doxygen
 .PHONY: docs

README.md

@@ -14,25 +14,53 @@ Scuttlebutt, as well as a platform for writing and running web applications.
 3. Make creating and sharing web applications accessible to anyone with a
    browser.
 
+## Getting the Source
+
+Tilde Friends uses git submodules, so either:
+
+```
+git clone --recurse-submodules https://dev.tildefriends.net/cory/tildefriends.git
+```
+
+or:
+
+```
+git clone https://dev.tildefriends.net/cory/tildefriends.git
+cd tildefriends
+git submodule update --init --recursive
+```
+
+The `.tar.xz` source releases are all-inclusive.
+
 ## Building
 
-Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. Builds for
-all of those host platforms plus mingw64, iOS, and android.
+Builds on Linux (x86_64 and aarch64), MacOS, OpenBSD, and Haiku. It's possible
+to build for Android, iOS, and Windows on Linux, if you have the right
+dependencies in the right places.
 
-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 release-apk`.
-4. To build in docker, `docker build .`.
-5. `make format` will normalize formatting to the coding standard.
+### Requirements
+
+On Linux only, system OpenSSL libraries (`libssl-dev`, in debian-speak) are
+assumed to be available.
+
+On MacOS, Xcode's command-line tools are expected to be available.
+
+### Build Commands
+
+Run `make` with no arguments to see available build targets and options. `make
+debug` is a good place to start.
+
+To build in docker, `docker build .`.
+
+`make format` and `make prettier` will normalize formatting to the coding
+standard.
 
 ## Running
 
-By default, running the built `tildefriends` executable will start a web server
-at <http://localhost:12345/>. `tildefriends -h` lists further options.
+By default, running the built `out/debug/tildefriends` executable will start a
+web server at <http://localhost:12345/>. It expects to be run with the
+repository root as the current working directory. `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
@@ -41,7 +69,7 @@ privileges. Further administration can be done at
 ## Documentation
 
 Docs are a work in progress:
-<https://www.tildefriends.net/~cory/wiki/#test-wiki/tf-app-quick-reference>.
+<https://dev.tildefriends.net/cory/tildefriends/wiki>.
 
 ## License
 

apps/admin.json

@@ -1,4 +1,5 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "🎛"
+	"emoji": "🎛",
+	"previous": "&R49FywYF8CXPhoSEydLbSCgvCddeyTiBwGuDU/gqY+M=.sha256"
 }

apps/admin/index.html

@@ -4,9 +4,38 @@
 		<script>
 			const g_data = $data;
 		</script>
+		<link rel="stylesheet" href="w3.css" />
+		<!-- prettier-ignore -->
+		<style>
+			/* 2018 Valiant Poppy */
+			.w3-theme-l5 {color:#000 !important; background-color:#fbf3f3 !important}
+			.w3-theme-l4 {color:#000 !important; background-color:#f3d7d6 !important}
+			.w3-theme-l3 {color:#000 !important; background-color:#e6afae !important}
+			.w3-theme-l2 {color:#fff !important; background-color:#da8785 !important}
+			.w3-theme-l1 {color:#fff !important; background-color:#cd5f5d !important}
+			.w3-theme-d1 {color:#fff !important; background-color:#a93634 !important}
+			.w3-theme-d2 {color:#fff !important; background-color:#96302e !important}
+			.w3-theme-d3 {color:#fff !important; background-color:#832a28 !important}
+			.w3-theme-d4 {color:#fff !important; background-color:#702423 !important}
+			.w3-theme-d5 {color:#fff !important; background-color:#5e1e1d !important}
+
+			.w3-theme-light {color:#000 !important; background-color:#fbf3f3 !important}
+			.w3-theme-dark {color:#fff !important; background-color:#5e1e1d !important}
+			.w3-theme-action {color:#fff !important; background-color:#5e1e1d !important}
+
+			.w3-theme {color:#fff !important; background-color:#bd3d3a !important}
+			.w3-text-theme {color:#bd3d3a !important}
+			.w3-border-theme {border-color:#bd3d3a !important}
+
+			.w3-hover-theme:hover {color:#fff !important; background-color:#bd3d3a !important}
+			.w3-hover-text-theme:hover {color:#bd3d3a !important}
+			.w3-hover-border-theme:hover {border-color:#bd3d3a !important}
+		</style>
 	</head>
-	<body style="color: #fff; width: 100%">
+	<body class="w3-theme-l4">
+		<header class="w3-row w3-padding w3-header w3-theme-l1">
 			<h1>Tilde Friends Administration</h1>
+		</header>
 	</body>
 	<script type="module" src="script.js"></script>
 </html>

apps/admin/script.js

@@ -27,64 +27,87 @@ function global_settings_set(key, value) {
 		});
 }
 
+function title_case(name) {
+	return name
+		.split('_')
+		.map((x) => x.charAt(0).toUpperCase() + x.substring(1))
+		.join(' ');
+}
+
 window.addEventListener('load', function () {
 	const permission_template = (permission) => html` <code>${permission}</code>`;
 	function input_template(key, description) {
 		if (description.type === 'boolean') {
 			return html`
-				<div style="margin-top: 1em">
-					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
-					<div>
-						<input type="checkbox" ?checked=${description.value} id=${'gs_' + key}></input>
-						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.checked)}>Set</button>
-						<div>${description.description}</div>
-					</div>
-				</div>
+				<li class="w3-row">
+					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${title_case(key)}</label>
+					<div class="w3-quarter w3-padding">${description.description}</div>
+					<div class="w3-quarter w3-padding w3-center"><input class="w3-check" type="checkbox" ?checked=${description.value} id=${'gs_' + key}></input></div>
+					<button class="w3-quarter w3-button w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.firstChild.checked)}>Set</button>
+				</li>
 			`;
 		} else if (description.type === 'textarea') {
 			return html`
-				<div style="margin-top: 1em"">
-					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
-					<div style="width: 100%; padding: 0; margin: 0">
-						<div style="width: 90%; padding: 0 margin: 0">
-							<textarea style="vertical-align: top; width: 100%" rows=20 cols=80 id=${'gs_' + key}>${description.value}</textarea>
-						</div>
-						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.firstElementChild.value)}>Set</button>
-						<div>${description.description}</div>
-					</div>
-				</div>
+				<li class="w3-row">
+					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold"
+						>${title_case(key)}</label
+					>
+					<div class="w3-rest w3-padding">${description.description}</div>
+					<textarea
+						class="w3-input"
+						style="vertical-align: top; resize: vertical"
+						id=${'gs_' + key}
+					>
+${description.value}</textarea
+					>
+					<button
+						class="w3-button w3-right w3-quarter w3-theme-action"
+						@click=${(e) =>
+							global_settings_set(
+								key,
+								e.srcElement.previousElementSibling.value
+							)}
+					>
+						Set
+					</button>
+				</li>
 			`;
 		} else {
 			return html`
-				<div style="margin-top: 1em">
-					<label for=${'gs_' + key} style="font-weight: bold">${key}: </label>
-					<div>
-						<input type="text" value="${description.value}" id=${'gs_' + key}></input>
-						<button @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.value)}>Set</button>
-						<div>${description.description}</div>
-					</div>
-				</div>
+				<li class="w3-row">
+					<label class="w3-quarter" for=${'gs_' + key} style="font-weight: bold">${title_case(key)}</label>
+					<div class="w3-quarter w3-padding">${description.description}</div>
+					<input class="w3-input w3-quarter" type="text" value="${description.value}" id=${'gs_' + key}></input>
+					<button class="w3-button w3-quarter w3-theme-action" @click=${(e) => global_settings_set(key, e.srcElement.previousElementSibling.value)}>Set</button>
+				</li>
 			`;
 		}
 	}
 	const user_template = (user, permissions) => html`
-		<li>
-			<button @click=${(e) => delete_user(user)}>Delete</button>
+		<li class="w3-card w3-margin">
+			<button
+				class="w3-button w3-theme-action"
+				@click=${(e) => delete_user(user)}
+			>
+				Delete
+			</button>
 			${user}: ${permissions.map((x) => permission_template(x))}
 		</li>
 	`;
 	const users_template = (users) =>
-		html`<h2>Users</h2>
-			<ul>
+		html` <header class="w3-container w3-theme-l2"><h2>Users</h2></header>
+			<ul class="w3-ul">
 				${Object.entries(users).map((u) => user_template(u[0], u[1]))}
 			</ul>`;
 	const page_template = (data) =>
 		html`<div style="padding: 0; margin: 0; width: 100%; max-width: 100%">
-			<h2>Global Settings</h2>
-			<div>
+			<header class="w3-container w3-theme-l2"><h2>Global Settings</h2></header>
+			<div class="w3-container">
+				<ul class="w3-ul">
 					${Object.keys(data.settings)
 						.sort()
 						.map((x) => html`${input_template(x, data.settings[x])}`)}
+				</ul>
 			</div>
 			${users_template(data.users)}
 		</div> `;

apps/admin/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}

apps/api.json

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

apps/api/app.js

@@ -21,7 +21,7 @@ function* treeify(prefix, o) {
 
 function markdown(md) {
 	let parsed = new commonmark.Parser().parse(md ?? '*undocumented*');
-	return new commonmark.HtmlRenderer().render(parsed);
+	return new commonmark.HtmlRenderer({safe: true}).render(parsed);
 }
 
 function document(api) {

apps/blog.json

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

apps/blog/blog.js

@@ -52,8 +52,8 @@ export async function get_blog_message(id) {
 }
 
 export function markdown(md) {
-	let reader = new commonmark.Parser({safe: true});
-	let writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	let parsed = reader.parse(md || '');
 	let walker = parsed.walker();
 	let event, node;

apps/db.json

@@ -1,4 +1,5 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "💽"
+	"emoji": "💽",
+	"previous": "&uQzkIe/Aj8yNhLKe3hEq+5fEJsGwIUx8NVBjJKwoV2U=.sha256"
 }

apps/db/app.js

@@ -51,6 +51,19 @@ async function key_list(db) {
 	app.setDocument(doc);
 }
 
+function load() {
+	if (core.user?.credentials?.session) {
+		database_list();
+	} else {
+		app.setDocument(`<!DOCTYPE html>
+<html>
+<body style="background: #888">
+	<h1>Must be signed in to examine databases.</h1>
+</body>
+</html>`);
+	}
+}
+
 core.register('message', async function (message) {
 	if (message.event == 'hashChange') {
 		let hash = message.hash.substring(1);
@@ -62,9 +75,9 @@ core.register('message', async function (message) {
 		} else if (hash.length) {
 			key_list(await database(hash.split(':').slice(1).join(':')));
 		} else {
-			database_list();
+			load();
 		}
 	}
 });
 
-database_list();
+load();

apps/identity.json

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

apps/identity/app.js

@@ -1,5 +1,7 @@
 import * as tfrpc from '/tfrpc.js';
 
+const is_admin = core.user?.credentials?.permissions?.administration;
+
 tfrpc.register(async function get_private_key(id) {
 	return bip39Words(await ssb.getPrivateKey(id));
 });
@@ -15,11 +17,44 @@ tfrpc.register(async function delete_id(id) {
 tfrpc.register(async function reload() {
 	await main();
 });
+tfrpc.register(async function make_server(id) {
+	return await ssb.swapWithServerIdentity(id);
+});
 
 async function main() {
 	let ids = await ssb.getIdentities();
+	let server_id = await ssb.getServerIdentity();
 	await app.setDocument(
-		`<body style="color: #fff">
+		`
+		<head>
+			<link rel="stylesheet" href="w3.css"></link>
+			<style>
+				/* "2018 Sargasso Sea" */
+				.w3-theme-l5 {color:#000 !important; background-color:#f3f4f7 !important}
+				.w3-theme-l4 {color:#000 !important; background-color:#d7dbe3 !important}
+				.w3-theme-l3 {color:#000 !important; background-color:#b0b6c8 !important}
+				.w3-theme-l2 {color:#fff !important; background-color:#8892ac !important}
+				.w3-theme-l1 {color:#fff !important; background-color:#636f8e !important}
+				.w3-theme-d1 {color:#fff !important; background-color:#40485c !important}
+				.w3-theme-d2 {color:#fff !important; background-color:#394052 !important}
+				.w3-theme-d3 {color:#fff !important; background-color:#323848 !important}
+				.w3-theme-d4 {color:#fff !important; background-color:#2b303d !important}
+				.w3-theme-d5 {color:#fff !important; background-color:#242833 !important}
+
+				.w3-theme-light {color:#000 !important; background-color:#f3f4f7 !important}
+				.w3-theme-dark {color:#fff !important; background-color:#242833 !important}
+				.w3-theme-action {color:#fff !important; background-color:#242833 !important}
+
+				.w3-theme {color:#fff !important; background-color:#485167 !important}
+				.w3-text-theme {color:#485167 !important}
+				.w3-border-theme {border-color:#485167 !important}
+
+				.w3-hover-theme:hover {color:#fff !important; background-color:#485167 !important}
+				.w3-hover-text-theme:hover {color:#485167 !important}
+				.w3-hover-border-theme:hover {border-color:#485167 !important}
+			</style>
+		</head>
+		<body class="w3-theme-l3">
 		<script>const handler = {};</script>
 		<script type="module">
 			import * as tfrpc from '/static/tfrpc.js';
@@ -27,7 +62,8 @@ async function main() {
 				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.style = 'width: 100%; height: auto; read-only: true; resize: none';
+				element.classList.add('w3-input');
 				element.readOnly = true;
 				event.srcElement.parentElement.appendChild(element);
 				event.srcElement.onclick = event => handler.hide_id(event, element);
@@ -48,7 +84,7 @@ async function main() {
 					alert('Successfully created: ' + id);
 					await tfrpc.rpc.reload();
 				} catch (e) {
-					alert('Error creating identity: ' + e);
+					alert('Error creating identity: ' + e.message);
 				}
 			}
 			handler.hide_id = function hide_id(event, element) {
@@ -68,24 +104,48 @@ async function main() {
 					alert('Error deleting ID: ' + e);
 				}
 			}
+			handler.make_server = async function make_server(event) {
+				let id = event.srcElement.dataset.id;
+				try {
+					if (confirm('Are you sure you want to make "' + id + '" the server identity?\\n\\nFor it to take effect, you will need to both sign in again and restart Tilde Friends.')) {
+						await tfrpc.rpc.make_server(id);
+					}
+				} catch (e) {
+					alert('Error making server 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
+		<header class="w3-theme w3-padding"><h1>SSB Identity Management</h1></header>
+		<div class="w3-card-4 w3-margin">
+			<header class="w3-container w3-theme-l2"><h2>Create a new identity</h2></header>
+			<footer class="w3-padding">
+				<button id="create_id" onclick="handler.create_id()" class="w3-button w3-theme">Create Identity</button>
+			</footer>
+		</div>
+		<div class="w3-card-4 w3-margin">
+			<header class="w3-container w3-theme-l2"><h2>Import an SSB Identity from 12 BIP39 English Words</h2></header>
+			<textarea id="add_id" style="width: 100%" rows="4" class="w3-input"></textarea>
+			<footer class="w3-padding">
+				<button id="add" onclick="handler.add_id(event)" class="w3-button w3-theme">Import Identity</button>
+			</footer>
+		</div>
+		<div class="w3-card-4 w3-margin">
+			<header class="w3-container w3-theme-l2"><h2>Identities</h2></header>
+			<ul class="w3-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}
+					(
+						id
+					) => `<li style="overflow: hidden; text-wrap: nowrap; text-overflow: ellipsis">
+				<button onclick="handler.export_id(event)" data-id="${id}" class="w3-button w3-theme">Export Identity</button>
+				<button onclick="handler.delete_id(event)" data-id="${id}" class="w3-button w3-theme">Delete Identity</button>
+				${is_admin && id != server_id ? `<button onclick="handler.make_server(event)" data-id="${id}" class="w3-button w3-theme">Make Server Identity</button>` : ''}
+				${id}${id == server_id ? ' <div class="w3-tag w3-theme-l4 w3-round">🖥 local server</div>' : ''}
 			</li>`
 				)
 				.join('\n') +
 			`	</ul>
+		</div>
 	</body>`
 	);
 }

apps/identity/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}

apps/issues.json

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

apps/issues/app.js

@@ -67,9 +67,6 @@ tfrpc.register(function getHash(id, message) {
 tfrpc.register(function setHash(hash) {
 	return app.setHash(hash);
 });
-ssb.addEventListener('message', async function (id) {
-	await tfrpc.rpc.notifyNewMessage(id);
-});
 tfrpc.register(async function store_blob(blob) {
 	if (Array.isArray(blob)) {
 		blob = Uint8Array.from(blob);
@@ -85,13 +82,18 @@ tfrpc.register(async function store_message(message) {
 tfrpc.register(function apps() {
 	return core.apps();
 });
+tfrpc.register(function getActiveIdentity() {
+	return ssb.getActiveIdentity();
+});
 tfrpc.register(async function try_decrypt(id, content) {
 	return await ssb.privateMessageDecrypt(id, content);
 });
-ssb.addEventListener('broadcasts', async function () {
+core.register('onMessage', async function (id) {
+	await tfrpc.rpc.notifyNewMessage(id);
+});
+core.register('onBroadcastsChanged', async function () {
 	await tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts());
 });
-
 core.register('onConnectionsChanged', async function () {
 	await tfrpc.rpc.set('connections', await ssb.connections());
 });

apps/issues/script.js

@@ -4,48 +4,6 @@ import * as tfutils from './tf-utils.js';
 
 const k_project = '%Hr+4xEVtjplidSKBlRWi4Aw/0Tfw7B+1OR9BzlDKmOI=.sha256';
 
-class TfIdPickerElement extends LitElement {
-	static get properties() {
-		return {
-			ids: {type: Array},
-			selected: {type: String},
-		};
-	}
-
-	constructor() {
-		super();
-		this.load();
-	}
-
-	async load() {
-		this.selected = await tfrpc.rpc.localStorageGet('whoami');
-		this.ids = (await tfrpc.rpc.getIdentities()) || [];
-	}
-
-	changed(event) {
-		this.selected = event.srcElement.value;
-		tfrpc.rpc.localStorageSet('whoami', this.selected);
-	}
-
-	render() {
-		if (this.ids) {
-			return html`
-				<select @change=${this.changed} style="max-width: 100%">
-					${this.ids.map(
-						(id) =>
-							html`<option ?selected=${id == this.selected} value=${id}>
-								${id}
-							</option>`
-					)}
-				</select>
-			`;
-		} else {
-			return html`<div>Loading...</div>`;
-		}
-	}
-}
-customElements.define('tf-id-picker', TfIdPickerElement);
-
 class TfComposeElement extends LitElement {
 	static get properties() {
 		return {
@@ -105,10 +63,10 @@ class TfIssuesAppElement extends LitElement {
 		let issues = {};
 		let messages = await tfrpc.rpc.query(
 			`
-			WITH issues AS (SELECT messages.* FROM messages_refs JOIN messages ON
+			WITH issues AS (SELECT messages.id, json(messages.content) AS content, messages.author, messages.timestamp FROM messages_refs JOIN messages ON
 				messages.id = messages_refs.message
 				WHERE messages_refs.ref = ? AND json_extract(messages.content, '$.type') = 'issue'),
-			edits AS (SELECT messages.* FROM issues JOIN messages_refs ON
+			edits AS (SELECT messages.id, json(messages.content) AS content, messages.author, messages.timestamp FROM issues JOIN messages_refs ON
 				issues.id = messages_refs.ref JOIN messages ON
 				messages.id = messages_refs.message
 				WHERE json_extract(messages.content, '$.type') IN ('issue-edit', 'post'))
@@ -206,7 +164,7 @@ class TfIssuesAppElement extends LitElement {
 		if (
 			confirm(`Are you sure you want to ${open ? 'open' : 'close'} this issue?`)
 		) {
-			let whoami = this.shadowRoot.getElementById('picker').selected;
+			let whoami = await tfrpc.rpc.getActiveIdentity();
 			await tfrpc.rpc.appendMessage(whoami, {
 				type: 'issue-edit',
 				issues: [
@@ -221,7 +179,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	async create_issue(event) {
-		let whoami = this.shadowRoot.getElementById('picker').selected;
+		let whoami = await tfrpc.rpc.getActiveIdentity();
 		await tfrpc.rpc.appendMessage(whoami, {
 			type: 'issue',
 			project: k_project,
@@ -231,7 +189,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	async reply_to_issue(event) {
-		let whoami = this.shadowRoot.getElementById('picker').selected;
+		let whoami = await tfrpc.rpc.getActiveIdentity();
 		await tfrpc.rpc.appendMessage(whoami, {
 			type: 'post',
 			text: event.detail.value,
@@ -249,10 +207,7 @@ class TfIssuesAppElement extends LitElement {
 	}
 
 	render() {
-		let header = html`
-			<h1>Tilde Friends Issues</h1>
-			<tf-id-picker id="picker"></tf-id-picker>
-		`;
+		let header = html` <h1>Tilde Friends Issues</h1> `;
 		if (this.selected) {
 			return html`
 				${header}

apps/issues/tf-utils.js

@@ -1,5 +1,11 @@
 import * as linkify from './commonmark-linkify.js';
 
+var reUnsafeProtocol = /^javascript:|vbscript:|file:|data:/i;
+var reSafeDataProtocol = /^data:image\/(?:png|gif|jpeg|webp)/i;
+var potentiallyUnsafe = function (url) {
+	return reUnsafeProtocol.test(url) && !reSafeDataProtocol.test(url);
+};
+
 function image(node, entering) {
 	if (
 		node.firstChild?.type === 'text' &&
@@ -61,8 +67,8 @@ function image(node, entering) {
 }
 
 export function markdown(md) {
-	var reader = new commonmark.Parser({safe: true});
-	var writer = new commonmark.HtmlRenderer();
+	var reader = new commonmark.Parser();
+	var writer = new commonmark.HtmlRenderer({safe: true});
 	writer.image = image;
 	var parsed = reader.parse(md || '');
 	parsed = linkify.transform(parsed);

apps/journal.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "📝",
-	"previous": "&b//KqE4Vx6kOSBRODK1p/8wjOLKZJ+CBB5IkaBt5YsM=.sha256"
+	"previous": "&5LpOTEnor/rYFk3axyfmmehAoq9aEwNQRH4jwNhRQ7o=.sha256"
 }

apps/journal/app.js

@@ -55,7 +55,7 @@ function new_message() {
 	return g_new_message_promise;
 }
 
-ssb.addEventListener('message', function (id) {
+core.register('onMessage', function (id) {
 	let resolve = g_new_message_resolve;
 	g_new_message_promise = new Promise(function (resolve, reject) {
 		g_new_message_resolve = resolve;

apps/journal/tf-journal-entry.js

@@ -18,8 +18,8 @@ class TfJournalEntryElement extends LitElement {
 	}
 
 	markdown(md) {
-		var reader = new commonmark.Parser({safe: true});
-		var writer = new commonmark.HtmlRenderer();
+		var reader = new commonmark.Parser();
+		var writer = new commonmark.HtmlRenderer({safe: true});
 		var parsed = reader.parse(md || '');
 		return writer.render(parsed);
 	}

apps/room.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
-	"emoji": "📦",
-	"previous": "&IU+TwyM7TznD8NBfnw7tgW2zxVlMqTVxSqWFjuosLwo=.sha256"
+	"emoji": "🚪",
+	"previous": "&HXCdDG8gGYXElTyEFbg85jqa6lDXNL2ENPIA9UoJNbI=.sha256"
 }

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&Xs1X5TzLCk6KVr+5IDc80JAHYxJyoD10cXKBUYpFqWQ=.sha256"
+	"previous": "&bjAInmZa9aZQEuuYOQ19S+HP8P2o2gJO7T8Cd2bnAsM=.sha256"
 }

apps/ssb/app.js

@@ -76,7 +76,7 @@ tfrpc.register(function getHash(id, message) {
 tfrpc.register(function setHash(hash) {
 	return app.setHash(hash);
 });
-ssb.addEventListener('message', async function (id) {
+core.register('onMessage', async function (id) {
 	await tfrpc.rpc.notifyNewMessage(id);
 });
 tfrpc.register(async function store_blob(blob) {
@@ -100,13 +100,22 @@ tfrpc.register(async function try_decrypt(id, content) {
 tfrpc.register(async function encrypt(id, recipients, content) {
 	return await ssb.privateMessageEncrypt(id, recipients, content);
 });
-ssb.addEventListener('broadcasts', async function () {
+tfrpc.register(async function getActiveIdentity() {
+	return await ssb.getActiveIdentity();
+});
+tfrpc.register(async function sync() {
+	return await ssb.sync();
+});
+core.register('onBroadcastsChanged', async function () {
 	await tfrpc.rpc.set('broadcasts', await ssb.getBroadcasts());
 });
 
 core.register('onConnectionsChanged', async function () {
 	await tfrpc.rpc.set('connections', await ssb.connections());
 });
+core.register('setActiveIdentity', async function (id) {
+	await tfrpc.rpc.set('identity', id);
+});
 
 async function main() {
 	if (typeof database !== 'undefined') {

apps/ssb/commonmark-hashtag.js

@@ -1,19 +1,23 @@
 function textNode(text) {
-  const node = new commonmark.Node("text", undefined);
+	const node = new commonmark.Node('text', undefined);
 	node.literal = text;
 	return node;
 }
 
 function linkNode(text, link) {
-  const linkNode = new commonmark.Node("link", undefined);
-  linkNode.destination = `#q=${encodeURIComponent(link)}`;
+	const linkNode = new commonmark.Node('link', undefined);
+	if (link.startsWith('#')) {
+		linkNode.destination = `#${encodeURIComponent('#' + link)}`;
+	} else {
+		linkNode.destination = link;
+	}
 	linkNode.appendChild(textNode(text));
 	return linkNode;
 }
 
 function splitMatches(text, regexp) {
 	// Regexp must be sticky.
-  regexp = new RegExp(regexp, "gm");
+	regexp = new RegExp(regexp, 'gm');
 
 	let i = 0;
 	const result = [];
@@ -39,13 +43,13 @@ function splitMatches(text, regexp) {
 	return result;
 }
 
-const regex = new RegExp("(?<!\\w)#[\\w-]+");
+const regex = new RegExp('(?:https?://[^ ]+[^ .,])|(?:(?<!\\w)#[\\w-]+)|(?:@[A-Za-z0-9+/]+=.ed25519)|(?:[%&][A-Za-z0-9+/]+=.sha256)');
 
 function split(textNodes) {
-  const text = textNodes.map(n => n.literal).join("");
+	const text = textNodes.map((n) => n.literal).join('');
 	const parts = splitMatches(text, regex);
 
-  return parts.map(part => {
+	return parts.map((part) => {
 		if (part[1]) {
 			return linkNode(part[0], part[0]);
 		} else {
@@ -61,17 +65,17 @@ export function transform(parsed) {
 	let nodes = [];
 	while ((event = walker.next())) {
 		const node = event.node;
-    if (event.entering && node.type === "text") {
+		if (event.entering && node.type === 'text') {
 			nodes.push(node);
 		} else {
 			if (nodes.length > 0) {
 				split(nodes)
 					.reverse()
-          .forEach(newNode => {
+					.forEach((newNode) => {
 						nodes[0].insertAfter(newNode);
 					});
 
-        nodes.forEach(n => n.unlink());
+				nodes.forEach((n) => n.unlink());
 				nodes = [];
 			}
 		}
@@ -80,10 +84,10 @@ export function transform(parsed) {
 	if (nodes.length > 0) {
 		split(nodes)
 			.reverse()
-      .forEach(newNode => {
+			.forEach((newNode) => {
 				nodes[0].insertAfter(newNode);
 			});
-    nodes.forEach(n => n.unlink());
+		nodes.forEach((n) => n.unlink());
 	}
 
 	return parsed;

apps/ssb/commonmark-linkify.js

@@ -1,91 +0,0 @@
-function textNode(text) {
-  const node = new commonmark.Node("text", undefined);
-  node.literal = text;
-  return node;
-}
-
-function linkNode(text, url) {
-  const urlNode = new commonmark.Node("link", undefined);
-  urlNode.destination = url;
-  urlNode.appendChild(textNode(text));
-
-  return urlNode;
-}
-
-function splitMatches(text, regexp) {
-  // Regexp must be sticky.
-  regexp = new RegExp(regexp, "gm");
-
-  let i = 0;
-  const result = [];
-
-  let match = regexp.exec(text);
-  while (match) {
-    const matchText = match[0];
-
-    if (match.index > i) {
-      result.push([text.substring(i, match.index), false]);
-    }
-
-    result.push([matchText, true]);
-    i = match.index + matchText.length;
-
-    match = regexp.exec(text);
-  }
-
-  if (i < text.length) {
-    result.push([text.substring(i, text.length), false]);
-  }
-
-  return result;
-}
-
-const urlRegexp = new RegExp("https?://[^ ]+[^ .,]");
-
-function splitURLs(textNodes) {
-  const text = textNodes.map(n => n.literal).join("");
-  const parts = splitMatches(text, urlRegexp);
-
-  return parts.map(part => {
-    if (part[1]) {
-      return linkNode(part[0], part[0]);
-    } else {
-      return textNode(part[0]);
-    }
-  });
-}
-
-export function transform(parsed) {
-  const walker = parsed.walker();
-  let event;
-
-  let nodes = [];
-  while ((event = walker.next())) {
-    const node = event.node;
-    if (event.entering && node.type === "text") {
-      nodes.push(node);
-    } else {
-      if (nodes.length > 0) {
-        splitURLs(nodes)
-          .reverse()
-          .forEach(newNode => {
-            nodes[0].insertAfter(newNode);
-          });
-
-        nodes.forEach(n => n.unlink());
-        nodes = [];
-      }
-    }
-  }
-
-  if (nodes.length > 0) {
-    splitURLs(nodes)
-      .reverse()
-      .forEach(newNode => {
-        nodes[0].insertAfter(newNode);
-      });
-    nodes.forEach(n => n.unlink());
-  }
-
-  return parsed;
-}

apps/ssb/emojis.js

@@ -1,3 +1,7 @@
+import * as tfrpc from '/static/tfrpc.js';
+import {html, render} from './lit-all.min.js';
+import {styles} from './tf-styles.js';
+
 let g_emojis;
 
 function get_emojis() {
@@ -10,19 +14,30 @@ function get_emojis() {
 	});
 }
 
-export function picker(callback, anchor) {
-	get_emojis().then(function (json) {
+async function get_recent(author) {
+	let recent = await tfrpc.rpc.query(
+		`
+		SELECT DISTINCT content ->> '$.vote.expression' AS value
+		FROM messages
+		WHERE author = ? AND
+		content ->> '$.type' = 'vote'
+		ORDER BY timestamp DESC LIMIT 10
+	`,
+		[author]
+	);
+	return recent.map((x) => x.value);
+}
+
+export async function picker(callback, anchor, author) {
+	let json = await get_emojis();
+	let recent = await get_recent(author);
+
 	let div = document.createElement('div');
 	div.id = 'emoji_picker';
 	div.style.color = '#000';
 	div.style.background = '#fff';
 	div.style.border = '1px solid #000';
 	div.style.display = 'block';
-		div.style.position = 'absolute';
-		div.style.minWidth = 'min(16em, 90vw)';
-		div.style.width = 'min(16em, 90vw)';
-		div.style.maxWidth = 'min(16em, 90vw)';
-		div.style.maxHeight = '16em';
 	div.style.overflow = 'scroll';
 	div.style.fontWeight = 'bold';
 	div.style.fontSize = 'xx-large';
@@ -40,14 +55,6 @@ export function picker(callback, anchor) {
 		event.stopPropagation();
 	});
 
-		function cleanup() {
-			console.log('emoji cleanup');
-			div.parentElement.removeChild(div);
-			window.removeEventListener('keydown', key_down);
-			console.log('removing click');
-			document.body.removeEventListener('mousedown', cleanup);
-		}
-
 	function key_down(event) {
 		if (event.key == 'Escape') {
 			cleanup();
@@ -66,6 +73,40 @@ export function picker(callback, anchor) {
 		}
 		let search = input.value.toLowerCase();
 		let any_at_all = false;
+		if (recent) {
+			let emoji_to_name = {};
+			for (let row of Object.values(json)) {
+				for (let entry of Object.entries(row)) {
+					emoji_to_name[entry[1]] = entry[0];
+				}
+			}
+			let header = document.createElement('div');
+			header.appendChild(document.createTextNode('Recent'));
+			list.appendChild(header);
+			let any = false;
+			for (let entry of recent) {
+				if (
+					search &&
+					search.length &&
+					(emoji_to_name[entry] || '').toLowerCase().indexOf(search) == -1
+				) {
+					continue;
+				}
+				let emoji = document.createElement('span');
+				const k_size = '1.25em';
+				emoji.style.display = 'inline-block';
+				emoji.style.overflow = 'hidden';
+				emoji.style.cursor = 'pointer';
+				emoji.onclick = chosen;
+				emoji.title = emoji_to_name[entry] || entry;
+				emoji.appendChild(document.createTextNode(entry));
+				list.appendChild(emoji);
+				any = true;
+			}
+			if (!any) {
+				list.removeChild(header);
+			}
+		}
 		for (let row of Object.entries(json)) {
 			let header = document.createElement('div');
 			header.appendChild(document.createTextNode(row[0]));
@@ -101,14 +142,36 @@ export function picker(callback, anchor) {
 	}
 	refresh();
 	input.oninput = refresh;
-		document.body.appendChild(div);
-		div.style.position = 'fixed';
-		div.style.top = '50%';
-		div.style.left = '50%';
-		div.style.transform = 'translate(-50%, -50%)';
+	let parent = document.createElement('div');
+	function cleanup() {
+		parent.parentElement.removeChild(parent);
+		window.removeEventListener('keydown', key_down);
+		document.body.removeEventListener('mousedown', cleanup);
+	}
+	let modal = html`
+		<style>
+			${styles}
+		</style>
+		<div class="w3-modal" style="display: block; box-sizing: border-box; z-index: 10">
+			<div class="w3-modal-content w3-card-4" style="max-height: 50%">
+				<div class="w3-content w3-theme-d1">
+					<header class="w3-container">
+						<h1>Choose a Reaction</h1>
+						<span class="w3-button w3-display-topright" @click=${cleanup}
+							>&times;</span
+						>
+					</header>
+					${div}
+					<footer class="w3-container w3-padding">
+						<button class="w3-button" @click=${cleanup}>Close</button>
+					</footer>
+				</div>
+			</div>
+		</div>
+	`;
+	document.body.appendChild(parent);
+	render(modal, parent);
 	input.focus();
-		console.log('adding click');
 	document.body.addEventListener('mousedown', cleanup);
 	window.addEventListener('keydown', key_down);
-	});
 }

apps/ssb/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html style="color: #fff">
+<html>
 	<head>
 		<title>Tilde Friends</title>
 		<base target="_top" />
@@ -10,14 +10,14 @@
 			}
 		</style>
 	</head>
-	<body style="background-color: #223a5e">
-		<tf-app class="w3-deep-purple" />
+	<body style="margin: 0; padding: 0">
+		<tf-app></tf-app>
+		<tf-reactions-modal id="reactions_modal"></tf-reactions-modal>
 		<script>
 			window.litDisableBundleWarning = true;
 		</script>
 		<script src="filesaver.min.js"></script>
 		<script src="commonmark.min.js"></script>
-		<script src="commonmark-linkify.js" type="module"></script>
 		<script src="commonmark-hashtag.js" type="module"></script>
 		<script src="script.js" type="module"></script>
 	</body>

apps/ssb/script.js

@@ -1,17 +1,23 @@
 import {LitElement, html} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
 
-import * as tf_id_picker from './tf-id-picker.js';
 import * as tf_app from './tf-app.js';
 import * as tf_message from './tf-message.js';
 import * as tf_user from './tf-user.js';
 import * as tf_compose from './tf-compose.js';
 import * as tf_news from './tf-news.js';
 import * as tf_profile from './tf-profile.js';
-import * as tf_tab_mentions from './tf-tab-mentions.js';
+import * as tf_reactions_modal from './tf-reactions-modal.js';
 import * as tf_tab_news from './tf-tab-news.js';
 import * as tf_tab_news_feed from './tf-tab-news-feed.js';
 import * as tf_tab_search from './tf-tab-search.js';
 import * as tf_tab_connections from './tf-tab-connections.js';
 import * as tf_tab_query from './tf-tab-query.js';
 import * as tf_tag from './tf-tag.js';
+import * as tf_styles from './tf-styles.js';
+
+window.addEventListener('load', function () {
+	let style = document.createElement('style');
+	style.innerText = tf_styles.styles;
+	document.body.appendChild(style);
+});

apps/ssb/tf-app.js

@@ -16,7 +16,9 @@ class TfElement extends LitElement {
 			following: {type: Array},
 			users: {type: Object},
 			ids: {type: Array},
-			tags: {type: Array},
+			channels: {type: Array},
+			channels_unread: {type: Object},
+			channels_latest: {type: Object},
 		};
 	}
 
@@ -33,7 +35,11 @@ class TfElement extends LitElement {
 		this.following = [];
 		this.users = {};
 		this.loaded = false;
-		this.tags = [];
+		this.channels = [];
+		this.channels_unread = {};
+		this.channels_latest = {};
+		this.loading_channels_latest = 0;
+		this.loading_channels_latest_scheduled = 0;
 		tfrpc.rpc.getBroadcasts().then((b) => {
 			self.broadcasts = b || [];
 		});
@@ -52,26 +58,88 @@ class TfElement extends LitElement {
 				self.broadcasts = value;
 			} else if (name === 'connections') {
 				self.connections = value;
+			} else if (name === 'identity') {
+				self.whoami = value;
 			}
 		});
 		this.initial_load();
 	}
 
 	async initial_load() {
-		let whoami = await tfrpc.rpc.localStorageGet('whoami');
+		let whoami = await tfrpc.rpc.getActiveIdentity();
 		let ids = (await tfrpc.rpc.getIdentities()) || [];
 		this.whoami = whoami ?? (ids.length ? ids[0] : undefined);
 		this.ids = ids;
+		await this.load_channels();
+	}
+
+	async load_channels() {
+		let channels = await tfrpc.rpc.query(
+			`
+			SELECT
+				content ->> 'channel' AS channel,
+				content ->> 'subscribed' AS subscribed
+			FROM
+				messages
+			WHERE
+				author = ? AND
+				content ->> 'type' = 'channel'
+			ORDER BY sequence
+		`,
+			[this.whoami]
+		);
+		let channel_map = {};
+		for (let row of channels) {
+			if (row.subscribed) {
+				channel_map[row.channel] = true;
+			} else {
+				delete channel_map[row.channel];
+			}
+		}
+		this.channels = Object.keys(channel_map).sort();
+	}
+
+	connectedCallback() {
+		super.connectedCallback();
+		this._keydown = this.keydown.bind(this);
+		window.addEventListener('keydown', this._keydown);
+	}
+
+	disconnectedCallback() {
+		super.disconnectedCallback();
+		window.removeEventListener('keydown', this._keydown);
+	}
+
+	keydown(event) {
+		if (event.altKey && event.key == 'ArrowUp') {
+			this.next_channel(1);
+			event.preventDefault();
+		} else if (event.altKey && event.key == 'ArrowDown') {
+			this.next_channel(-1);
+			event.preventDefault();
+		}
+	}
+
+	next_channel(delta) {
+		let channel_names = ['', '@'].concat(this.channels);
+		let index = channel_names.indexOf(this.hash.substring(1));
+		if (index != -1) {
+			index += delta;
+			this.set_hash(
+				'#' +
+					encodeURIComponent(
+						channel_names[(index + channel_names.length) % channel_names.length]
+					)
+			);
+		}
 	}
 
 	set_hash(hash) {
-		this.hash = hash || '#';
+		this.hash = decodeURIComponent(hash || '#');
 		if (this.hash.startsWith('#q=')) {
 			this.tab = 'search';
 		} else if (this.hash === '#connections') {
 			this.tab = 'connections';
-		} else if (this.hash === '#mentions') {
-			this.tab = 'mentions';
 		} else if (this.hash.startsWith('#sql=')) {
 			this.tab = 'query';
 		} else {
@@ -165,10 +233,19 @@ class TfElement extends LitElement {
 			`,
 			[JSON.stringify(this.following), id]
 		);
+		for (let message of messages) {
+			if (message.author == this.whoami) {
+				let content = JSON.parse(message.content);
+				if (content?.type == 'channel') {
+					this.load_channels();
+				}
+			}
+		}
 		if (messages && messages.length) {
 			this.unread = [...this.unread, ...messages];
 			this.unread = this.unread.slice(this.unread.length - 1024);
 		}
+		this.schedule_load_channels_latest();
 	}
 
 	async _handle_whoami_changed(event) {
@@ -193,55 +270,92 @@ class TfElement extends LitElement {
 		}
 	}
 
-	render_id_picker() {
-		return html`
-			<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>
-		`;
+	async get_latest_private(following) {
+		let latest = (await tfrpc.rpc.query('SELECT MAX(rowid) AS latest FROM messages'))[0].latest;
+		const k_chunk_count = 256;
+		while (latest - k_chunk_count >= 0) {
+			let messages = await tfrpc.rpc.query(`
+					SELECT messages.rowid, messages.id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
+						FROM messages
+						JOIN json_each(?1) AS following ON messages.author = following.value
+						WHERE
+							messages.rowid > ?2 AND
+							messages.rowid <= ?3 AND
+							json(messages.content) LIKE '"%'
+						ORDER BY sequence DESC
+					`,
+					[
+						JSON.stringify(following),
+						latest - k_chunk_count,
+						latest,
+					]);
+			messages = (await this.decrypt(messages)).filter(x => x.decrypted);
+			if (messages.length) {
+				return Math.max(...messages.map(x => x.rowid));
+			}
+			latest -= k_chunk_count;
+		};
+		return -1;
 	}
 
-	async load_recent_tags() {
-		let start = new Date();
-		this.tags = await tfrpc.rpc.query(
+	async load_channels_latest(following) {
+		this.loading_channels_latest++;
+		try {
+			let start_time = new Date();
+			let latest_private = this.get_latest_private(following);
+			let channels = await tfrpc.rpc.query(
 				`
-			WITH
-				recent AS (SELECT id, json(content) AS content FROM messages
-					WHERE messages.timestamp > ? AND json_extract(content, '$.type') = 'post'
-					ORDER BY timestamp DESC LIMIT 1024),
-				recent_channels AS (SELECT recent.id, '#' || json_extract(content, '$.channel') AS tag
-					FROM recent
-					WHERE json_extract(content, '$.channel') IS NOT NULL),
-				recent_mentions AS (SELECT recent.id, json_extract(mention.value, '$.link') AS tag
-					FROM recent, json_each(recent.content, '$.mentions') AS mention
-					WHERE json_valid(mention.value) AND tag LIKE '#%'),
-				combined AS (SELECT id, tag FROM recent_channels UNION ALL SELECT id, tag FROM recent_mentions),
-				by_message AS (SELECT DISTINCT id, tag FROM combined)
-			SELECT tag, COUNT(*) AS count FROM by_message GROUP BY tag ORDER BY count DESC LIMIT 10
+				SELECT channels.value AS channel, MAX(messages.rowid) AS rowid FROM messages
+				JOIN json_each(?1) AS channels ON messages.content ->> 'channel' = channels.value
+				JOIN json_each(?2) AS following ON messages.author = following.value
+				WHERE messages.content ->> 'type' = 'post' AND messages.content ->> 'root' IS NULL
+				GROUP by channel
+				UNION
+				SELECT '' AS channel, MAX(messages.rowid) AS rowid FROM messages
+				JOIN json_each(?2) AS following ON messages.author = following.value
+				UNION
+				SELECT '@' AS channel, MAX(messages.rowid) AS rowid FROM messages_fts(?3)
+				JOIN messages ON messages.rowid = messages_fts.rowid
+				JOIN json_each(?2) AS following ON messages.author = following.value
 			`,
-			[new Date() - 7 * 24 * 60 * 60 * 1000]
+				[
+					JSON.stringify(this.channels),
+					JSON.stringify(following),
+					'"' + this.whoami.replace('"', '""') + '"',
+				]
 			);
-		console.log('tags took', (new Date() - start) / 1000.0, 'seconds');
+			this.channels_latest = Object.fromEntries(
+				channels.map((x) => [x.channel, x.rowid])
+			);
+			console.log('latest', this.channels_latest);
+			console.log('unread', this.channels_unread);
+			console.log('channels took', (new Date() - start_time) / 1000.0);
+			let self = this;
+			latest_private.then(function(latest) {
+				self.channels_latest = Object.assign({}, self.channels_latest, {'🔐': latest});
+				console.log('private took', (new Date() - start_time) / 1000.0);
+			});
+		} finally {
+			this.loading_channels_latest--;
+		}
+	}
+
+	_schedule_load_channels_latest_timer() {
+		--this.loading_channels_latest_scheduled;
+		this.schedule_load_channels_latest();
+	}
+
+	schedule_load_channels_latest() {
+		if (!this.loading_channels_latest) {
+			this.load_channels_latest(this.following);
+		} else if (!this.loading_channels_latest_scheduled) {
+			this.loading_channels_latest_scheduled++;
+			setTimeout(this._schedule_load_channels_latest_timer, 5000);
+		}
 	}
 
 	async load() {
 		let whoami = this.whoami;
-		let tags = this.load_recent_tags();
 		let following = await tfrpc.rpc.following([whoami], 2);
 		let users = {};
 		let by_count = [];
@@ -254,16 +368,58 @@ class TfElement extends LitElement {
 			};
 			by_count.push({count: v.of, id: id});
 		}
-		console.log(by_count.sort((x, y) => y.count - x.count).slice(0, 20));
+		let channels_latest = this.load_channels_latest(Object.keys(following));
+		this.channels_unread = JSON.parse(
+			(await tfrpc.rpc.databaseGet('unread')) ?? '{}'
+		);
+		let start_time = new Date();
 		users = await this.fetch_about(Object.keys(following).sort(), users);
+		console.log(
+			'about took',
+			(new Date() - start_time) / 1000.0,
+			'seconds for',
+			Object.keys(users).length,
+			'users'
+		);
+		start_time = new Date();
+		await channels_latest;
 		this.following = Object.keys(following);
 		this.users = users;
-		await tags;
 		console.log(`load finished ${whoami} => ${this.whoami}`);
 		this.whoami = whoami;
 		this.loaded = whoami;
 	}
 
+	channel_set_unread(event) {
+		this.channels_unread[event.detail.channel ?? ''] = event.detail.unread;
+		this.channels_unread = Object.assign({}, this.channels_unread);
+		tfrpc.rpc.databaseSet('unread', JSON.stringify(this.channels_unread));
+	}
+
+	async decrypt(messages) {
+		let whoami = this.whoami;
+		return Promise.all(messages.map(async function (message) {
+			let content;
+			try {
+				content = JSON.parse(message?.content);
+			} catch {}
+			if (typeof content === 'string') {
+				let decrypted;
+				try {
+					decrypted = await tfrpc.rpc.try_decrypt(whoami, content);
+				} catch {}
+				if (decrypted) {
+					try {
+						message.decrypted = JSON.parse(decrypted);
+					} catch {
+						message.decrypted = decrypted;
+					}
+				}
+			}
+			return message;
+		}));
+	}
+
 	render_tab() {
 		let following = this.following;
 		let users = this.users;
@@ -277,6 +433,11 @@ class TfElement extends LitElement {
 					hash=${this.hash}
 					.unread=${this.unread}
 					@refresh=${() => (this.unread = [])}
+					?loading=${this.loading}
+					.channels=${this.channels}
+					.channels_latest=${this.channels_latest}
+					.channels_unread=${this.channels_unread}
+					@channelsetunread=${this.channel_set_unread}
 				></tf-tab-news>
 			`;
 		} else if (this.tab === 'connections') {
@@ -287,14 +448,6 @@ class TfElement extends LitElement {
 					.broadcasts=${this.broadcasts}
 				></tf-tab-connections>
 			`;
-		} else if (this.tab === 'mentions') {
-			return html`
-				<tf-tab-mentions
-					.following=${this.following}
-					whoami=${this.whoami}
-					.users="${this.users}}"
-				></tf-tab-mentions>
-			`;
 		} else if (this.tab === 'search') {
 			return html`
 				<tf-tab-search
@@ -326,13 +479,15 @@ class TfElement extends LitElement {
 			await tfrpc.rpc.setHash('#');
 		} else if (tab === 'connections') {
 			await tfrpc.rpc.setHash('#connections');
-		} else if (tab === 'mentions') {
-			await tfrpc.rpc.setHash('#mentions');
 		} else if (tab === 'query') {
 			await tfrpc.rpc.setHash('#sql=');
 		}
 	}
 
+	refresh() {
+		tfrpc.rpc.sync();
+	}
+
 	render() {
 		let self = this;
 
@@ -346,24 +501,34 @@ class TfElement extends LitElement {
 		const k_tabs = {
 			'📰': 'news',
 			'📡': 'connections',
-			'@': 'mentions',
 			'🔍': 'search',
 			'👩‍💻': 'query',
 		};
 
 		let tabs = html`
-			<div class="w3-bar w3-black">
+			<div
+				class="w3-bar w3-theme-l1"
+				style="position: sticky; top: 0; z-index: 10"
+			>
+				<button
+					class="w3-bar-item w3-button w3-circle w3-ripple"
+					@click=${this.refresh}
+				>
+					↻
+				</button>
 				${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'}"
+							class="w3-bar-item w3-padding w3-hover-theme tab ${self.tab == v
+								? 'w3-theme-l2'
+								: 'w3-theme-l1'}"
 							@click=${() => self.set_tab(v)}
 						>
 							${k}
+							<span class=${self.tab == v ? '' : 'w3-hide-small'}
+								>${v.charAt(0).toUpperCase() + v.substring(1)}</span
+							>
 						</button>
 					`
 				)}
@@ -371,15 +536,21 @@ class TfElement extends LitElement {
 		`;
 		let contents = !this.loaded
 			? this.loading
-				? html`<div>Loading...</div>`
+				? html`<div
+							class="w3-panel w3-theme-l5 w3-card-4 w3-padding-large w3-round-xlarge"
+						>
+							Loading...
+						</div>
+						${this.render_tab()}`
 				: html`<div>Select or create an identity.</div>`
 			: this.render_tab();
 		return html`
-			${this.render_id_picker()} ${tabs}
-			${this.tags.map(
-				(x) => html`<tf-tag tag=${x.tag} count=${x.count}></tf-tag>`
-			)}
-			${contents}
+			<div
+				style="width: 100vw; min-height: 100vh; height: 100%"
+				class="w3-theme-dark"
+			>
+				${tabs} ${contents}
+			</div>
 		`;
 	}
 }

apps/ssb/tf-compose.js

@@ -1,4 +1,4 @@
-import {LitElement, html, unsafeHTML} from './lit-all.min.js';
+import {LitElement, html, unsafeHTML, live} from './lit-all.min.js';
 import * as tfutils from './tf-utils.js';
 import * as tfrpc from '/static/tfrpc.js';
 import {styles} from './tf-styles.js';
@@ -13,6 +13,8 @@ class TfComposeElement extends LitElement {
 			branch: {type: String},
 			apps: {type: Object},
 			drafts: {type: Object},
+			author: {type: String},
+			channel: {type: String},
 		};
 	}
 
@@ -25,6 +27,7 @@ class TfComposeElement extends LitElement {
 		this.branch = undefined;
 		this.apps = undefined;
 		this.drafts = {};
+		this.author = undefined;
 	}
 
 	process_text(text) {
@@ -64,7 +67,7 @@ class TfComposeElement extends LitElement {
 			updated = true;
 		}
 		if (updated) {
-			this.requestUpdate();
+			setTimeout(() => this.notify(draft), 0);
 		}
 		return tfutils.markdown(text);
 	}
@@ -72,14 +75,12 @@ class TfComposeElement extends LitElement {
 	input(event) {
 		let edit = this.renderRoot.getElementById('edit');
 		let preview = this.renderRoot.getElementById('preview');
-		preview.innerHTML = this.process_text(edit.value);
+		preview.innerHTML = this.process_text(edit.innerText);
 		let content_warning = this.renderRoot.getElementById('content_warning');
-		let content_warning_preview = this.renderRoot.getElementById(
-			'content_warning_preview'
-		);
-		if (content_warning && content_warning_preview) {
-			content_warning_preview.innerText = content_warning.value;
-		}
+		let draft = this.get_draft();
+		draft.text = edit.innerText;
+		draft.content_warning = content_warning?.value;
+		setTimeout(() => this.notify(draft), 0);
 	}
 
 	notify(draft) {
@@ -95,14 +96,6 @@ class TfComposeElement extends LitElement {
 		);
 	}
 
-	change() {
-		let draft = this.get_draft();
-		draft.text = this.renderRoot.getElementById('edit')?.value;
-		draft.content_warning =
-			this.renderRoot.getElementById('content_warning')?.value;
-		this.notify(draft);
-	}
-
 	convert_to_format(buffer, type, mime_type) {
 		return new Promise(function (resolve, reject) {
 			let img = new Image();
@@ -169,8 +162,7 @@ class TfComposeElement extends LitElement {
 				size: buffer.length ?? buffer.byteLength,
 			};
 			let edit = self.renderRoot.getElementById('edit');
-			edit.value += `\n![${name}](${id})`;
-			self.change();
+			edit.innerText += `\n![${name}](${id})`;
 			self.input();
 		} catch (e) {
 			alert(e?.message);
@@ -189,6 +181,13 @@ class TfComposeElement extends LitElement {
 				break;
 			}
 		}
+
+		event.preventDefault();
+		document.execCommand(
+			'insertText',
+			false,
+			event.clipboardData.getData('text/plain')
+		);
 	}
 
 	async submit() {
@@ -197,7 +196,8 @@ class TfComposeElement extends LitElement {
 		let edit = this.renderRoot.getElementById('edit');
 		let message = {
 			type: 'post',
-			text: edit.value,
+			text: edit.innerText,
+			channel: this.channel,
 		};
 		if (this.root || this.branch) {
 			message.root = this.root;
@@ -224,29 +224,19 @@ class TfComposeElement extends LitElement {
 			console.log('encrypted as', message);
 		}
 		try {
-			await tfrpc.rpc.appendMessage(this.whoami, message).then(function () {
-				edit.value = '';
-				self.change();
+			await tfrpc.rpc.appendMessage(this.whoami, message);
 			self.notify(undefined);
-				self.requestUpdate();
-			});
 		} catch (error) {
 			alert(error.message);
 		}
 	}
 
 	discard() {
-		let edit = this.renderRoot.getElementById('edit');
-		edit.value = '';
-		this.change();
-		let preview = this.renderRoot.getElementById('preview');
-		preview.innerHTML = '';
 		this.notify(undefined);
 	}
 
 	attach() {
 		let self = this;
-		let edit = this.renderRoot.getElementById('edit');
 		let input = document.createElement('input');
 		input.type = 'file';
 		input.onchange = function (event) {
@@ -262,9 +252,9 @@ class TfComposeElement extends LitElement {
 		try {
 			let rows = await tfrpc.rpc.query(
 				`
-				SELECT json(messages.content) FROM messages_fts(?)
+				SELECT json(messages.content) AS content FROM messages_fts(?)
 				JOIN messages ON messages.rowid = messages_fts.rowid
-				WHERE messages.content LIKE ?
+				WHERE json(messages.content) LIKE ?
 				ORDER BY timestamp DESC LIMIT 10
 			`,
 				['"' + text.replace('"', '""') + '"', `%![%${text}%](%)%`]
@@ -284,22 +274,39 @@ class TfComposeElement extends LitElement {
 	}
 
 	firstUpdated() {
+		let values = Object.entries(this.users).map((x) => ({
+			key: x[1].name ?? x[0],
+			value: x[0],
+		}));
+		if (this.author) {
+			values = [].concat(
+				[
+					{
+						key: this.users[this.author]?.name,
+						value: this.author,
+					},
+				],
+				values
+			);
+		}
 		let tribute = new Tribute({
+			iframe: this.shadowRoot,
 			collection: [
 				{
-					values: Object.entries(this.users).map((x) => ({
-						key: x[1].name,
-						value: x[0],
-					})),
+					values: values,
 					selectTemplate: function (item) {
-						return `[@${item.original.key}](${item.original.value})`;
+						return item
+							? `[@${item.original.key}](${item.original.value})`
+							: undefined;
 					},
 				},
 				{
 					trigger: '&',
 					values: this.autocomplete,
 					selectTemplate: function (item) {
-						return `![${item.original.key}](${item.original.value})`;
+						return item
+							? `![${item.original.key}](${item.original.value})`
+							: undefined;
 					},
 				},
 			],
@@ -310,14 +317,15 @@ class TfComposeElement extends LitElement {
 	updated() {
 		super.updated();
 		let edit = this.renderRoot.getElementById('edit');
-		if (this.last_updated_text !== edit.value) {
+		if (this.last_updated_text !== edit.innerText) {
 			let preview = this.renderRoot.getElementById('preview');
-			preview.innerHTML = this.process_text(edit.value);
-			this.last_updated_text = edit.value;
+			preview.innerHTML = this.process_text(edit.innerText);
+			this.last_updated_text = edit.innerText;
 		}
 		let encrypt = this.renderRoot.getElementById('encrypt_to');
 		if (encrypt) {
 			let tribute = new Tribute({
+				iframe: this.shadowRoot,
 				values: Object.entries(this.users).map((x) => ({
 					key: x[1].name,
 					value: x[0],
@@ -333,8 +341,7 @@ class TfComposeElement extends LitElement {
 	remove_mention(id) {
 		let draft = this.get_draft();
 		delete draft.mentions[id];
-		this.notify(draft);
-		this.requestUpdate();
+		setTimeout(() => this.notify(), 0);
 	}
 
 	render_mention(mention) {
@@ -342,7 +349,7 @@ class TfComposeElement extends LitElement {
 		return html` <div style="display: flex; flex-direction: row">
 			<div style="align-self: center; margin: 0.5em">
 				<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					title="Remove ${mention.name} mention"
 					@click=${() => self.remove_mention(mention.link)}
 				>
@@ -396,16 +403,16 @@ class TfComposeElement extends LitElement {
 		if (this.apps) {
 			return html`
 				<div class="w3-card-4 w3-margin w3-padding">
-					<select id="select" class="w3-select w3-dark-grey">
+					<select id="select" class="w3-select w3-theme-d1">
 						${Object.keys(self.apps).map(
 							(app) => html`<option value=${app}>${app}</option>`
 						)}
 					</select>
-					<button class="w3-button w3-dark-grey" @click=${attach_selected_app}>
+					<button class="w3-button w3-theme-d1" @click=${attach_selected_app}>
 						Attach
 					</button>
 					<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => (this.apps = null)}
 					>
 						Cancel
@@ -421,12 +428,12 @@ class TfComposeElement extends LitElement {
 			self.apps = await tfrpc.rpc.apps();
 		}
 		if (!this.apps) {
-			return html`<button class="w3-button w3-dark-grey" @click=${attach_app}>
+			return html`<button class="w3-button w3-theme-d1" @click=${attach_app}>
 				Attach App
 			</button>`;
 		} else {
 			return html`<button
-				class="w3-button w3-dark-grey"
+				class="w3-button w3-theme-d1"
 				@click=${() => (this.apps = null)}
 			>
 				Discard App
@@ -448,15 +455,15 @@ class TfComposeElement extends LitElement {
 			return html`
 				<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>
+						<input type="checkbox" class="w3-check w3-theme-d1" 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>
+					<input type="text" class="w3-input w3-border w3-theme-d1" id="content_warning" placeholder="Enter a content warning here." @input=${self.input} value=${draft.content_warning}></input>
 				</div>
 			`;
 		} else {
 			return html`
-				<input type="checkbox" class="w3-check w3-dark-grey" id="cw" @change=${() => self.set_content_warning('')}></input>
+				<input type="checkbox" class="w3-check w3-theme-d1" id="cw" @change=${() => self.set_content_warning('')}></input>
 				<label for="cw">CW</label>
 			`;
 		}
@@ -486,14 +493,14 @@ 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>
-				<button class="w3-button w3-dark-grey" @click=${() => this.set_encrypt(undefined)}>🚮</button>
+				<button class="w3-button w3-theme-d1" @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" class="w3-button w3-dark-grey" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter((id) => id != x))}></input>
+						<input type="button" class="w3-button w3-theme-d1" value="🚮" @click=${() => this.set_encrypt(draft.encrypt_to.filter((id) => id != x))}></input>
 					</li>`
 				)}
 			</ul>
@@ -512,7 +519,7 @@ class TfComposeElement extends LitElement {
 		let draft = self.get_draft();
 		let content_warning =
 			draft.content_warning !== undefined
-				? html`<div class="w3-panel w3-round-xlarge w3-blue">
+				? html`<div class="w3-panel w3-round-xlarge w3-theme-d2">
 						<p id="content_warning_preview">${draft.content_warning}</p>
 					</div>`
 				: undefined;
@@ -520,34 +527,34 @@ class TfComposeElement extends LitElement {
 			draft.encrypt_to !== undefined
 				? undefined
 				: html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => this.set_encrypt([])}
 					>
 						🔐
 					</button>`;
 		let result = html`
 			<div
-				class="w3-card-4 w3-blue-grey w3-padding"
+				class="w3-card-4 w3-theme-d4 w3-padding-small"
 				style="box-sizing: border-box"
 			>
+				${this.channel !== undefined
+					? html`<p>To #${this.channel}:</p>`
+					: undefined}
 				${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"
+				<div class="w3-container w3-padding-small">
+					<div class="w3-half">
+						<span
+							class="w3-input w3-theme-d1 w3-border"
+							style="resize: vertical; width: 100%; overflow: hidden; white-space: pre-wrap"
 							placeholder="Write a post here."
 							id="edit"
 							@input=${this.input}
-								@change=${this.change}
 							@paste=${this.paste}
-							>
-${draft.text}</textarea
-							>
-						</p>
+							contenteditable="plaintext-only"
+							.innerText=${live(draft.text ?? '')}
+						></span>
 					</div>
-					<div style="flex: 1 0 50%">
+					<div class="w3-half w3-padding">
 						${content_warning}
 						<div id="preview"></div>
 					</div>
@@ -556,18 +563,14 @@ ${draft.text}</textarea
 					self.render_mention(x)
 				)}
 				${this.render_attach_app()} ${this.render_content_warning()}
-				<button
-					class="w3-button w3-dark-grey"
-					id="submit"
-					@click=${this.submit}
-				>
+				<button class="w3-button w3-theme-d1" id="submit" @click=${this.submit}>
 					Submit
 				</button>
-				<button class="w3-button w3-dark-grey" @click=${this.attach}>
+				<button class="w3-button w3-theme-d1" @click=${this.attach}>
 					Attach
 				</button>
 				${this.render_attach_app_button()} ${encrypt}
-				<button class="w3-button w3-dark-grey" @click=${this.discard}>
+				<button class="w3-button w3-theme-d1" @click=${this.discard}>
 					Discard
 				</button>
 			</div>

apps/ssb/tf-id-picker.js

@@ -1,54 +0,0 @@
-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.
- */
-class TfIdentityPickerElement extends LitElement {
-	static get properties() {
-		return {
-			ids: {type: Array},
-			selected: {type: String},
-			users: {type: Object},
-		};
-	}
-
-	static styles = styles;
-
-	constructor() {
-		super();
-		this.ids = [];
-		this.users = {};
-	}
-
-	changed(event) {
-		this.selected = event.srcElement.value;
-		this.dispatchEvent(
-			new Event('change', {
-				srcElement: this,
-			})
-		);
-	}
-
-	render() {
-		return html`
-			<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>
-		`;
-	}
-}
-
-customElements.define('tf-id-picker', TfIdentityPickerElement);

apps/ssb/tf-message.js

@@ -1,4 +1,4 @@
-import {LitElement, html, unsafeHTML} from './lit-all.min.js';
+import {LitElement, html, render, unsafeHTML} from './lit-all.min.js';
 import * as tfrpc from '/static/tfrpc.js';
 import * as tfutils from './tf-utils.js';
 import * as emojis from './emojis.js';
@@ -14,6 +14,8 @@ class TfMessageElement extends LitElement {
 			format: {type: String},
 			blog_data: {type: String},
 			expanded: {type: Object},
+			channel: {type: String},
+			channel_unread: {type: Number},
 		};
 	}
 
@@ -28,6 +30,7 @@ class TfMessageElement extends LitElement {
 		this.drafts = {};
 		this.format = 'message';
 		this.expanded = {};
+		this.channel_unread = -1;
 	}
 
 	show_reply() {
@@ -54,6 +57,12 @@ class TfMessageElement extends LitElement {
 		);
 	}
 
+	show_reactions() {
+		let modal = document.getElementById('reactions_modal');
+		modal.users = this.users;
+		modal.votes = this.message?.votes || [];
+	}
+
 	render_votes() {
 		function normalize_expression(expression) {
 			if (expression === 'Like' || !expression) {
@@ -66,20 +75,27 @@ class TfMessageElement extends LitElement {
 				return expression;
 			}
 		}
-		return html`<div>
+		if (this.message?.votes?.length) {
+			return html` <div class="w3-container">
+				<div
+					class="w3-button w3-bar w3-padding-small"
+					@click=${this.show_reactions}
+				>
 					${(this.message.votes || []).map(
 						(vote) => html`
 							<span
-						title="${this.users[vote.author]?.name ?? vote.author} ${new Date(
-							vote.timestamp
-						)}"
+								class="w3-bar-item w3-padding-small"
+								title="${this.users[vote.author]?.name ??
+								vote.author} ${new Date(vote.timestamp)}"
 							>
 								${normalize_expression(vote.content.vote.expression)}
 							</span>
 						`
 					)}
+				</div>
 			</div>`;
 		}
+	}
 
 	render_raw() {
 		let raw = {
@@ -125,7 +141,7 @@ class TfMessageElement extends LitElement {
 	}
 
 	react(event) {
-		emojis.picker((x) => this.vote(x));
+		emojis.picker((x) => this.vote(x), null, this.whoami);
 	}
 
 	show_image(link) {
@@ -164,7 +180,7 @@ class TfMessageElement extends LitElement {
 			event.srcElement.classList.contains('img_caption')
 		) {
 			let next = event.srcElement.nextSibling;
-			if (next.style.display == 'block') {
+			if (next.style.display != 'none') {
 				next.style.display = 'none';
 			} else {
 				next.style.display = 'block';
@@ -215,7 +231,7 @@ class TfMessageElement extends LitElement {
 				>${mention.name}</a
 			>`;
 		} else if (mention.link?.startsWith('#')) {
-			return html` <a href=${'#q=' + encodeURIComponent(mention.link)}
+			return html` <a href=${'#' + encodeURIComponent('#' + mention.link)}
 				>${mention.link}</a
 			>`;
 		} else if (
@@ -239,9 +255,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 		if (mentions.length) {
 			let self = this;
 			return html`
-				<fieldset
-					style="background-color: rgba(0, 0, 0, 0.1); padding: 0.5em; border: 1px solid black"
-				>
+				<fieldset style="padding: 0.5em; border: 1px solid black">
 					<legend>Mentions</legend>
 					${mentions.map((x) => self.render_mention(x))}
 				</fieldset>
@@ -282,14 +296,14 @@ ${JSON.stringify(mention, null, 2)}</pre
 		if (this.message.child_messages?.length) {
 			if (!this.expanded[this.message.id]) {
 				return html`<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${() => self.set_expanded(true)}
 				>
 					+ ${this.total_child_messages(this.message) + ' More'}
 				</button>`;
 			} else {
 				return html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => self.set_expanded(false)}
 					>
 						Collapse</button
@@ -301,12 +315,27 @@ ${JSON.stringify(mention, null, 2)}</pre
 								.users=${this.users}
 								.drafts=${this.drafts}
 								.expanded=${this.expanded}
+								channel=${this.channel}
+								channel_unread=${this.channel_unread}
 							></tf-message>`
 					)}`;
 			}
 		}
 	}
 
+	mark_unread() {
+		this.dispatchEvent(
+			new CustomEvent('channelsetunread', {
+				bubbles: true,
+				composed: true,
+				detail: {
+					channel: this.channel,
+					unread: this.message.rowid,
+				},
+			})
+		);
+	}
+
 	render_channels() {
 		let content = this.message?.content;
 		if (this?.messsage?.decrypted?.type == 'post') {
@@ -331,20 +360,25 @@ ${JSON.stringify(mention, null, 2)}</pre
 		if (this.message?.decrypted?.type == 'post') {
 			content = this.message.decrypted;
 		}
+		let class_background = this.message?.decrypted
+			? 'w3-pale-red'
+			: this.message?.rowid >= this.channel_unread
+				? 'w3-theme-d2'
+				: 'w3-theme-d4';
 		let self = this;
 		let raw_button;
 		switch (this.format) {
 			case 'raw':
 				if (content?.type == 'post' || content?.type == 'blog') {
 					raw_button = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => (self.format = 'md')}
 					>
 						Markdown
 					</button>`;
 				} else {
 					raw_button = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => (self.format = 'message')}
 					>
 						Message
@@ -353,7 +387,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 				break;
 			case 'md':
 				raw_button = html`<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${() => (self.format = 'message')}
 				>
 					Message
@@ -361,7 +395,7 @@ ${JSON.stringify(mention, null, 2)}</pre
 				break;
 			case 'decrypted':
 				raw_button = html`<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${() => (self.format = 'raw')}
 				>
 					Raw
@@ -370,14 +404,14 @@ ${JSON.stringify(mention, null, 2)}</pre
 			default:
 				if (this.message.decrypted) {
 					raw_button = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => (self.format = 'decrypted')}
 					>
 						Decrypted
 					</button>`;
 				} else {
 					raw_button = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => (self.format = 'raw')}
 					>
 						Raw
@@ -389,24 +423,38 @@ ${JSON.stringify(mention, null, 2)}</pre
 			let body;
 			return html`
 				<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"
+					class="w3-card-4 ${class_background} w3-border-theme"
+					style="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
+						><a tfarget="_top" href=${'#' + encodeURIComponent(self.message.id)}
+							>%</a
+						>
+						${new Date(self.message.timestamp).toLocaleString()}</span
 					>
 					${raw_button} ${self.format == 'raw' ? self.render_raw() : inner}
 					${self.render_votes()}
+					${(self.message.child_messages || []).map(
+						(x) => html`
+							<tf-message
+								.message=${x}
+								whoami=${self.whoami}
+								.users=${self.users}
+								.drafts=${self.drafts}
+								.expanded=${self.expanded}
+								channel=${self.channel}
+								channel_unread=${self.channel_unread}
+							></tf-message>
+						`
+					)}
 				</div>
 			`;
 		}
 		if (this.message?.type === 'contact_group') {
 			return html` <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"
+				class="w3-card-4 ${class_background} w3-border-theme"
+				style="margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
 			>
 				${this.message.messages.map(
 					(x) =>
@@ -416,15 +464,19 @@ ${JSON.stringify(mention, null, 2)}</pre
 							.users=${this.users}
 							.drafts=${this.drafts}
 							.expanded=${this.expanded}
+							channel=${this.channel}
+							channel_unread=${this.channel_unread}
 						></tf-message>`
 				)}
 			</div>`;
 		} else if (this.message.placeholder) {
 			return html` <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"
+				class="w3-card-4 ${class_background} w3-border-theme"
+				style="margin-top: 8px; padding: 16px; overflow-wrap: anywhere"
+			>
+				<a target="_top" href=${'#' + encodeURIComponent(this.message.id)}
+					>${this.message.id}</a
 				>
-				<a target="_top" href=${'#' + this.message.id}>${this.message.id}</a>
 				(placeholder)
 				<div>${this.render_votes()}</div>
 				${(this.message.child_messages || []).map(
@@ -435,6 +487,8 @@ ${JSON.stringify(mention, null, 2)}</pre
 							.users=${this.users}
 							.drafts=${this.drafts}
 							.expanded=${this.expanded}
+							channel=${this.channel}
+							channel_unread=${this.channel_unread}
 						></tf-message>
 					`
 				)}
@@ -498,13 +552,11 @@ ${JSON.stringify(mention, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
+									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`
-								<button
-									class="w3-button w3-dark-grey"
-									@click=${this.show_reply}
-								>
+								<button class="w3-button w3-theme-d1" @click=${this.show_reply}>
 									Reply
 								</button>
 							`;
@@ -533,7 +585,7 @@ ${JSON.stringify(content, null, 2)}</pre
 				}
 				let content_warning = html`
 					<div
-						class="w3-panel w3-round-xlarge w3-blue"
+						class="w3-panel w3-round-xlarge w3-theme-l4"
 						style="cursor: pointer"
 						@click=${(x) => this.toggle_expanded(':cw')}
 					>
@@ -553,9 +605,6 @@ ${JSON.stringify(content, null, 2)}</pre
 				let is_encrypted = this.message?.decrypted
 					? html`<span style="align-self: center">🔓</span>`
 					: undefined;
-				let style_background = this.message?.decrypted
-					? 'rgba(255, 0, 0, 0.2)'
-					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -572,15 +621,19 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4"
-						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
+						class="w3-card-4 ${class_background} w3-border-theme"
+						style="margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							${is_encrypted}
 							<span style="flex: 1"></span>
 							<span style="padding-right: 8px"
-								><a target="_top" href=${'#' + self.message.id}>%</a>
+								><a
+									target="_top"
+									href=${'#' + encodeURIComponent(self.message.id)}
+									>%</a
+								>
 								${new Date(this.message.timestamp).toLocaleString()}</span
 							>
 							<span>${raw_button}</span>
@@ -588,9 +641,19 @@ ${JSON.stringify(content, null, 2)}</pre
 						${payload} ${this.render_votes()}
 						<p>
 							${reply}
-							<button class="w3-button w3-dark-grey" @click=${this.react}>
+							<button class="w3-button w3-theme-d1" @click=${this.react}>
 								React
 							</button>
+							${!content.root && this.message.rowid < this.channel_unread
+								? html`
+										<button
+											class="w3-button w3-theme-d1"
+											@click=${this.mark_unread}
+										>
+											Mark Unread
+										</button>
+									`
+								: undefined}
 						</p>
 						${this.render_children()}
 					</div>
@@ -599,9 +662,6 @@ ${JSON.stringify(content, null, 2)}</pre
 				let is_encrypted = this.message?.decrypted
 					? html`<span style="align-self: center">🔓</span>`
 					: undefined;
-				let style_background = this.message?.decrypted
-					? 'rgba(255, 0, 0, 0.2)'
-					: 'rgba(255, 255, 255, 0.1)';
 				return html`
 					<style>
 						code {
@@ -618,22 +678,26 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4"
-						style="border: 1px solid black; background-color: ${style_background}; margin-top: 8px; padding: 16px"
+						class="w3-card-4 ${class_background} w3-border-theme"
+						style="margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							${is_encrypted}
 							<span style="flex: 1"></span>
 							<span style="padding-right: 8px"
-								><a target="_top" href=${'#' + self.message.id}>%</a>
+								><a
+									target="_top"
+									href=${'#' + encodeURIComponent(self.message.id)}
+									>%</a
+								>
 								${new Date(this.message.timestamp).toLocaleString()}</span
 							>
 							<span>${raw_button}</span>
 						</div>
 						${content.text} ${this.render_votes()}
 						<p>
-							<button class="w3-button w3-dark-grey" @click=${this.react}>
+							<button class="w3-button w3-theme-d1" @click=${this.react}>
 								React
 							</button>
 						</p>
@@ -685,13 +749,11 @@ ${JSON.stringify(content, null, 2)}</pre
 									branch=${this.message.id}
 									.drafts=${this.drafts}
 									@tf-discard=${this.discard_reply}
+									author=${this.message.author}
 								></tf-compose>
 							`
 						: html`
-								<button
-									class="w3-button w3-dark-grey"
-									@click=${this.show_reply}
-								>
+								<button class="w3-button w3-theme-d1" @click=${this.show_reply}>
 									Reply
 								</button>
 							`;
@@ -711,14 +773,18 @@ ${JSON.stringify(content, null, 2)}</pre
 						}
 					</style>
 					<div
-						class="w3-card-4"
-						style="border: 1px solid black; background-color: rgba(255, 255, 255, 0.1); margin-top: 8px; padding: 16px"
+						class="w3-card-4 ${class_background} w3-border-theme"
+						style="margin-top: 8px; padding: 16px"
 					>
 						<div style="display: flex; flex-direction: row">
 							<tf-user id=${this.message.author} .users=${this.users}></tf-user>
 							<span style="flex: 1"></span>
 							<span style="padding-right: 8px"
-								><a target="_top" href=${'#' + self.message.id}>%</a>
+								><a
+									target="_top"
+									href=${'#' + encodeURIComponent(self.message.id)}
+									>%</a
+								>
 								${new Date(this.message.timestamp).toLocaleString()}</span
 							>
 							<span>${raw_button}</span>
@@ -728,7 +794,7 @@ ${JSON.stringify(content, null, 2)}</pre
 						${this.render_mentions()}
 						<div>
 							${reply}
-							<button class="w3-button w3-dark-grey" @click=${this.react}>
+							<button class="w3-button w3-theme-d1" @click=${this.react}>
 								React
 							</button>
 						</div>
@@ -757,7 +823,7 @@ ${JSON.stringify(content, null, 2)}</pre
 				return small_frame(html`
 					<div>
 						${content.subscribed ? 'subscribed to' : 'unsubscribed from'}
-						<a href=${'#q=' + encodeURIComponent('#' + content.channel)}
+						<a href=${'#' + encodeURIComponent('#' + content.channel)}
 							>#${content.channel}</a
 						>
 					</div>

apps/ssb/tf-news.js

@@ -11,6 +11,8 @@ class TfNewsElement extends LitElement {
 			following: {type: Array},
 			drafts: {type: Object},
 			expanded: {type: Object},
+			channel: {type: String},
+			channel_unread: {type: Number},
 		};
 	}
 
@@ -25,6 +27,7 @@ class TfNewsElement extends LitElement {
 		this.following = [];
 		this.drafts = {};
 		this.expanded = {};
+		this.channel_unread = -1;
 	}
 
 	process_messages(messages) {
@@ -33,12 +36,13 @@ class TfNewsElement extends LitElement {
 
 		console.log('processing', messages.length, 'messages');
 
-		function ensure_message(id) {
+		function ensure_message(id, rowid) {
 			let found = messages_by_id[id];
 			if (found) {
 				return found;
 			} else {
 				let added = {
+					rowid: rowid,
 					id: id,
 					placeholder: true,
 					content: '"placeholder"',
@@ -53,7 +57,7 @@ class TfNewsElement extends LitElement {
 
 		function link_message(message) {
 			if (message.content.type === 'vote') {
-				let parent = ensure_message(message.content.vote.link);
+				let parent = ensure_message(message.content.vote.link, message.rowid);
 				if (!parent.votes) {
 					parent.votes = [];
 				}
@@ -62,14 +66,14 @@ class TfNewsElement extends LitElement {
 			} else if (message.content.type == 'post') {
 				if (message.content.root) {
 					if (typeof message.content.root === 'string') {
-						let m = ensure_message(message.content.root);
+						let m = ensure_message(message.content.root, message.rowid);
 						if (!m.child_messages) {
 							m.child_messages = [];
 						}
 						m.child_messages.push(message);
 						message.parent_message = message.content.root;
 					} else {
-						let m = ensure_message(message.content.root[0]);
+						let m = ensure_message(message.content.root[0], message.rowid);
 						if (!m.child_messages) {
 							m.child_messages = [];
 						}
@@ -162,6 +166,7 @@ class TfNewsElement extends LitElement {
 			} else {
 				if (group.length > 0) {
 					result.push({
+						rowid: Math.max(...group.map((x) => x.rowid)),
 						type: 'contact_group',
 						messages: group,
 					});
@@ -170,6 +175,13 @@ class TfNewsElement extends LitElement {
 				result.push(message);
 			}
 		}
+		if (group.length > 0) {
+			result.push({
+				rowid: Math.max(...group.map((x) => x.rowid)),
+				type: 'contact_group',
+				messages: group,
+			});
+		}
 		return result;
 	}
 
@@ -178,18 +190,39 @@ class TfNewsElement extends LitElement {
 		let final_messages = this.group_following(
 			this.finalize_messages(messages_by_id)
 		);
+		let unread_rowid = -1;
+		for (let message of final_messages) {
+			if (message.rowid >= this.channel_unread) {
+				unread_rowid = message.rowid;
+			}
+		}
 		return html`
-			<div style="display: flex; flex-direction: column">
+			<div>
 				${final_messages.map(
 					(x) =>
-						html`<tf-message
+						html`
+							<tf-message
 								.message=${x}
 								whoami=${this.whoami}
 								.users=${this.users}
 								.drafts=${this.drafts}
 								.expanded=${this.expanded}
 								collapsed="true"
-						></tf-message>`
+								channel=${this.channel}
+								channel_unread=${this.channel_unread}
+							></tf-message>
+							${x.rowid == unread_rowid && x != final_messages[0]
+								? html`<div style="display: flex; flex-direction: row">
+										<div
+											style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
+										></div>
+										<div style="color: #f00; padding: 8px">unread</div>
+										<div
+											style="border-bottom: 1px solid #f00; flex: 1; align-self: center; height: 1px"
+										></div>
+									</div>`
+								: undefined}
+						`
 				)}
 			</div>
 		`;

apps/ssb/tf-profile.js

@@ -188,6 +188,10 @@ class TfProfileElement extends LitElement {
 		}
 	}
 
+	copy_id() {
+		navigator.clipboard.writeText(this.id);
+	}
+
 	render() {
 		if (
 			this.id == this.whoami &&
@@ -215,49 +219,57 @@ class TfProfileElement extends LitElement {
 				let server_follow;
 				if (this.server_follows_me === true) {
 					server_follow = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => this.server_follow_me(false)}
 					>
 						Server, Stop Following Me
 					</button>`;
 				} else if (this.server_follows_me === false) {
 					server_follow = html`<button
-						class="w3-button w3-dark-grey"
+						class="w3-button w3-theme-d1"
 						@click=${() => this.server_follow_me(true)}
 					>
 						Server, Follow Me
 					</button>`;
 				}
 				edit = html`
-					<button class="w3-button w3-dark-grey" @click=${this.save_edits}>
+					<button
+						id="save_profile"
+						class="w3-button w3-theme-d1"
+						@click=${this.save_edits}
+					>
 						Save Profile
 					</button>
-					<button class="w3-button w3-dark-grey" @click=${this.discard_edits}>
+					<button class="w3-button w3-theme-d1" @click=${this.discard_edits}>
 						Discard
 					</button>
 					${server_follow}
 				`;
 			} else {
-				edit = html`<button class="w3-button w3-dark-grey" @click=${this.edit}>
+				edit = html`<button
+					id="edit_profile"
+					class="w3-button w3-theme-d1"
+					@click=${this.edit}
+				>
 					Edit Profile
 				</button>`;
 			}
 		}
 		if (this.id !== this.whoami && this.following !== undefined) {
 			follow = this.following
-				? html`<button class="w3-button w3-dark-grey" @click=${this.unfollow}>
+				? html`<button class="w3-button w3-theme-d1" @click=${this.unfollow}>
 						Unfollow
 					</button>`
-				: html`<button class="w3-button w3-dark-grey" @click=${this.follow}>
+				: html`<button class="w3-button w3-theme-d1" @click=${this.follow}>
 						Follow
 					</button>`;
 		}
 		if (this.id !== this.whoami && this.blocking !== undefined) {
 			block = this.blocking
-				? html`<button class="w3-button w3-dark-grey" @click=${this.unblock}>
+				? html`<button class="w3-button w3-theme-d1" @click=${this.unblock}>
 						Unblock
 					</button>`
-				: html`<button class="w3-button w3-dark-grey" @click=${this.block}>
+				: html`<button class="w3-button w3-theme-d1" @click=${this.block}>
 						Block
 					</button>`;
 		}
@@ -267,16 +279,16 @@ class TfProfileElement extends LitElement {
 				<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>
+						<input class="w3-input w3-theme-d1" 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>
+					<textarea class="w3-input w3-theme-d1" 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>
+						<input class="w3-check w3-theme-d1" 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>
+						<button class="w3-button w3-theme-d1" @click=${this.attach_image}>Attach Image</button>
 					</div>
 				</div>
 			</div>`
@@ -285,8 +297,10 @@ class TfProfileElement extends LitElement {
 			typeof profile.image == 'string' ? profile.image : profile.image?.link;
 		image = this.editing?.image ?? image;
 		let description = this.editing?.description ?? profile.description;
-		return html`<div style="border: 2px solid black; background-color: rgba(255, 255, 255, 0.2); padding: 16px">
-			<tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
+		return html`<div class="w3-container" style="box-sizing: border-box; border: 2px solid black; background-color: rgba(255, 255, 255, 0.2)">
+			<p><tf-user id=${this.id} .users=${this.users}></tf-user> (${tfutils.human_readable_size(this.size)})
+			<input type="text" class="w3-input w3-border w3-theme-d1" readonly value=${this.id}></input>
+			<button class="w3-button w3-theme-d1 w3-ripple" @click=${this.copy_id}>Copy</button>
 			<div style="display: flex; flex-direction: row; gap: 1em">
 				${edit_profile}
 				<div style="flex: 1 0 50%">
@@ -300,11 +314,11 @@ class TfProfileElement extends LitElement {
 				Blocking ${profile.blocking} identities.
 				Blocked by ${profile.blocked} identities.
 			</div>
-			<div>
+			<p>
 				${edit}
 				${follow}
 				${block}
-			</div>
+			</p>
 		</div>`;
 	}
 }

apps/ssb/tf-reactions-modal.js

@@ -0,0 +1,72 @@
+import {LitElement, html, unsafeHTML} from './lit-all.min.js';
+import {styles} from './tf-styles.js';
+
+class TfReactionsModalElement extends LitElement {
+	static get properties() {
+		return {
+			users: {type: Object},
+			votes: {type: Array},
+		};
+	}
+
+	static styles = styles;
+
+	constructor() {
+		super();
+		this.votes = [];
+		this.users = {};
+	}
+
+	clear() {
+		this.votes = [];
+	}
+
+	render() {
+		let self = this;
+		return this.votes?.length
+			? html` <div
+					class="w3-modal w3-animate-opacity"
+					style="display: block; box-sizing: border-box; z-index: 10"
+					@click=${this.clear}
+				>
+					<div
+						class="w3-modal-content w3-card-4 w3-theme-d1"
+						onclick="event.stopPropagation()"
+					>
+						<div class="w3-container w3-padding">
+							<header class="w3-container">
+								<h2>Reactions</h2>
+								<span class="w3-button w3-display-topright" @click=${this.clear}
+									>&times;</span
+								>
+							</header>
+							<ul class="w3-theme-dark w3-container w3-ul">
+								${this.votes.map(
+									(x) => html`
+										<li class="w3-bar">
+											<span class="w3-bar-item"
+												>${x?.content?.vote?.expression}</span
+											>
+											<tf-user
+												class="w3-bar-item"
+												id=${x.author}
+												.users=${this.users}
+											></tf-user>
+											<span class="w3-bar-item w3-right"
+												>${new Date(x?.timestamp).toLocaleString()}</span
+											>
+										</li>
+									`
+								)}
+							</ul>
+							<footer class="w3-container w3-padding">
+								<button class="w3-button" @click=${this.clear}>Close</button>
+							</footer>
+						</div>
+					</div>
+				</div>`
+			: undefined;
+	}
+}
+
+customElements.define('tf-reactions-modal', TfReactionsModalElement);

apps/ssb/tf-tab-connections.js

@@ -7,35 +7,55 @@ class TfTabConnectionsElement extends LitElement {
 		return {
 			broadcasts: {type: Array},
 			identities: {type: Array},
+			my_identities: {type: Array},
 			connections: {type: Array},
 			stored_connections: {type: Array},
 			users: {type: Object},
+			server_identity: {type: String},
+			connect_attempt: {type: Object},
+			connect_message: {type: String},
+			connect_success: {type: Boolean},
 		};
 	}
 
 	static styles = styles;
 
+	static k_broadcast_emojis = {
+		discovery: '🏓',
+		room: '🚪',
+		peer_exchange: '🕸',
+	};
+
 	constructor() {
 		super();
 		let self = this;
 		this.broadcasts = [];
 		this.identities = [];
+		this.my_identities = [];
 		this.connections = [];
 		this.stored_connections = [];
 		this.users = {};
+		tfrpc.rpc.getIdentities().then(function (identities) {
+			self.my_identities = identities || [];
+		});
 		tfrpc.rpc.getAllIdentities().then(function (identities) {
 			self.identities = identities || [];
 		});
 		tfrpc.rpc.getStoredConnections().then(function (connections) {
 			self.stored_connections = connections || [];
 		});
+		tfrpc.rpc.getServerIdentity().then(function (identity) {
+			self.server_identity = identity;
+		});
 	}
 
 	render_connection_summary(connection) {
 		if (connection.address && connection.port) {
-			return html`(<small>${connection.address}:${connection.port}</small>)`;
+			return html`<div>
+				<small>${connection.address}:${connection.port}</small>
+			</div>`;
 		} else if (connection.tunnel) {
-			return html`(room peer)`;
+			return html`<div>room peer</div>`;
 		} else {
 			return JSON.stringify(connection);
 		}
@@ -61,7 +81,7 @@ class TfTabConnectionsElement extends LitElement {
 		return html`
 			<li>
 				<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${() => self._tunnel(connection.tunnel.id, connection.pubkey)}
 				>
 					Connect
@@ -71,17 +91,36 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}
 
+	render_message(connection) {
+		return html`<div
+			?hidden=${this.connect_message === undefined ||
+			this.connect_attempt != connection}
+			style="cursor: pointer"
+			class=${'w3-panel ' + (this.connect_success ? 'w3-green' : 'w3-red')}
+			@click=${() => (this.connect_attempt = undefined)}
+		>
+			<p>${this.connect_message}</p>
+		</div>`;
+	}
+
 	render_broadcast(connection) {
+		let self = this;
 		return html`
 			<li>
+				<div class="w3-bar" style="overflow: hidden; overflow-wrap: nowrap">
 					<button
-					class="w3-button w3-dark-grey"
-					@click=${() => tfrpc.rpc.connect(connection)}
+						class="w3-bar-item w3-button w3-theme-d1"
+						@click=${() => self.connect(connection)}
 					>
 						Connect
 					</button>
+					<div class="w3-bar-item">
+						${TfTabConnectionsElement.k_broadcast_emojis[connection.origin]}
 						<tf-user id=${connection.pubkey} .users=${this.users}></tf-user>
 						${this.render_connection_summary(connection)}
+					</div>
+				</div>
+				${this.render_message(connection)}
 			</li>
 		`;
 	}
@@ -92,17 +131,44 @@ class TfTabConnectionsElement extends LitElement {
 	}
 
 	render_connection(connection) {
+		let requests = Object.values(
+			connection.requests.reduce(function (accumulator, value) {
+				let key = `${value.name}:${Math.sign(value.request_number)}`;
+				if (!accumulator[key]) {
+					accumulator[key] = Object.assign({count: 0}, value);
+				}
+				accumulator[key].count++;
+				return accumulator;
+			}, {})
+		);
 		return html`
 			<button
-				class="w3-button w3-dark-grey"
+				class="w3-button w3-theme-d1"
 				@click=${() => tfrpc.rpc.closeConnection(connection.id)}
 			>
 				Close
 			</button>
+			${connection.flags.one_shot ? '🔃' : undefined}
 			<tf-user id=${connection.id} .users=${this.users}></tf-user>
 			${connection.tunnel !== undefined
 				? '🚇'
 				: html`(${connection.host}:${connection.port})`}
+			<div>
+				${requests.map(
+					(x) => html`
+						<span
+							class=${'w3-tag w3-small ' +
+							(x.active ? 'w3-theme-l3' : 'w3-theme-d3')}
+							>${x.request_number > 0 ? '🟩' : '🟥'} ${x.name}
+							<span
+								class="w3-badge w3-white"
+								style=${x.count > 1 ? undefined : 'display: none'}
+								>${x.count}</span
+							></span
+						>
+					`
+				)}
+			</div>
 			<ul>
 				${this.connections
 					.filter((x) => x.tunnel === this.connections.indexOf(connection))
@@ -112,59 +178,105 @@ class TfTabConnectionsElement extends LitElement {
 		`;
 	}
 
+	connect(address) {
+		let self = this;
+		self.connect_attempt = address;
+		self.connect_message = undefined;
+		self.connect_success = false;
+		tfrpc.rpc
+			.connect(address)
+			.then(function () {
+				if (self.connect_attempt == address) {
+					self.connect_message = 'Connected.';
+					self.connect_success = true;
+				}
+			})
+			.catch(function (error) {
+				if (self.connect_attempt == address) {
+					self.connect_message = 'Error: ' + error;
+					self.connect_success = false;
+				}
+			});
+	}
+
 	render() {
 		let self = this;
 		return html`
-			<div class="w3-container">
+			<div class="w3-container" style="box-sizing: border-box">
 				<h2>New Connection</h2>
-				<textarea class="w3-input w3-dark-grey" id="code"></textarea>
+				<textarea class="w3-input w3-theme-d1" id="code"></textarea>
+				${this.render_message(this.renderRoot.getElementById('code')?.value)}
 				<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${() =>
-						tfrpc.rpc.connect(self.renderRoot.getElementById('code').value)}
+						self.connect(self.renderRoot.getElementById('code')?.value)}
 				>
 					Connect
 				</button>
 				<h2>Broadcasts</h2>
-				<ul>
+				<ul class="w3-ul w3-border">
 					${this.broadcasts
 						.filter((x) => x.address)
+						.filter(
+							(x) => self.connections.map((c) => c.id).indexOf(x.pubkey) == -1
+						)
 						.map((x) => self.render_broadcast(x))}
 				</ul>
 				<h2>Connections</h2>
-				<ul>
+				<ul class="w3-ul w3-border">
 					${this.connections
 						.filter((x) => x.tunnel === undefined)
-						.map((x) => html` <li>${this.render_connection(x)}</li> `)}
+						.map(
+							(x) => html`
+								<li class="w3-bar">${this.render_connection(x)}</li>
+							`
+						)}
 				</ul>
-				<h2>Stored Connections (WIP)</h2>
-				<ul>
+				<h2>Stored Connections</h2>
+				<ul class="w3-ul w3-border">
 					${this.stored_connections.map(
 						(x) => html`
 							<li>
+								<div class="w3-bar">
 									<button
-									class="w3-button w3-dark-grey"
+										class="w3-bar-item w3-button w3-theme-d1"
 										@click=${() => self.forget_stored_connection(x)}
 									>
 										Forget
 									</button>
 									<button
-									class="w3-button w3-dark-grey"
-									@click=${() => tfrpc.rpc.connect(x)}
+										class="w3-bar-item w3-button w3-theme-d1"
+										@click=${() => this.connect(x)}
 									>
 										Connect
 									</button>
-								${x.address}:${x.port}
+									<div class="w3-bar-item">
 										<tf-user id=${x.pubkey} .users=${self.users}></tf-user>
+										<div><small>${x.address}:${x.port}</small></div>
+									</div>
+								</div>
+								${this.render_message(x)}
 							</li>
 						`
 					)}
 				</ul>
 				<h2>Local Accounts</h2>
-				<ul>
+				<ul class="w3-ul w3-border">
 					${this.identities.map(
 						(x) =>
-							html`<li><tf-user id=${x} .users=${this.users}></tf-user></li>`
+							html`<li class="w3-bar">
+								${x == this.server_identity
+									? html`<span class="w3-tag w3-medium w3-round w3-theme-l1"
+											>🖥 local server</span
+										>`
+									: undefined}
+								${this.my_identities.indexOf(x) != -1
+									? html`<span class="w3-tag w3-medium w3-round w3-theme-d1"
+											>😎 you</span
+										>`
+									: undefined}
+								<tf-user id=${x} .users=${this.users}></tf-user>
+							</li>`
 					)}
 				</ul>
 			</div>

apps/ssb/tf-tab-mentions.js

@@ -1,78 +0,0 @@
-import {LitElement, html, unsafeHTML} from './lit-all.min.js';
-import * as tfrpc from '/static/tfrpc.js';
-import {styles} from './tf-styles.js';
-
-class TfTabMentionsElement extends LitElement {
-	static get properties() {
-		return {
-			whoami: {type: String},
-			users: {type: Object},
-			following: {type: Array},
-			expanded: {type: Object},
-			messages: {type: Array},
-		};
-	}
-
-	static styles = styles;
-
-	constructor() {
-		super();
-		let self = this;
-		this.whoami = null;
-		this.users = {};
-		this.following = [];
-		this.expanded = {};
-		this.messages = [];
-	}
-
-	async load() {
-		console.log('Loading...', this.whoami);
-		let results = await tfrpc.rpc.query(
-			`
-				SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-				FROM messages_fts(?)
-				JOIN messages ON messages.rowid = messages_fts.rowid
-				JOIN json_each(?) AS following ON messages.author = following.value
-				WHERE messages.author != ?
-				ORDER BY timestamp DESC limit 20
-			`,
-			[
-				'"' + this.whoami.replace('"', '""') + '"',
-				JSON.stringify(this.following),
-				this.whoami,
-			]
-		);
-		console.log('Done.');
-		this.messages = results;
-	}
-
-	on_expand(event) {
-		if (event.detail.expanded) {
-			let expand = {};
-			expand[event.detail.id] = true;
-			this.expanded = Object.assign({}, this.expanded, expand);
-		} else {
-			delete this.expanded[event.detail.id];
-			this.expanded = Object.assign({}, this.expanded);
-		}
-	}
-
-	render() {
-		let self = this;
-		if (!this.loading) {
-			this.loading = true;
-			this.load();
-		}
-		return html`
-			<tf-news
-				id="news"
-				whoami=${this.whoami}
-				.messages=${this.messages}
-				.users=${this.users}
-				.expanded=${this.expanded}
-				@tf-expand=${this.on_expand}
-			></tf-news>
-		`;
-	}
-}
-customElements.define('tf-tab-mentions', TfTabMentionsElement);

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

@@ -12,6 +12,11 @@ class TfTabNewsFeedElement extends LitElement {
 			messages: {type: Array},
 			drafts: {type: Object},
 			expanded: {type: Object},
+			channels_unread: {type: Object},
+			channels_latest: {type: Object},
+			loading: {type: Number},
+			time_range: {type: Array},
+			time_loading: {type: Array},
 		};
 	}
 
@@ -26,30 +31,67 @@ class TfTabNewsFeedElement extends LitElement {
 		this.following = [];
 		this.drafts = {};
 		this.expanded = {};
-		this.start_time = new Date().valueOf() - 24 * 60 * 60 * 1000;
+		this.channels_unread = {};
+		this.channels_latest = {};
+		this.start_time = new Date().valueOf();
+		this.time_range = [0, 0];
+		this.time_loading = undefined;
+		this.loading = 0;
 	}
 
-	async fetch_messages() {
-		if (this.hash.startsWith('#@')) {
-			let r = await tfrpc.rpc.query(
+	channel() {
+		return this.hash.startsWith('##')
+			? this.hash.substring(2)
+			: this.hash.substring(1);
+	}
+
+	async fetch_messages(start_time, end_time) {
+		this.time_loading = [start_time, end_time];
+		let result;
+		if (this.hash == '#@') {
+			result = await tfrpc.rpc.query(
 				`
-					WITH mine AS (SELECT id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
+					SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+					FROM messages_fts(?1)
+					JOIN messages ON messages.rowid = messages_fts.rowid
+					JOIN json_each(?2) AS following ON messages.author = following.value
+					WHERE
+						messages.author != ?1 AND
+						messages.timestamp >= ?3 AND
+						messages.timestamp < ?4
+					ORDER BY timestamp DESC limit 20
+				`,
+				[
+					'"' + this.whoami.replace('"', '""') + '"',
+					JSON.stringify(this.following),
+					start_time,
+					end_time,
+				]
+			);
+		} else if (this.hash.startsWith('#@')) {
+			result = await tfrpc.rpc.query(
+				`
+					WITH mine AS (SELECT rowid, id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
 						FROM messages
 						WHERE messages.author = ?
-						ORDER BY sequence DESC
-						LIMIT 20)
-					SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						ORDER BY sequence DESC)
+					SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 						FROM mine
 						JOIN messages_refs ON mine.id = messages_refs.ref
 						JOIN messages ON messages_refs.message = messages.id
+						WHERE
+							mine.timestamp >= ?2 AND
+							mine.timestamp < ?3
 					UNION
 					SELECT * FROM mine
+					WHERE
+						mine.timestamp >= ?2 AND
+						mine.timestamp < ?3
 				`,
-				[this.hash.substring(1)]
+				[this.hash.substring(1), start_time, end_time]
 			);
-			return r;
 		} else if (this.hash.startsWith('#%')) {
-			return await tfrpc.rpc.query(
+			result = await tfrpc.rpc.query(
 				`
 					SELECT id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
 					FROM messages
@@ -62,6 +104,68 @@ class TfTabNewsFeedElement extends LitElement {
 				`,
 				[this.hash.substring(1)]
 			);
+		} else if (this.hash.startsWith('##')) {
+			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.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM messages
+							JOIN json_each(?) AS following ON messages.author = following.value
+							WHERE
+								messages.timestamp >= ? AND
+								messages.timestamp < ? AND
+								messages.content ->> 'channel' = ?
+							ORDER BY messages.timestamp DESC)
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.ref
+							JOIN messages ON messages_refs.message = messages.id
+						UNION
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM news
+							JOIN messages_refs ON news.id = messages_refs.message
+							JOIN messages ON messages_refs.ref = messages.id
+						UNION
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+							FROM messages_fts(?5)
+							JOIN messages ON messages.rowid = messages_fts.rowid
+							JOIN json_each(?1) AS following ON messages.author = following.value
+							JOIN json_tree(messages.content, '$.mentions') AS mention ON mention.value = '#' || ?4
+							WHERE
+								messages.timestamp >= ?2 AND
+								messages.timestamp < ?3
+						UNION
+						SELECT news.* FROM news
+					`,
+						[
+							JSON.stringify(this.following.slice(i, i + k_following_limit)),
+							start_time,
+							end_time,
+							this.hash.substring(2),
+							'"#' + this.hash.substring(2).replace('"', '""') + '"',
+						]
+					)
+				);
+			}
+			result = [].concat(...(await Promise.all(promises)));
+		} else if (this.hash == '#🔐') {
+			result = await tfrpc.rpc.query(
+				`
+					SELECT messages.rowid, messages.id, previous, author, sequence, timestamp, hash, json(content) AS content, signature
+						FROM messages
+						JOIN json_each(?1) AS following ON messages.author = following.value
+						WHERE
+							messages.timestamp >= ?2 AND
+							messages.timestamp < ?3 AND
+							json(messages.content) LIKE '"%'
+						ORDER BY sequence DESC
+				`,
+				[JSON.stringify(this.following), start_time, end_time]
+			);
+			result = (await this.decrypt(result)).filter((x) => x.decrypted);
 		} else {
 			let promises = [];
 			const k_following_limit = 256;
@@ -69,17 +173,17 @@ class TfTabNewsFeedElement extends LitElement {
 				promises.push(
 					tfrpc.rpc.query(
 						`
-						WITH news AS (SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						WITH news AS (SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 						FROM messages
 						JOIN json_each(?) AS following ON messages.author = following.value
-						WHERE messages.timestamp > ? AND messages.timestamp < ?
+						WHERE messages.timestamp >= ? AND messages.timestamp < ?
 						ORDER BY messages.timestamp DESC)
-						SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 							FROM news
 							JOIN messages_refs ON news.id = messages_refs.ref
 							JOIN messages ON messages_refs.message = messages.id
 						UNION
-						SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
+						SELECT messages.rowid, messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
 							FROM news
 							JOIN messages_refs ON news.id = messages_refs.message
 							JOIN messages ON messages_refs.ref = messages.id
@@ -88,50 +192,58 @@ class TfTabNewsFeedElement extends LitElement {
 					`,
 						[
 							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,
+							start_time,
+							end_time,
 						]
 					)
 				);
 			}
-			return [].concat(...(await Promise.all(promises)));
+			result = [].concat(...(await Promise.all(promises)));
 		}
+		this.time_loading = undefined;
+		return result;
+	}
+
+	update_time_range_from_messages(messages) {
+		this.time_range = [
+			messages.reduce(
+				(accumulator, current) => Math.min(accumulator, current.timestamp),
+				this.time_range[0]
+			),
+			messages.reduce(
+				(accumulator, current) => Math.max(accumulator, current.timestamp),
+				this.time_range[1]
+			),
+		];
 	}
 
 	async load_more() {
+		this.loading++;
+		this.loading_canceled = false;
+		try {
+			let more = [];
+			while (!more.length && !this.loading_canceled) {
 				let last_start_time = this.start_time;
-		this.start_time = last_start_time - 24 * 60 * 60 * 1000;
-		let more = await tfrpc.rpc.query(
-			`
-				WITH news AS (SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-				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.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-					FROM news
-					JOIN messages_refs ON news.id = messages_refs.ref
-					JOIN messages ON messages_refs.message = messages.id
-				UNION
-				SELECT messages.id, messages.previous, messages.author, messages.sequence, messages.timestamp, messages.hash, json(messages.content) AS content, messages.signature
-					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, last_start_time]
+				this.start_time = last_start_time - 7 * 24 * 60 * 60 * 1000;
+				more = await this.fetch_messages(this.start_time, last_start_time);
+				this.update_time_range_from_messages(
+					more.filter(
+						(x) =>
+							x.timestamp >= this.start_time && x.timestamp < last_start_time
+					)
 				);
+			}
 			this.messages = await this.decrypt([...more, ...this.messages]);
+		} finally {
+			this.loading--;
+		}
+	}
+
+	cancel_load() {
+		this.loading_canceled = true;
 	}
 
 	async decrypt(messages) {
-		console.log('decrypt');
 		let result = [];
 		for (let message of messages) {
 			let content;
@@ -156,8 +268,94 @@ class TfTabNewsFeedElement extends LitElement {
 		return result;
 	}
 
-	async add_messages(messages) {
-		this.messages = await this.decrypt([...messages, ...this.messages]);
+	async load_latest() {
+		this.loading++;
+		let now = new Date().valueOf();
+		let end_time = now + 24 * 60 * 60 * 1000;
+		let messages = [];
+		try {
+			messages = await this.fetch_messages(
+				this.time_range[1] - 24 * 60 * 60 * 1000,
+				end_time
+			);
+			messages = await this.decrypt(messages);
+			this.update_time_range_from_messages(
+				messages.filter(
+					(x) => x.timestamp >= this.time_range[1] && x.timestamp < end_time
+				)
+			);
+		} finally {
+			this.loading--;
+		}
+		this.messages = Object.values(
+			Object.fromEntries([...this.messages, ...messages].map((x) => [x.id, x]))
+		);
+		console.log('done loading latest messages.');
+	}
+
+	async load_messages() {
+		let self = this;
+		this.loading++;
+		let messages = [];
+		try {
+			this.messages = [];
+			this._messages_hash = this.hash;
+			this._messages_following = this.following;
+			let now = new Date().valueOf();
+			let start_time = now - 24 * 60 * 60 * 1000;
+			this.start_time = start_time;
+			this.time_range = [this.start_time, now + 24 * 60 * 60 * 1000];
+			messages = await this.fetch_messages(
+				this.time_range[0],
+				this.time_range[1]
+			);
+			this.update_time_range_from_messages(
+				messages.filter(
+					(x) =>
+						x.timestamp >= this.time_range[0] &&
+						x.timestamp < this.time_range[1]
+				)
+			);
+			messages = await this.decrypt(messages);
+			if (!messages.length) {
+				let more = [];
+				while (!more.length && start_time >= 0) {
+					let last_start_time = start_time;
+					start_time = last_start_time - 7 * 24 * 60 * 60 * 1000;
+					more = await this.fetch_messages(start_time, last_start_time);
+					this.update_time_range_from_messages(
+						more.filter(
+							(x) => x.timestamp >= start_time && x.timestamp < last_start_time
+						)
+					);
+				}
+				messages = await this.decrypt([...more, ...this.messages]);
+			}
+		} finally {
+			this.loading--;
+		}
+		this.messages = messages;
+		this.time_loading = undefined;
+		console.log(`loading messages done for ${self.whoami}`);
+	}
+
+	mark_all_read() {
+		let newest = this.messages.reduce(
+			(accumulator, current) => Math.max(accumulator, current.rowid),
+			this.channels_latest[this.channel()] ?? -1
+		);
+		if (newest >= 0) {
+			this.dispatchEvent(
+				new CustomEvent('channelsetunread', {
+					bubbles: true,
+					composed: true,
+					detail: {
+						channel: this.channel(),
+						unread: newest + 1,
+					},
+				})
+			);
+		}
 	}
 
 	render() {
@@ -169,31 +367,49 @@ class TfTabNewsFeedElement extends LitElement {
 			console.log(
 				`loading messages for ${this.whoami} (following ${this.following.length})`
 			);
-			let self = this;
-			this.messages = [];
-			this._messages_hash = this.hash;
-			this._messages_following = this.following;
-			this.fetch_messages()
-				.then(this.decrypt.bind(this))
-				.then(function (messages) {
-					self.messages = messages;
-					console.log(`loading mesages done for ${self.whoami}`);
-				})
-				.catch(function (error) {
-					alert(JSON.stringify(error, null, 2));
-				});
+			this.load_messages();
 		}
 		let more;
-		if (!this.hash.startsWith('#@') && !this.hash.startsWith('#%')) {
+		if (!this.hash.startsWith('#%')) {
 			more = html`
 				<p>
-					<button class="w3-button w3-dark-grey" @click=${this.load_more}>
+					<button class="w3-button w3-theme-d1" @click=${this.mark_all_read}>
+						Mark All Read
+					</button>
+					<button
+						?disabled=${this.loading}
+						class="w3-button w3-theme-d1"
+						@click=${this.load_more}
+					>
 						Load More
 					</button>
+					<button
+						class=${'w3-button w3-theme-d1' + (this.loading ? '' : ' w3-hide')}
+						@click=${this.cancel_load}
+					>
+						Cancel
+					</button>
+					<span
+						>Showing
+						${new Date(
+							this.time_loading
+								? Math.min(this.time_loading[0], this.time_range[0])
+								: this.time_range[0]
+						).toLocaleDateString()}
+						-
+						${new Date(
+							this.time_loading
+								? Math.max(this.time_loading[1], this.time_range[1])
+								: this.time_range[1]
+						).toLocaleDateString()}.</span
+					>
 				</p>
 			`;
 		}
 		return html`
+			<button class="w3-button w3-theme-d1" @click=${this.mark_all_read}>
+				Mark All Read
+			</button>
 			<tf-news
 				id="news"
 				whoami=${this.whoami}
@@ -202,6 +418,8 @@ class TfTabNewsFeedElement extends LitElement {
 				.following=${this.following}
 				.drafts=${this.drafts}
 				.expanded=${this.expanded}
+				channel=${this.channel()}
+				channel_unread=${this.channels_unread?.[this.channel()]}
 			></tf-news>
 			${more}
 		`;

apps/ssb/tf-tab-news.js

@@ -12,6 +12,10 @@ class TfTabNewsElement extends LitElement {
 			following: {type: Array},
 			drafts: {type: Object},
 			expanded: {type: Object},
+			loading: {type: Boolean},
+			channels: {type: Array},
+			channels_unread: {type: Object},
+			channels_latest: {type: Object},
 		};
 	}
 
@@ -28,6 +32,9 @@ class TfTabNewsElement extends LitElement {
 		this.cache = {};
 		this.drafts = {};
 		this.expanded = {};
+		this.channels_unread = {};
+		this.channels_latest = {};
+		this.channels = [];
 		tfrpc.rpc.localStorageGet('drafts').then(function (d) {
 			self.drafts = JSON.parse(d || '{}');
 		});
@@ -47,10 +54,7 @@ class TfTabNewsElement extends LitElement {
 		let unread = this.unread;
 		let news = this.shadowRoot?.getElementById('news');
 		if (news) {
-			console.log('injecting messages', news.messages);
-			news.add_messages(
-				Object.values(Object.fromEntries(this.unread.map((x) => [x.id, x])))
-			);
+			news.load_latest();
 			this.dispatchEvent(new CustomEvent('refresh'));
 		}
 	}
@@ -84,10 +88,7 @@ class TfTabNewsElement extends LitElement {
 		} else {
 			delete this.drafts[id];
 		}
-		/* Only trigger a re-render if we're creating a new draft or discarding an old one. */
-		if ((previous !== undefined) != (event.detail.draft !== undefined)) {
 		this.drafts = Object.assign({}, this.drafts);
-		}
 		tfrpc.rpc.localStorageSet('drafts', JSON.stringify(this.drafts));
 	}
 
@@ -108,25 +109,157 @@ class TfTabNewsElement extends LitElement {
 		}
 	}
 
+	unread_status(channel) {
+		if (
+			this.channels_latest[channel] &&
+			(this.channels_unread[channel] === undefined ||
+				this.channels_unread[channel] <= this.channels_latest[channel])
+		) {
+			return '🔵';
+		}
+	}
+
+	show_sidebar() {
+		this.renderRoot.getElementById('sidebar').style.display = 'block';
+		this.renderRoot.getElementById('sidebar_overlay').style.display = 'block';
+	}
+
+	hide_sidebar() {
+		this.renderRoot.getElementById('sidebar').style.display = 'none';
+		this.renderRoot.getElementById('sidebar_overlay').style.display = 'none';
+	}
+
+	async channel_toggle_subscribed() {
+		let channel = this.hash.substring(2);
+		let subscribed = this.channels.indexOf(channel) != -1;
+		subscribed = !subscribed;
+
+		await tfrpc.rpc.appendMessage(this.whoami, {
+			type: 'channel',
+			channel: channel,
+			subscribed: subscribed,
+		});
+		if (subscribed) {
+			this.channels = [].concat([channel], this.channels).sort();
+		} else {
+			this.channels = this.channels.filter((x) => x != channel);
+		}
+	}
+
+	channel() {
+		return this.hash.startsWith('##') ? this.hash.substring(2) : undefined;
+	}
+
 	render() {
-		let profile = this.hash.startsWith('#@')
+		let profile =
+			this.hash.startsWith('#@') && this.hash != '#@'
 				? html`<tf-profile
+						class="tf-profile"
 						id=${this.hash.substring(1)}
 						whoami=${this.whoami}
 						.users=${this.users}
 					></tf-profile>`
 				: undefined;
-		return html`
-			<p class="w3-bar">
-				<button
-					class="w3-bar-item w3-button w3-dark-grey"
-					@click=${this.show_more}
+		let edit_profile;
+		if (
+			!this.loading &&
+			this.users[this.whoami]?.name === undefined &&
+			this.hash.substring(1) != this.whoami
+		) {
+			edit_profile = html` <div
+				class="w3-panel w3-padding w3-round w3-card-4 w3-theme-l3"
 			>
+				ℹ️ Follow your identity link ☝️ above to edit your profile and set your
+				name.
+			</div>`;
+		}
+		return html`
+			<div
+				class="w3-sidebar w3-bar-block w3-theme-d1 w3-collapse w3-animate-left"
+				style="width: 2in; left: 0; z-index: 5"
+				id="sidebar"
+			>
+				<div
+					class="w3-right w3-button w3-hide-large"
+					@click=${this.hide_sidebar}
+				>
+					&times;
+				</div>
+				${this.hash.startsWith('##') &&
+				this.channels.indexOf(this.hash.substring(2)) == -1
+					? html`
+							<div class="w3-bar-item w3-theme-d2">Viewing</div>
+							<a
+								href="#"
+								class="w3-bar-item w3-button"
+								style="font-weight: bold"
+								>${this.hash.substring(2)}</a
+							>
+						`
+					: undefined}
+				<div class="w3-bar-item w3-theme-d2">Channels</div>
+				<a
+					href="#"
+					class="w3-bar-item w3-button"
+					style=${this.hash == '#' ? 'font-weight: bold' : undefined}
+					>general ${this.unread_status('')}</a
+				>
+				<a
+					href="#@"
+					class="w3-bar-item w3-button"
+					style=${this.hash == '#@' ? 'font-weight: bold' : undefined}
+					>@mentions ${this.unread_status('@')}</a
+				>
+				<a
+					href="#🔐"
+					class="w3-bar-item w3-button"
+					style=${this.hash == '#🔐' ? 'font-weight: bold' : undefined}
+					>🔐private ${this.unread_status('🔐')}</a
+				>
+				${this.channels.map(
+					(x) => html`
+						<a
+							href=${'#' + encodeURIComponent('#' + x)}
+							class="w3-bar-item w3-button"
+							style=${this.hash == '##' + x ? 'font-weight: bold' : undefined}
+							>#${x} ${this.unread_status(x)}</a
+						>
+					`
+				)}
+			</div>
+			<div
+				class="w3-overlay"
+				id="sidebar_overlay"
+				@click=${this.hide_sidebar}
+			></div>
+			<div style="margin-left: 2in; padding: 8px" id="main" class="w3-main">
+				<div
+					id="show_sidebar"
+					class="w3-left w3-button w3-hide-large"
+					@click=${this.show_sidebar}
+				>
+					&#9776;
+				</div>
+				<p>
+					<button class="w3-button w3-theme-d1" @click=${this.show_more}>
 						${this.new_messages_text()}
 					</button>
+					${this.hash.startsWith('##')
+						? html`
+								<button
+									class="w3-button w3-theme-d1"
+									@click=${this.channel_toggle_subscribed}
+								>
+									${this.channels.indexOf(this.hash.substring(2)) != -1
+										? 'Unsubscribe from #'
+										: 'Subscribe to #'}${this.hash.substring(2)}
+								</button>
+							`
+						: undefined}
 				</p>
-			<div>
+				<div class="w3-bar">
 					Welcome, <tf-user id=${this.whoami} .users=${this.users}></tf-user>!
+					${edit_profile}
 				</div>
 				<div>
 					<tf-compose
@@ -135,6 +268,7 @@ class TfTabNewsElement extends LitElement {
 						.users=${this.users}
 						.drafts=${this.drafts}
 						@tf-draft=${this.draft}
+						.channel=${this.channel()}
 					></tf-compose>
 				</div>
 				${profile}
@@ -148,7 +282,10 @@ class TfTabNewsElement extends LitElement {
 					.expanded=${this.expanded}
 					@tf-draft=${this.draft}
 					@tf-expand=${this.on_expand}
+					.channels_unread=${this.channels_unread}
+					.channels_latest=${this.channels_latest}
 				></tf-tab-news-feed>
+			</div>
 		`;
 	}
 }

apps/ssb/tf-tab-query.js

@@ -110,14 +110,14 @@ class TfTabQueryElement extends LitElement {
 				<textarea
 					id="search"
 					rows="8"
-					class="w3-input w3-dark-grey"
+					class="w3-input w3-theme-d1"
 					style="flex: 1; resize: vertical"
 					@keydown=${this.search_keydown}
 				>
 ${this.query}</textarea
 				>
 				<button
-					class="w3-button w3-dark-grey"
+					class="w3-button w3-theme-d1"
 					@click=${(event) =>
 						self.search(self.renderRoot.getElementById('search').value)}
 				>

apps/ssb/tf-tab-search.js

@@ -5,6 +5,7 @@ import {styles} from './tf-styles.js';
 class TfTabSearchElement extends LitElement {
 	static get properties() {
 		return {
+			drafts: {type: Object},
 			whoami: {type: String},
 			users: {type: Object},
 			following: {type: Array},
@@ -22,6 +23,10 @@ class TfTabSearchElement extends LitElement {
 		this.users = {};
 		this.following = [];
 		this.expanded = {};
+		this.drafts = {};
+		tfrpc.rpc.localStorageGet('drafts').then(function (d) {
+			self.drafts = JSON.parse(d || '{}');
+		});
 	}
 
 	async search(query) {
@@ -70,6 +75,18 @@ class TfTabSearchElement extends LitElement {
 		}
 	}
 
+	draft(event) {
+		let id = event.detail.id || '';
+		let previous = this.drafts[id];
+		if (event.detail.draft !== undefined) {
+			this.drafts[id] = event.detail.draft;
+		} else {
+			delete this.drafts[id];
+		}
+		this.drafts = Object.assign({}, this.drafts);
+		tfrpc.rpc.localStorageSet('drafts', JSON.stringify(this.drafts));
+	}
+
 	render() {
 		if (this.query !== this.last_query) {
 			this.last_query = this.query;
@@ -78,10 +95,10 @@ class TfTabSearchElement extends LitElement {
 		let self = this;
 		return html`
 			<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>
+				<input type="text" class="w3-input w3-theme-d1" id="search" value=${this.query} style="flex: 1" @keydown=${this.search_keydown}></input>
+				<button class="w3-button w3-theme-d1" @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>
+			<tf-news id="news" whoami=${this.whoami} .messages=${this.messages} .users=${this.users} .expanded=${this.expanded} .drafts=${this.drafts} @tf-expand=${this.on_expand} @tf-draft=${this.draft}></tf-news>
 		`;
 	}
 }

apps/ssb/tf-tag.js

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

apps/ssb/tf-user.js

@@ -19,6 +19,11 @@ class TfUserElement extends LitElement {
 	}
 
 	render() {
+		let image = html`<span
+			class="w3-theme-light w3-circle"
+			style="display: inline-block; width: 2em; height: 2em; text-align: center; line-height: 2em"
+			>?</span
+		>`;
 		let name = this.users?.[this.id]?.name;
 		name =
 			name !== undefined
@@ -26,22 +31,21 @@ class TfUserElement extends LitElement {
 				: html`<a target="_top" href=${'#' + this.id}>${this.id}</a>`;
 
 		if (this.users[this.id]) {
-			let image = this.users[this.id].image;
-			image = typeof image == 'string' ? image : image?.link;
-			return html` <div style="display: inline-block; font-weight: bold">
-				<img
-					style="width: 2em; height: 2em; vertical-align: middle; border-radius: 50%"
-					?hidden=${image === undefined}
-					src="${image ? '/' + image + '/view' : undefined}"
-				/>
-				${name}
-			</div>`;
-		} else {
-			return html` <div style="display: inline-block; font-weight: bold">
-				${name}
-			</div>`;
+			let image_link = this.users[this.id].image;
+			image_link =
+				typeof image_link == 'string' ? image_link : image_link?.link;
+			if (image_link !== undefined) {
+				image = html`<img
+					class="w3-circle"
+					style="width: 2em; height: 2em; vertical-align: middle; object-fit: cover"
+					src="/${image_link}/view"
+				/>`;
 			}
 		}
+		return html` <div style="display: inline-block; font-weight: bold">
+			${image} ${name}
+		</div>`;
+	}
 }
 
 customElements.define('tf-user', TfUserElement);

apps/ssb/tf-utils.js

@@ -1,6 +1,13 @@
-import * as linkify from './commonmark-linkify.js';
 import * as hashtagify from './commonmark-hashtag.js';
 
+const k_code_classes = 'w3-theme-l4 w3-theme-border w3-round';
+
+var reUnsafeProtocol = /^javascript:|vbscript:|file:|data:/i;
+var reSafeDataProtocol = /^data:image\/(?:png|gif|jpeg|webp)/i;
+var potentiallyUnsafe = function (url) {
+	return reUnsafeProtocol.test(url) && !reSafeDataProtocol.test(url);
+};
+
 function image(node, entering) {
 	if (
 		node.firstChild?.type === 'text' &&
@@ -61,13 +68,32 @@ function image(node, entering) {
 	}
 }
 
+function code(node) {
+	let attrs = this.attrs(node);
+	attrs.push(['class', k_code_classes]);
+	this.tag('code', attrs);
+	this.out(node.literal);
+	this.tag('/code');
+}
+
+function attrs(node) {
+	let result = commonmark.HtmlRenderer.prototype.attrs.bind(this)(node);
+	if (node.type == 'block_quote') {
+		result.push(['class', 'w3-theme-d1']);
+	} else if (node.type == 'code_block') {
+		result.push(['class', k_code_classes]);
+	}
+	return result;
+}
+
 export function markdown(md) {
-	let reader = new commonmark.Parser({safe: true});
-	let writer = new commonmark.HtmlRenderer();
+	let reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	writer.image = image;
+	writer.code = code;
+	writer.attrs = attrs;
 	let parsed = reader.parse(md || '');
 	parsed = hashtagify.transform(parsed);
-	parsed = linkify.transform(parsed);
 	let walker = parsed.walker();
 	let event, node;
 	while ((event = walker.next())) {

apps/ssb/tribute.esm.js

@@ -482,16 +482,7 @@ class TributeRange {
     }
 
     getDocument() {
-        let iframe;
-        if (this.tribute.current.collection) {
-            iframe = this.tribute.current.collection.iframe;
-        }
-
-        if (!iframe) {
-            return document
-        }
-
-        return iframe.contentWindow.document
+        return document;
     }
 
     positionMenuAtCaret(scrollTo) {
@@ -653,8 +644,8 @@ class TributeRange {
     }
 
     getWindowSelection() {
-        if (this.tribute.collection.iframe) {
-            return this.tribute.collection.iframe.contentWindow.getSelection()
+        if (this.tribute.collection[0].iframe?.getSelection) {
+            return this.tribute.collection[0].iframe.getSelection()
         }
 
         return window.getSelection()

apps/storage.json

@@ -0,0 +1,5 @@
+{
+	"type": "tildefriends-app",
+	"emoji": "💾",
+	"previous": "&mvGTlWKFR5QM/3nb4fJ2WQq0n/gNKvBmhGDkAvb8ki8=.sha256"
+}

apps/storage/app.js

@@ -0,0 +1,127 @@
+async function query(sql, args) {
+	let rows = [];
+	await ssb.sqlAsync(sql, args ?? [], function (row) {
+		rows.push(row);
+	});
+	return rows;
+}
+
+async function get_biggest() {
+	return query(`
+		select author, sum(length(content)) as size from messages group by author order by size desc limit 10;
+	`);
+}
+
+async function get_total() {
+	return (
+		await query(`
+		select sum(length(content)) as size, count(distinct author) as count from messages;
+	`)
+	)[0];
+}
+
+async function get_names(identities) {
+	return query(
+		`
+		SELECT author, name FROM (
+			SELECT
+				messages.author,
+				RANK() OVER (PARTITION BY messages.author ORDER BY messages.sequence DESC) AS author_rank,
+				messages.content ->> 'name' AS name
+			FROM messages
+			JOIN json_each(?) AS identities ON identities.value = messages.author
+			WHERE
+				json_extract(messages.content, '$.type') = 'about' AND
+				content ->> 'about' = messages.author AND name IS NOT NULL)
+		WHERE author_rank = 1
+	`,
+		[JSON.stringify(identities)]
+	);
+}
+
+async function get_most_follows() {
+	return query(`
+		select author, count(*) as count
+		from messages
+		where content ->> 'type' = 'contact' and content ->> 'following' = true
+		group by author
+		order by count desc
+		limit 10;
+	`);
+}
+
+function nice_size(bytes) {
+	let value = bytes;
+	let index = 0;
+	let units = ['B', 'kB', 'MB', 'GB'];
+	while (value > 1024 && index < units.length - 1) {
+		value /= 1024;
+		index++;
+	}
+	return `${Math.round(value * 10) / 10} ${units[index]}`;
+}
+
+async function main() {
+	await app.setDocument(
+		'<p style="color: #fff">Finding the top 10 largest feeds...</p>'
+	);
+	let most_follows = await get_most_follows();
+	let total = await get_total();
+	let identities = await ssb.getAllIdentities();
+	let following1 = await ssb.following(identities, 1);
+	let following2 = await ssb.following(identities, 2);
+	let biggest = await get_biggest();
+	let names = await get_names(
+		[].concat(
+			biggest.map((x) => x.author),
+			most_follows.map((x) => x.author)
+		)
+	);
+	names = Object.fromEntries(names.map((x) => [x.author, x.name]));
+	for (let item of biggest) {
+		item.name = names[item.author];
+		item.following =
+			identities.indexOf(item.author) != -1
+				? 0
+				: following1[item.author] !== undefined
+					? 1
+					: following2[item.author] !== undefined
+						? 2
+						: undefined;
+	}
+	for (let item of most_follows) {
+		item.name = names[item.author];
+	}
+	let html = `<body style="color: #000; background-color: #ddd">\n
+		<h1>Storage Summary</h1>
+		<h2>Top 10 Accounts by Size</h2>
+		<ol>`;
+	for (let item of biggest) {
+		html += `<li>
+			<span style="color: #888">${nice_size(item.size)}</span>
+			<a target="_top" href="/~core/ssb/#${encodeURI(item.author)}">${item.name ?? item.author}</a>
+		</li>
+		\n`;
+	}
+	html += `
+		</ol>
+		<h2>Top 10 Accounts by Follows</h2>
+		<ol>`;
+	for (let item of most_follows) {
+		html += `<li>
+			<span style="color: #888">${item.count}</span>
+			${following2[item.author] ? '✅' : '🚫'}
+			<a target="_top" href="/~core/ssb/#${encodeURI(item.author)}">${item.name ?? item.author}</a>
+		</li>
+		\n`;
+	}
+	html += `
+		</ol>
+		<p>Total <span style="color: #888">${nice_size(total.size)}</span> in ${total.count} accounts.</p>
+	`;
+	await app.setDocument(html);
+}
+
+main().catch(function (e) {
+	print(e);
+});

apps/test.json

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

apps/test/app.js

@@ -0,0 +1,3 @@
+app.setDocument(
+	'<p style="color: #fff">Maybe one day this app will run tests, but for now there is nothing to see here.</p>'
+);

apps/test/hello.txt

@@ -0,0 +1 @@
+Hello, world!

apps/welcome.json

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

apps/welcome/appimage.svg

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48px" height="48px" id="svg3832" version="1.1" inkscape:version="0.47 r22583" sodipodi:docname="appimage-assistant_alt3.svg">
+  <defs id="defs3834">
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761-0" id="linearGradient2975" gradientUnits="userSpaceOnUse" x1="24.3125" y1="22.96875" x2="24.3125" y2="41.03125"/>
+    <linearGradient id="linearGradient3308-4-6-931-761-0">
+      <stop id="stop2919-2" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop2921-76" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4222" id="linearGradient2979" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,0.3704967,-0.3617496,0,33.508315,6.1670925)" x1="7.6485429" y1="26.437023" x2="41.861729" y2="26.437023"/>
+    <linearGradient id="linearGradient4222">
+      <stop id="stop4224" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop4226" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3308-4-6-931-761" id="linearGradient2982" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9999987)" x1="23.99999" y1="4.999989" x2="23.99999" y2="43"/>
+    <linearGradient id="linearGradient3308-4-6-931-761">
+      <stop id="stop2919" style="stop-color:#ffffff;stop-opacity:1" offset="0"/>
+      <stop id="stop2921" style="stop-color:#ffffff;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3575" id="radialGradient2985" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,1.0262008,-1.6561124,9.4072203e-4,-56.097482,-45.332325)" cx="48.42384" cy="-48.027504" fx="48.42384" fy="-48.027504" r="38.212933"/>
+    <linearGradient id="linearGradient3575">
+      <stop id="stop3577" style="stop-color:#fafafa;stop-opacity:1" offset="0"/>
+      <stop id="stop3579" style="stop-color:#e6e6e6;stop-opacity:1" offset="1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3993" id="radialGradient2990" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,2.0478765,-2.7410544,-8.6412258e-8,47.161382,-8.837436)" cx="9.3330879" cy="8.4497671" fx="9.3330879" fy="8.4497671" r="19.99999"/>
+    <linearGradient id="linearGradient3993">
+      <stop offset="0" style="stop-color:#a3c0d0;stop-opacity:1" id="stop3995"/>
+      <stop offset="1" style="stop-color:#427da1;stop-opacity:1" id="stop4001"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient2508" id="linearGradient2992" gradientUnits="userSpaceOnUse" gradientTransform="translate(0,0.9674382)" x1="14.048676" y1="44.137306" x2="14.048676" y2="4.0000005"/>
+    <linearGradient id="linearGradient2508">
+      <stop offset="0" style="stop-color:#2e4a5a;stop-opacity:1" id="stop2510"/>
+      <stop offset="1" style="stop-color:#6e8796;stop-opacity:1" id="stop2512"/>
+    </linearGradient>
+    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2873-966-168" xlink:href="#linearGradient3688-166-749" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"/>
+    <linearGradient id="linearGradient3688-166-749">
+      <stop id="stop2883" style="stop-color:#181818;stop-opacity:1" offset="0"/>
+      <stop id="stop2885" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <radialGradient cx="4.9929786" cy="43.5" r="2.5" fx="4.9929786" fy="43.5" id="radialGradient2875-742-326" xlink:href="#linearGradient3688-464-309" gradientUnits="userSpaceOnUse" gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"/>
+    <linearGradient id="linearGradient3688-464-309">
+      <stop id="stop2889" style="stop-color:#181818;stop-opacity:1" offset="0"/>
+      <stop id="stop2891" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+    <linearGradient x1="25.058096" y1="47.027729" x2="25.058096" y2="39.999443" id="linearGradient2877-634-617" xlink:href="#linearGradient3702-501-757" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3702-501-757">
+      <stop id="stop2895" style="stop-color:#181818;stop-opacity:0" offset="0"/>
+      <stop id="stop2897" style="stop-color:#181818;stop-opacity:1" offset="0.5"/>
+      <stop id="stop2899" style="stop-color:#181818;stop-opacity:0" offset="1"/>
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7" inkscape:cx="24" inkscape:cy="24" inkscape:current-layer="layer1" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="603" inkscape:window-height="484" inkscape:window-x="417" inkscape:window-y="162" inkscape:window-maximized="0"/>
+  <metadata id="metadata3837">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+    <g style="display:inline" id="g2036" transform="matrix(1.1,0,0,0.4444449,-2.4000022,25.11107)">
+      <g style="opacity:0.4" id="g3712" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
+        <rect style="fill:url(#radialGradient2873-966-168);fill-opacity:1;stroke:none" id="rect2801" y="40" x="38" height="7" width="5"/>
+        <rect style="fill:url(#radialGradient2875-742-326);fill-opacity:1;stroke:none" id="rect3696" transform="scale(-1,-1)" y="-47" x="-10" height="7" width="5"/>
+        <rect style="fill:url(#linearGradient2877-634-617);fill-opacity:1;stroke:none" id="rect3700" y="40" x="10" height="7.0000005" width="28"/>
+      </g>
+    </g>
+    <rect style="fill:url(#radialGradient2990);fill-opacity:1;stroke:url(#linearGradient2992);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect5505" y="5.4674392" x="4.5" ry="2.2322156" rx="2.2322156" height="39" width="39"/>
+    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294-1" d="m 21,6.9687498 a 2.0165107,2.0165107 0 0 0 -2.03125,2.03125 l 0,3.9687502 -1.15625,0 a 2.0165107,2.0165107 0 0 0 -1.5,3.375 l 5.0625,5.75 c -0.06312,0.110777 -0.178724,0.246032 -0.21875,0.34375 -0.195898,0.478256 -0.25,0.83653 -0.25,1.21875 l 0,0.125 L 20.8125,23.6875 C 20.534322,23.409323 20.213169,23.162739 19.71875,22.96875 19.47154,22.87176 19.185456,22.791748 18.75,22.8125 c -0.435456,0.02075 -1.054055,0.210302 -1.46875,0.625 L 15.75,24.96875 c -0.414689,0.414689 -0.604245,1.033294 -0.625,1.46875 -0.02075,0.435456 0.05925,0.721537 0.15625,0.96875 C 15.475241,27.900677 15.721817,28.221821 16,28.5 l 0.09375,0.09375 -0.125,0 c -0.382218,0 -0.740493,0.0541 -1.21875,0.25 -0.239128,0.09795 -0.538285,0.214988 -0.84375,0.53125 -0.305465,0.316262 -0.625,0.914788 -0.625,1.53125 l 0,2.1875 c 0,0.616465 0.319536,1.214989 0.625,1.53125 0.305464,0.316261 0.604622,0.433301 0.84375,0.53125 0.478256,0.195898 0.83653,0.25 1.21875,0.25 l 0.125,0 L 16,35.5 c -0.278175,0.278176 -0.52476,0.599329 -0.71875,1.09375 -0.09699,0.24721 -0.177003,0.533292 -0.15625,0.96875 0.02075,0.435458 0.210304,1.054058 0.625,1.46875 l 1.53125,1.53125 c 0.414691,0.414697 1.033292,0.604245 1.46875,0.625 0.435458,0.02076 0.721537,-0.05926 0.96875,-0.15625 0.494425,-0.19399 0.81557,-0.440568 1.09375,-0.71875 l 0.09375,-0.09375 0,0.125 c 0,0.38222 0.0541,0.740495 0.25,1.21875 0.09795,0.239127 0.214989,0.538285 0.53125,0.84375 0.316261,0.305465 0.914783,0.625 1.53125,0.625 l 2.1875,0 c 0.616466,0 1.214989,-0.319534 1.53125,-0.625 0.316261,-0.305466 0.433302,-0.604622 0.53125,-0.84375 0.195896,-0.478255 0.25,-0.836532 0.25,-1.21875 l 0,-0.125 0.09375,0.09375 c 0.278176,0.278175 0.599329,0.52476 1.09375,0.71875 0.24721,0.09699 0.533292,0.177003 0.96875,0.15625 0.435458,-0.02075 1.054058,-0.210304 1.46875,-0.625 L 32.875,39.03125 C 33.289697,38.616559 33.479245,37.997958 33.5,37.5625 33.52076,37.127042 33.44074,36.840963 33.34375,36.59375 33.14976,36.099325 32.903182,35.77818 32.625,35.5 l -0.09375,-0.09375 0.125,0 c 0.38222,0 0.740494,-0.0541 1.21875,-0.25 0.239128,-0.09795 0.538286,-0.214988 0.84375,-0.53125 0.305464,-0.316262 0.625,-0.914787 0.625,-1.53125 l 0,-2.1875 c 0,-0.61646 -0.319535,-1.214987 -0.625,-1.53125 -0.305465,-0.316263 -0.604621,-0.433301 -0.84375,-0.53125 -0.478257,-0.195898 -0.836532,-0.25 -1.21875,-0.25 l -0.125,0 L 32.625,28.5 c 0.278177,-0.278177 0.52476,-0.599329 0.71875,-1.09375 C 33.44074,27.15904 33.520753,26.872957 33.5,26.4375 33.47925,26.002043 33.289697,25.383443 32.875,24.96875 L 31.34375,23.4375 c -0.414688,-0.414694 -1.03329,-0.604245 -1.46875,-0.625 -0.43546,-0.02076 -0.721537,0.05925 -0.96875,0.15625 -0.494426,0.193991 -0.815572,0.44057 -1.09375,0.71875 l -0.09375,0.09375 0,-0.125 c 0,-0.382218 -0.0541,-0.740493 -0.25,-1.21875 -0.09112,-0.22245 -0.228127,-0.500183 -0.5,-0.78125 l 4.71875,-5.3125 a 2.0165107,2.0165107 0 0 0 -1.5,-3.375 l -1.15625,0 0,-3.9687502 A 2.0165107,2.0165107 0 0 0 27,6.9687498 l -6,0 z M 24.3125,31.25 c 0.427097,0 0.75,0.322904 0.75,0.75 0,0.427096 -0.322903,0.75 -0.75,0.75 -0.427094,0 -0.75,-0.322906 -0.75,-0.75 0,-0.427094 0.322906,-0.75 0.75,-0.75 z"/>
+    <path style="opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4294" d="m 20.90625,8.0312498 a 0.96385067,0.96385067 0 0 0 -0.875,0.96875 l 0,5.0312502 -2.21875,0 A 0.96385067,0.96385067 0 0 0 17.09375,15.625 l 5.78125,6.53125 c -0.158814,0.0616 -0.341836,0.0951 -0.4375,0.1875 -0.169161,0.163386 -0.252971,0.323419 -0.3125,0.46875 -0.119058,0.290663 -0.15625,0.566746 -0.15625,0.84375 l 0,1.65625 C 21.718163,25.40233 21.485871,25.509772 21.25,25.625 l -1.1875,-1.1875 c -0.199651,-0.19965 -0.421433,-0.352095 -0.71875,-0.46875 -0.148659,-0.05833 -0.329673,-0.104846 -0.5625,-0.09375 -0.232827,0.0111 -0.53583,0.09833 -0.75,0.3125 L 16.5,25.71875 c -0.214168,0.214168 -0.301403,0.517173 -0.3125,0.75 -0.0111,0.232827 0.03542,0.41384 0.09375,0.5625 0.116655,0.297321 0.269096,0.519099 0.46875,0.71875 l 1.1875,1.1875 c -0.115228,0.235871 -0.222668,0.468163 -0.3125,0.71875 l -1.65625,0 c -0.277003,0 -0.553087,0.03719 -0.84375,0.15625 -0.145332,0.05953 -0.305363,0.143338 -0.46875,0.3125 -0.163387,0.169162 -0.3125,0.46403 -0.3125,0.78125 l 0,2.1875 c 0,0.317221 0.149114,0.612089 0.3125,0.78125 0.163386,0.169161 0.323419,0.252971 0.46875,0.3125 0.290663,0.119058 0.566746,0.15625 0.84375,0.15625 l 1.65625,0 c 0.08983,0.250587 0.197272,0.482879 0.3125,0.71875 L 16.75,36.25 c -0.199649,0.19965 -0.352095,0.421432 -0.46875,0.71875 -0.05833,0.148659 -0.104846,0.329672 -0.09375,0.5625 0.0111,0.232828 0.09833,0.535831 0.3125,0.75 l 1.53125,1.53125 c 0.214168,0.214172 0.517172,0.301403 0.75,0.3125 0.232828,0.0111 0.41384,-0.03542 0.5625,-0.09375 0.29732,-0.116655 0.519098,-0.269096 0.71875,-0.46875 L 21.25,38.375 c 0.235871,0.115228 0.468164,0.222668 0.71875,0.3125 l 0,1.65625 c 0,0.277003 0.03719,0.553087 0.15625,0.84375 0.05953,0.145331 0.143339,0.305364 0.3125,0.46875 0.169161,0.163386 0.464028,0.3125 0.78125,0.3125 l 2.1875,0 c 0.317221,0 0.612089,-0.149113 0.78125,-0.3125 0.169161,-0.163387 0.252971,-0.323419 0.3125,-0.46875 0.119057,-0.290663 0.15625,-0.566748 0.15625,-0.84375 l 0,-1.65625 c 0.250586,-0.08983 0.482879,-0.197272 0.71875,-0.3125 l 1.1875,1.1875 c 0.19965,0.199649 0.421432,0.352095 0.71875,0.46875 0.148659,0.05833 0.329672,0.104846 0.5625,0.09375 0.232828,-0.0111 0.535831,-0.09833 0.75,-0.3125 L 32.125,38.28125 c 0.214172,-0.214168 0.301403,-0.517172 0.3125,-0.75 0.0111,-0.232828 -0.03542,-0.41384 -0.09375,-0.5625 C 32.227095,36.67143 32.074654,36.449652 31.875,36.25 L 30.6875,35.0625 C 30.802728,34.82663 30.910168,34.594337 31,34.34375 l 1.65625,0 c 0.277004,0 0.553087,-0.03719 0.84375,-0.15625 0.145332,-0.05953 0.305364,-0.143339 0.46875,-0.3125 0.163386,-0.169161 0.3125,-0.46403 0.3125,-0.78125 l 0,-2.1875 c 0,-0.317219 -0.149114,-0.612088 -0.3125,-0.78125 C 33.805364,29.955838 33.645332,29.872029 33.5,29.8125 33.209336,29.693442 32.933253,29.65625 32.65625,29.65625 l -1.65625,0 C 30.91017,29.405663 30.802728,29.17337 30.6875,28.9375 L 31.875,27.75 c 0.19965,-0.19965 0.352095,-0.421432 0.46875,-0.71875 0.05833,-0.148659 0.104846,-0.329672 0.09375,-0.5625 -0.0111,-0.232828 -0.09833,-0.535831 -0.3125,-0.75 L 30.59375,24.1875 c -0.214167,-0.21417 -0.517171,-0.301403 -0.75,-0.3125 -0.232829,-0.0111 -0.41384,0.03542 -0.5625,0.09375 -0.29732,0.116656 -0.519099,0.269097 -0.71875,0.46875 L 27.375,25.625 c -0.235871,-0.115228 -0.468163,-0.222668 -0.71875,-0.3125 l 0,-1.65625 c 0,-0.277003 -0.03719,-0.553087 -0.15625,-0.84375 -0.05953,-0.145332 -0.143338,-0.305363 -0.3125,-0.46875 -0.169162,-0.163387 -0.46403,-0.3125 -0.78125,-0.3125 l -0.15625,0 5.65625,-6.40625 A 0.96385067,0.96385067 0 0 0 30.1875,14.03125 l -2.21875,0 0,-5.0312502 A 0.96385067,0.96385067 0 0 0 27,8.0312498 l -6,0 a 0.96385067,0.96385067 0 0 0 -0.09375,0 z M 24.3125,30.1875 c 1.002113,0 1.8125,0.810388 1.8125,1.8125 0,1.002112 -0.810387,1.8125 -1.8125,1.8125 C 23.31039,33.8125 22.5,33.002111 22.5,32 c 0,-1.002111 0.81039,-1.8125 1.8125,-1.8125 z"/>
+    <path style="fill:url(#radialGradient2985);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00178742;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2317" d="M 21,8.9999996 21,15 17.8125,15 24,22 30.1875,15 27,15 l 0,-6.0000004 -6,0 z M 23.21875,23 c -0.172892,0 -0.28125,0.294922 -0.28125,0.65625 l 0,2.28125 C 22.24145,26.095996 21.585954,26.379869 21,26.75 l -1.625,-1.625 c -0.255498,-0.255497 -0.533998,-0.372253 -0.65625,-0.25 l -1.53125,1.53125 c -0.122254,0.122254 -0.0055,0.400753 0.25,0.65625 l 1.625,1.625 c -0.37013,0.585953 -0.654003,1.24145 -0.8125,1.9375 l -2.28125,0 c -0.361328,0 -0.65625,0.108357 -0.65625,0.28125 l 0,2.1875 c 0,0.172892 0.294922,0.28125 0.65625,0.28125 l 2.28125,0 c 0.158497,0.69605 0.44237,1.351546 0.8125,1.9375 l -1.625,1.625 c -0.255497,0.255498 -0.372254,0.533997 -0.25,0.65625 l 1.53125,1.53125 c 0.122252,0.122254 0.400752,0.0055 0.65625,-0.25 L 21,37.25 c 0.585954,0.37013 1.24145,0.654002 1.9375,0.8125 l 0,2.28125 C 22.9375,40.705077 23.045858,41 23.21875,41 l 2.1875,0 c 0.172893,0 0.28125,-0.294924 0.28125,-0.65625 l 0,-2.28125 c 0.69605,-0.158498 1.351546,-0.44237 1.9375,-0.8125 l 1.625,1.625 c 0.255498,0.255497 0.533997,0.372254 0.65625,0.25 l 1.53125,-1.53125 c 0.122254,-0.122252 0.0055,-0.400752 -0.25,-0.65625 l -1.625,-1.625 c 0.370129,-0.585954 0.654003,-1.24145 0.8125,-1.9375 l 2.28125,0 c 0.361329,0 0.65625,-0.108358 0.65625,-0.28125 l 0,-2.1875 c 0,-0.172893 -0.294921,-0.28125 -0.65625,-0.28125 l -2.28125,0 c -0.158497,-0.69605 -0.442371,-1.351547 -0.8125,-1.9375 l 1.625,-1.625 c 0.255497,-0.255497 0.372254,-0.533997 0.25,-0.65625 L 29.90625,24.875 C 29.783997,24.752745 29.505498,24.8695 29.25,25.125 l -1.625,1.625 c -0.585954,-0.370131 -1.24145,-0.654004 -1.9375,-0.8125 l 0,-2.28125 C 25.6875,23.294922 25.579143,23 25.40625,23 l -2.1875,0 z m 1.09375,6.21875 c 1.528616,0 2.78125,1.252635 2.78125,2.78125 0,1.528615 -1.252634,2.78125 -2.78125,2.78125 -1.528614,0 -2.78125,-1.252635 -2.78125,-2.78125 0,-1.528615 1.252636,-2.78125 2.78125,-2.78125 z"/>
+    <rect style="opacity:0.4;fill:none;stroke:url(#linearGradient2982);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect6741" y="6.4999886" x="5.4999981" ry="1.365193" rx="1.365193" height="37.000011" width="36.999985"/>
+    <path style="fill:none;stroke:url(#linearGradient2979);stroke-width:0.99829447;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" id="path2777" d="M 28.926376,15.466668 24,21.177578 18.963089,15.5 21.5,15.5 l 0,-6.0000004 5,0 0,6.0000004 2.426376,-0.03333 z"/>
+    <path style="fill:none;stroke:url(#linearGradient2975);stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path4243" d="m 23.4375,23.46875 c -0.01166,0.05381 -0.03125,0.100205 -0.03125,0.1875 l 0,2.28125 a 0.48185467,0.48185467 0 0 1 -0.375,0.46875 c -0.638467,0.145384 -1.238423,0.407111 -1.78125,0.75 a 0.48185467,0.48185467 0 0 1 -0.59375,-0.0625 l -1.625,-1.625 C 18.9779,25.4154 18.9477,25.40242 18.90625,25.375 l -1.21875,1.21875 c 0.02742,0.04145 0.0404,0.07165 0.09375,0.125 l 1.625,1.625 a 0.48185467,0.48185467 0 0 1 0.0625,0.59375 c -0.342888,0.542826 -0.604615,1.142782 -0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.46875,0.375 l -2.28125,0 c -0.08729,0 -0.133695,0.01959 -0.1875,0.03125 l 0,1.75 c 0.05381,0.01166 0.100205,0.03125 0.1875,0.03125 l 2.28125,0 a 0.48185467,0.48185467 0 0 1 0.46875,0.375 c 0.145385,0.638468 0.407112,1.238423 0.75,1.78125 a 0.48185467,0.48185467 0 0 1 -0.0625,0.59375 l -1.625,1.625 c -0.05335,0.05335 -0.06633,0.08355 -0.09375,0.125 l 1.21875,1.21875 c 0.04145,-0.02742 0.07165,-0.0404 0.125,-0.09375 l 1.625,-1.625 A 0.48185467,0.48185467 0 0 1 21.25,36.84375 c 0.542827,0.342888 1.142781,0.604614 1.78125,0.75 a 0.48185467,0.48185467 0 0 1 0.375,0.46875 l 0,2.28125 c 0,0.08729 0.01959,0.133695 0.03125,0.1875 l 1.75,0 c 0.01166,-0.0538 0.03125,-0.100206 0.03125,-0.1875 l 0,-2.28125 a 0.48185467,0.48185467 0 0 1 0.375,-0.46875 c 0.638469,-0.145386 1.238423,-0.407112 1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 0.59375,0.0625 l 1.625,1.625 c 0.05335,0.05335 0.08355,0.06633 0.125,0.09375 l 1.21875,-1.21875 c -0.02742,-0.04145 -0.0404,-0.07165 -0.09375,-0.125 l -1.625,-1.625 a 0.48185467,0.48185467 0 0 1 -0.0625,-0.59375 c 0.342888,-0.542828 0.604615,-1.142783 0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.46875,-0.375 l 2.28125,0 c 0.08729,0 0.133695,-0.01959 0.1875,-0.03125 l 0,-1.75 c -0.0538,-0.01166 -0.100204,-0.03125 -0.1875,-0.03125 l -2.28125,0 a 0.48185467,0.48185467 0 0 1 -0.46875,-0.375 c -0.145385,-0.638467 -0.407113,-1.238424 -0.75,-1.78125 a 0.48185467,0.48185467 0 0 1 0.0625,-0.59375 l 1.625,-1.625 c 0.05335,-0.05335 0.06633,-0.08355 0.09375,-0.125 L 29.71875,25.375 c -0.04145,0.02742 -0.07165,0.0404 -0.125,0.09375 l -1.625,1.625 a 0.48185467,0.48185467 0 0 1 -0.59375,0.0625 c -0.542827,-0.342889 -1.142783,-0.604616 -1.78125,-0.75 a 0.48185467,0.48185467 0 0 1 -0.375,-0.46875 l 0,-2.28125 c 0,-0.0873 -0.01959,-0.133695 -0.03125,-0.1875 l -1.75,0 z m 0.875,5.28125 c 1.791829,0 3.25,1.458172 3.25,3.25 0,1.791828 -1.458171,3.25 -3.25,3.25 -1.791827,0 -3.25,-1.458172 -3.25,-3.25 0,-1.791828 1.458173,-3.25 3.25,-3.25 z"/>
+  </g>
+</svg>

apps/welcome/f-droid.svg

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="48" height="48" viewBox="0 0 48.000001 48.000001" id="svg4230" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="fdroid-logo.svg">
+  <defs id="defs4232">
+    <linearGradient inkscape:collect="always" id="linearGradient5212">
+      <stop style="stop-color:#ffffff;stop-opacity:0.09803922" offset="0" id="stop5214"/>
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop5216"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient5212" id="radialGradient5220" cx="-98.23381" cy="3.4695871" fx="-98.23381" fy="3.4695871" r="22.671185" gradientTransform="matrix(0,1.9747624,-2.117225,3.9784049e-8,8.677247,1199.588)" gradientUnits="userSpaceOnUse"/>
+    <filter inkscape:collect="always" style="color-interpolation-filters:sRGB" id="filter4175" x="-0.023846937" width="1.0476939" y="-0.02415504" height="1.0483101">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.45053152" id="feGaussianBlur4177"/>
+    </filter>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="11.313708" inkscape:cx="6.4184057" inkscape:cy="25.737489" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" inkscape:window-width="1920" inkscape:window-height="1009" inkscape:window-x="0" inkscape:window-y="34" inkscape:window-maximized="1" gridtolerance="10000"/>
+  <metadata id="metadata4235">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/"/>
+      </cc:Work>
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution"/>
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/>
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/>
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(0,-1004.3622)">
+    <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.4;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4175);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.613462,1006.3488 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" id="path4192" inkscape:connector-curvature="0"/>
+    <g id="g5012">
+      <g id="g4179" transform="matrix(-1,0,0,1,47.999779,0)">
+        <path style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 2.5889342,1006.8622 4.25,5.5" id="path4181" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+        <path sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" id="path4183" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+        <path sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path4185" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+        <path sodipodi:nodetypes="cscccc" inkscape:connector-curvature="0" id="path4187" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+      </g>
+      <g id="g4955">
+        <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4945" d="m 2.5889342,1006.8622 4.25,5.5" style="fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:#769616;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:0.29803923;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.6113281,1005.6094 c -0.4534623,0.012 -0.7616975,0.189 -0.9807462,0.4486 2.0269314,2.4089 2.368401,2.7916 5.1354735,6.2214 1.0195329,1.319 2.0816026,0.6373 1.0620696,-0.6817 l -4.25,-5.5 c -0.2289894,-0.3056 -0.5850813,-0.478 -0.9667969,-0.4883 z" id="path4947" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#263238;fill-opacity:0.2;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 1.6220992,1006.0705 c -0.1238933,0.1479 -0.561176,0.8046 -0.02249,1.5562 l 4.25,5.5 c 1.0195329,1.319 1.1498748,-0.6123 1.1498748,-0.6123 0,0 -3.7344514,-4.51 -5.3773848,-6.4439 z" id="path4951" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#8ab000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 2.3378905,1005.8443 c -0.438175,0 -0.959862,0.1416 -0.8242183,0.7986 0.103561,0.5016 4.6608262,6.0744 4.6608262,6.0744 1.0195329,1.319 2.4934721,0.6763 1.4739391,-0.6425 l -4.234375,-5.4727 c -0.2602394,-0.29 -0.6085188,-0.7436 -1.076172,-0.7578 z" id="path4925" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccc"/>
+      </g>
+      <g transform="translate(42,0)" id="g4967">
+        <rect style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4144" width="38" height="13" x="-37" y="1010.3622" rx="3" ry="3"/>
+        <rect ry="3" rx="3" y="1013.3622" x="-37" height="10" width="38" id="rect4961" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="3" rx="3" y="1010.3622" x="-37" height="10" width="38" id="rect4963" style="opacity:1;fill:#ffffff;fill-opacity:0.29803923;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="2.5384617" rx="3" y="1011.3622" x="-37" height="11" width="38" id="rect4965" style="opacity:1;fill:#aeea00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+      </g>
+      <g id="g4979">
+        <rect style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4146" width="38" height="26" x="5" y="1024.3622" rx="3" ry="3"/>
+        <rect ry="3" rx="3" y="1037.3622" x="5" height="13" width="38" id="rect4973" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="3" rx="3" y="1024.3622" x="5" height="13" width="38" id="rect4975" style="opacity:1;fill:#ffffff;fill-opacity:0.2;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+        <rect ry="2.7692308" rx="3" y="1025.3622" x="5" height="24" width="38" id="rect4977" style="opacity:1;fill:#1976d2;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"/>
+      </g>
+      <g transform="translate(0,1013.3622)" id="g4211">
+        <path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#0d47a1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 24,17.75 c -2.880662,0 -5.319789,1.984685 -6.033203,4.650391 l 3.212891,0 C 21.734004,21.415044 22.774798,20.75 24,20.75 c 1.812692,0 3.25,1.437308 3.25,3.25 0,1.812693 -1.437308,3.25 -3.25,3.25 -1.307381,0 -2.411251,-0.75269 -2.929688,-1.849609 l -3.154296,0 C 18.558263,28.166146 21.04791,30.25 24,30.25 c 3.434013,0 6.25,-2.815987 6.25,-6.25 0,-3.434012 -2.815987,-6.25 -6.25,-6.25 z" id="path4161" inkscape:connector-curvature="0"/>
+        <circle style="opacity:1;fill:none;fill-opacity:0.40392157;stroke:#0d47a1;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4209" cx="24" cy="24" r="9.5500002"/>
+      </g>
+      <g id="g4989" transform="translate(0,0.50001738)">
+        <ellipse cy="1016.4872" cx="14.375" id="circle4985" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" rx="3.375" ry="3.875"/>
+        <circle style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="path4859" cx="14.375" cy="1016.9872" r="3.375"/>
+      </g>
+      <g transform="translate(19.5,0.50001738)" id="g4171">
+        <ellipse ry="3.875" rx="3.375" style="opacity:1;fill:#263238;fill-opacity:0.2;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117" id="ellipse4175" cx="14.375" cy="1016.4872"/>
+        <circle r="3.375" cy="1016.9872" cx="14.375" id="circle4177" style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.69721117"/>
+      </g>
+    </g>
+    <path inkscape:connector-curvature="0" id="path5128" d="m 2.613462,1005.5987 a 1.250125,1.250125 0 0 0 -1.01172,2.0293 l 3.60351,4.6641 c -0.12699,0.3331 -0.20312,0.6915 -0.20312,1.0703 l 0,4 0,2.8652 0,0.1348 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-4 0,-2.8652 0,-0.1348 c 0,-0.3803 -0.0771,-0.74 -0.20508,-1.0742 l 3.60156,-4.6602 a 1.250125,1.250125 0 0 0 -1.04882,-2.0273 1.250125,1.250125 0 0 0 -0.92969,0.498 l -3.43164,4.4414 c -0.31022,-0.1079 -0.63841,-0.1777 -0.98633,-0.1777 l -32,0 c -0.34857,0 -0.67757,0.069 -0.98828,0.1777 l -3.4336,-4.4414 a 1.250125,1.250125 0 0 0 -0.96679,-0.5 z m 5.38867,18.7637 c -0.20775,0 -0.40983,0.021 -0.60547,0.061 -1.36951,0.2761 -2.39453,1.4698 -2.39453,2.9101 l 0,0.029 0,19.7793 0,0.029 0,0.1914 c 0,1.662 1.338,3 3,3 l 32,0 c 1.662,0 3,-1.338 3,-3 l 0,-20 0,-0.029 c 0,-1.4403 -1.02502,-2.634 -2.39453,-2.9101 -0.19565,-0.039 -0.39772,-0.061 -0.60547,-0.061 l -32,0 z" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#radialGradient5220);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"/>
+  </g>
+</svg>

apps/welcome/googleplay.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 511.999 511.999" xml:space="preserve">
+<g>
+	<path style="fill:#32BBFF;" d="M382.369,175.623C322.891,142.356,227.427,88.937,79.355,6.028
+		C69.372-0.565,57.886-1.429,47.962,1.93l254.05,254.05L382.369,175.623z"/>
+	<path style="fill:#32BBFF;" d="M47.962,1.93c-1.86,0.63-3.67,1.39-5.401,2.308C31.602,10.166,23.549,21.573,23.549,36v439.96
+		c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314L302.012,255.98L47.962,1.93z"/>
+	<path style="fill:#32BBFF;" d="M302.012,255.98L47.956,510.035c9.927,3.384,21.413,2.586,31.399-4.103
+		c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L302.012,255.98z"/>
+</g>
+<path style="fill:#2C9FD9;" d="M23.549,255.98v219.98c0,14.427,8.052,25.834,19.012,31.761c1.728,0.917,3.537,1.68,5.395,2.314
+	L302.012,255.98H23.549z"/>
+<path style="fill:#29CC5E;" d="M79.355,6.028C67.5-1.8,53.52-1.577,42.561,4.239l255.595,255.596l84.212-84.212
+	C322.891,142.356,227.427,88.937,79.355,6.028z"/>
+<path style="fill:#D93F21;" d="M298.158,252.126L42.561,507.721c10.96,5.815,24.939,6.151,36.794-1.789
+	c143.598-80.41,237.986-133.196,298.152-166.746c1.675-0.941,3.316-1.861,4.938-2.772L298.158,252.126z"/>
+<path style="fill:#FFD500;" d="M488.45,255.98c0-12.19-6.151-24.492-18.342-31.314c0,0-22.799-12.721-92.682-51.809l-83.123,83.123
+	l83.204,83.205c69.116-38.807,92.6-51.892,92.6-51.892C482.299,280.472,488.45,268.17,488.45,255.98z"/>
+<path style="fill:#FFAA00;" d="M470.108,287.294c12.191-6.822,18.342-19.124,18.342-31.314H294.303l83.204,83.205
+	C446.624,300.379,470.108,287.294,470.108,287.294z"/>
+</svg>

apps/welcome/index.html

@@ -55,7 +55,7 @@
 					</p>
 					<a
 						class="w3-button w3-black w3-padding-large"
-						href="https://www.tildefriends.net/~cory/releases/"
+						href="https://dev.tildefriends.net/cory/tildefriends/releases"
 						><i class="fa fa-download"></i> Download</a
 					>
 					<a
@@ -63,6 +63,33 @@
 						href="https://www.tildefriends.net/~cory/apps/"
 						><i class="fa fa-link"></i> Try It</a
 					>
+					<a
+						class="w3-button w3-black w3-padding-large"
+						href="https://dev.tildefriends.net/"
+						><i class="fa fa-mug-hot"></i> Development</a
+					>
+					<p>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://f-droid.org/en/packages/com.unprompted.tildefriends.fdroid/"
+							><img src="f-droid.svg" style="height: 2em; margin: 0" /> Get it
+							on F-Droid</a
+						>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://dev.tildefriends.net/releases/tildefriends-x86_64.AppImage"
+						>
+							<img src="appimage.svg" style="height: 2em; margin: 0" />
+							Get Linux 64-bit AppImage
+						</a>
+						<a
+							class="w3-button w3-round-large w3-padding w3-blue-gray w3-margin-top"
+							href="https://play.google.com/store/apps/details?id=com.unprompted.tildefriends"
+						>
+							<img src="googleplay.svg" style="height: 2em; margin: 0" />
+							Get it on Google Play (Open Testing)
+						</a>
+					</p>
 				</div>
 				<div class="w3-col l4 m6">
 					<img src="tildefriends.png" class="w3-image w3-right w3-hide-small" />
@@ -70,6 +97,55 @@
 			</div>
 		</div>
 
+		<!-- Getting Starting Section -->
+		<div class="w3-indigo w3-center">
+			<div class="w3-row-padding w3-padding-64">
+				<div class="w3-jumbo">
+					<i class="fa fa-rocket"></i> <b>Getting Started</b>
+				</div>
+				<div>
+					<h2>First-time user checklist:</h2>
+					<ol type="1" style="text-align: left">
+						<li>
+							<a href="https://dev.tildefriends.net/cory/tildefriends/releases"
+								>Download</a
+							>
+							Tilde Friends or use
+							<a href="https://www.tildefriends.net/"
+								>https://www.tildefriends.net/</a
+							>.
+						</li>
+						<li>Create an account to identify yourself with that instance.</li>
+						<li>
+							Describe yourself in your profile in the <b>ssb</b> app. Give
+							yourself a name and an avatar if you like.
+						</li>
+						<li>
+							Connect to others.
+							<ul>
+								<li>Automatically discover peers on the same network.</li>
+								<li>
+									Manually connect to rooms and pubs, including
+									<a href="https://www.tildefriends.net/~cory/room/"
+										>tildefriends.net itself</a
+									>.
+								</li>
+								<li>
+									Enable <b>Peer Exchange</b> in the <b>admin</b> to discover
+									internet peers.
+								</li>
+							</ul>
+						</li>
+						<li>Follow people to grow your network.</li>
+						<li>
+							Use the <b>edit</b> link at the top of any page to start modifying
+							and making apps.
+						</li>
+					</ol>
+				</div>
+			</div>
+		</div>
+
 		<!-- SSB Section -->
 		<div class="w3-light-grey">
 			<div class="w3-row-padding w3-padding-64">
@@ -147,8 +223,13 @@
 
 		<!-- Technlology Section -->
 		<div class="w3-container w3-padding-64 w3-light-grey w3-center">
-			<h1 class="w3-jumbo"><b>Trusted Technology</b></h1>
-			<p>Tilde Friends is built using boring, trusted tech.</p>
+			<h1 class="w3-jumbo"><b>Boring Technology</b></h1>
+			<p>
+				Tilde Friends is built using boring, trusted tech. Unless a better
+				reason presents itself, it strives to use only simple and widely adopted
+				dependencies in order to keep it easy to build for all sorts of
+				platforms and maintainable for a very long time.
+			</p>
 			<p>
 				Though of course for building Tilde Friends apps, you are free to use
 				whatever fits.
@@ -185,7 +266,7 @@
 					<i class="fa fa-lock w3-text-purple w3-jumbo"></i>
 					<p>libsodium</p>
 				</a>
-				<a href="https://www.openssl.org/" class="w3-col s3">
+				<a href="https://github.com/openssl/openssl/releases" class="w3-col s3">
 					<i class="fa fa-shield-halved w3-text-green w3-jumbo"></i>
 					<p>OpenSSL</p>
 				</a>
@@ -199,7 +280,7 @@
 			</div>
 
 			<div class="w3-row" style="margin-top: 64px">
-				<a href="https://codemirror.net/5/" class="w3-col s3">
+				<a href="https://codemirror.net/docs/changelog/" class="w3-col s3">
 					<i class="fa fa-keyboard w3-text-indigo w3-jumbo"></i>
 					<p>CodeMirror</p>
 				</a>
@@ -211,6 +292,13 @@
 					<i class="fa fa-fire w3-text-cyan w3-jumbo"></i>
 					<p>Lit</p>
 				</a>
+				<a href="https://github.com/c-ares/c-ares" class="w3-col s3">
+					<i class="fa fa-book-atlas w3-text-purple w3-jumbo"></i>
+					<p>c-ares</p>
+				</a>
+			</div>
+
+			<div class="w3-row" style="margin-top: 64px">
 				<a href="https://www.gnu.org/software/make/" class="w3-col s3">
 					<i class="fa fa-hammer w3-text-teal w3-jumbo"></i>
 					<p>GNU Make</p>

apps/wiki.json

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

apps/wiki/app.js

@@ -4,6 +4,9 @@ import * as utils from './utils.js';
 let g_hash;
 let g_collection_notifies = {};
 
+tfrpc.register(async function getActiveIdentity() {
+	return ssb.getActiveIdentity();
+});
 tfrpc.register(async function getOwnerIdentities() {
 	return ssb.getOwnerIdentities();
 });
@@ -54,6 +57,9 @@ core.register('message', async function message_handler(message) {
 		await tfrpc.rpc.hash_changed(message.hash);
 	}
 });
+core.register('setActiveIdentity', async function setActiveIdentityHandler(id) {
+	await tfrpc.rpc.setActiveIdentity(id);
+});
 
 tfrpc.register(function set_hash(hash) {
 	if (g_hash != hash) {

apps/wiki/handler.js

@@ -2,8 +2,8 @@ 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 reader = new commonmark.Parser();
+	let writer = new commonmark.HtmlRenderer({safe: true});
 	let parsed = reader.parse(md || '');
 	let walker = parsed.walker();
 	let event;

apps/wiki/index.html

@@ -10,7 +10,6 @@
 			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>

apps/wiki/tf-id-picker.js

@@ -1,44 +0,0 @@
-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`
-			<link rel="stylesheet" href="tildefriends.css" />
-			<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

@@ -31,13 +31,16 @@ class TfCollectionsAppElement extends LitElement {
 		tfrpc.register(function hash_changed(hash) {
 			self.notify_hash_changed(hash);
 		});
+		tfrpc.register(function setActiveIdentity(id) {
+			self.whoami = id;
+		});
 		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');
+		this.whoami = await tfrpc.rpc.getActiveIdentity();
 		let ids = [...new Set([...this.owner_ids, this.whoami])].sort();
 		this.following = Object.keys(await tfrpc.rpc.following(ids, 1)).sort();
 
@@ -273,9 +276,6 @@ class TfCollectionsAppElement extends LitElement {
 					margin-right: 16px;
 				}
 			</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,

apps/wiki/tf-wiki-doc.js

@@ -20,8 +20,8 @@ class TfWikiDocElement extends LitElement {
 	}
 
 	markdown(md) {
-		let reader = new commonmark.Parser({safe: true});
-		let writer = new commonmark.HtmlRenderer();
+		let reader = new commonmark.Parser();
+		let writer = new commonmark.HtmlRenderer({safe: true});
 		let parsed = reader.parse(md || '');
 		let walker = parsed.walker();
 		let event;

apps/wiki/utils.js

@@ -50,7 +50,7 @@ function new_message() {
 	return g_new_message_promise;
 }
 
-ssb.addEventListener('message', function (id) {
+core.register('onMessage', function (id) {
 	let resolve = g_new_message_resolve;
 	g_new_message_promise = new Promise(function (resolve, reject) {
 		g_new_message_resolve = resolve;
@@ -96,7 +96,7 @@ export async function collection(
 		let rows = [];
 		await ssb.sqlAsync(
 			`
-				SELECT messages.id, author, content, timestamp
+				SELECT messages.id, author, json(content) AS content, timestamp
 				FROM messages
 				JOIN json_each(?1) AS id ON messages.author = id.value
 				WHERE

core/app.js

@@ -1,4 +1,3 @@
-import * as auth from './auth.js';
 import * as core from './core.js';
 
 let g_next_id = 1;
@@ -11,7 +10,7 @@ let gSessionIndex = 0;
  * @returns
  */
 function makeSessionId() {
-	return (gSessionIndex++).toString();
+	return 'session_' + (gSessionIndex++).toString();
 }
 
 /**
@@ -84,11 +83,10 @@ App.prototype.send = function (message) {
  * @param {*} response
  * @param {*} client
  */
-function socket(request, response, client) {
+async function socket(request, response, client) {
 	let process;
 	let options = {};
-	let credentials = auth.query(request.headers);
-	let refresh = auth.makeRefresh(credentials);
+	let credentials = await httpd.auth_query(request.headers);
 
 	response.onClose = async function () {
 		if (process && process.task) {
@@ -143,12 +141,21 @@ function socket(request, response, client) {
 					}
 				}
 				response.send(
-					JSON.stringify({
+					JSON.stringify(
+						Object.assign(
+							{
 								action: 'session',
 								credentials: credentials,
 								parentApp: parentApp,
 								id: blobId,
-					}),
+							},
+							await ssb.getIdentityInfo(
+								credentials?.session?.name,
+								packageOwner,
+								packageName
+							)
+						)
+					),
 					0x1
 				);
 
@@ -165,11 +172,7 @@ function socket(request, response, client) {
 							0x1
 						);
 					} else {
-						process = await core.getSessionProcessBlob(
-							blobId,
-							sessionId,
-							options
-						);
+						process = await core.getProcessBlob(blobId, sessionId, options);
 					}
 				}
 				if (process) {
@@ -204,14 +207,14 @@ function socket(request, response, client) {
 				if (process && process.timeout > 0) {
 					setTimeout(ping, process.timeout);
 				}
-			} else if (message.action == 'enableStats') {
-				if (process) {
-					core.enableStats(process, message.enabled);
-				}
 			} else if (message.action == 'resetPermission') {
 				if (process) {
 					process.resetPermission(message.permission);
 				}
+			} else if (message.action == 'setActiveIdentity') {
+				process.setActiveIdentity(message.identity);
+			} else if (message.action == 'createIdentity') {
+				await process.createIdentity();
 			} else if (message.message == 'tfrpc') {
 				if (message.id && g_calls[message.id]) {
 					if (message.error !== undefined) {
@@ -241,14 +244,7 @@ function socket(request, response, client) {
 		}
 	};
 
-	response.upgrade(
-		100,
-		refresh
-			? {
-					'Set-Cookie': `session=${refresh.token}; path=/; Max-Age=${refresh.interval}; Secure; SameSite=Strict`,
-				}
-			: {}
-	);
+	response.upgrade(100, {});
 }
 
 export {socket, App};

core/auth.html

@@ -3,7 +3,7 @@
 	<head>
 		<title>Tilde Friends Sign-in</title>
 		<link type="text/css" rel="stylesheet" href="/static/style.css" />
-		<link type="image/png" rel="shortcut icon" href="/static/favicon.png" />
+		<link type="image/svg+xml" rel="icon" href="/static/tildefriends.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 	</head>
 	<body>
@@ -19,8 +19,11 @@
 			Object.assign(app, g_data);
 
 			class TfAuthElement extends LitElement {
-				static get_properties() {
+				static get properties() {
 					return {
+						code_of_conduct: {type: String},
+						error: {type: String},
+						have_administrator: {type: Boolean},
 						name: {type: String},
 						tab: {type: String},
 					};
@@ -31,11 +34,6 @@
 					this.tab = 'login';
 				}
 
-				tab_changed(name) {
-					this.tab = name;
-					this.requestUpdate();
-				}
-
 				render() {
 					let self = this;
 					return html`
@@ -83,16 +81,16 @@
 							<h1 ?hidden=${this.name === undefined}>Welcome, ${this.name}.</h1>
 
 							<div style="display: flex; flex-direction: row; width: 100%">
-								<input type="radio" name="tab" id="login" value="Login" ?checked=${this.tab == 'login'} @change=${() => self.tab_changed('login')}></input>
+								<input type="radio" name="tab" id="login" value="Login" ?checked=${this.tab == 'login'} @change=${() => (self.tab = 'login')}></input>
 								<label for="login" id="login_label">Login</label>
 
-								<input type="radio" name="tab" id="register" value="Register" ?checked=${this.tab == 'register'} @change=${() => self.tab_changed('register')}></input>
+								<input type="radio" name="tab" id="register" value="Register" ?checked=${this.tab == 'register'} @change=${() => (self.tab = 'register')}></input>
 								<label for="register" id="register_label">Register</label>
 
-								<input type="radio" name="tab" id="guest" value="Guest" ?checked=${this.tab == 'guest'} @change=${() => self.tab_changed('guest')}></input>
+								<input type="radio" name="tab" id="guest" value="Guest" ?checked=${this.tab == 'guest'} @change=${() => (self.tab = 'guest')}></input>
 								<label for="guest" id="guest_label">Guest</label>
 
-								<input type="radio" name="tab" id="change" value="Change Password" ?checked=${this.tab == 'change'} @change=${() => self.tab_changed('change')}></input>
+								<input type="radio" name="tab" id="change" value="Change Password" ?checked=${this.tab == 'change'} @change=${() => (self.tab = 'change')}></input>
 								<label for="change" id="change_label">Change Password</label>
 							</div>
 

core/auth.js

@@ -1,420 +0,0 @@
-import * as core from './core.js';
-import * as form from './form.js';
-
-let gDatabase = new Database('auth');
-
-const kRefreshInterval = 1 * 7 * 24 * 60 * 60 * 1000;
-
-/**
- * Makes a Base64 value URL safe
- * @param {string} value
- * @returns TODOC
- */
-function b64url(value) {
-	value = value.replaceAll('+', '-').replaceAll('/', '_');
-	let equals = value.indexOf('=');
-
-	if (equals !== -1) {
-		return value.substring(0, equals);
-	} else {
-		return value;
-	}
-}
-
-/**
- * TODOC
- * @param {string} value
- * @returns
- */
-function unb64url(value) {
-	value = value.replaceAll('-', '+').replaceAll('_', '/');
-	let remainder = value.length % 4;
-
-	if (remainder == 3) {
-		return value + '=';
-	} else if (remainder == 2) {
-		return value + '==';
-	} else {
-		return value;
-	}
-}
-
-/**
- * Creates a JSON Web Token
- * @param {object} payload Object: {"name": "username"}
- * @returns the JWT
- */
-function makeJwt(payload) {
-	const ids = ssb.getIdentities(':auth');
-	let id;
-
-	if (ids?.length) {
-		id = ids[0];
-	} else {
-		id = ssb.createIdentity(':auth');
-	}
-
-	const final_payload = b64url(
-		base64Encode(
-			JSON.stringify(
-				Object.assign({}, payload, {
-					exp: new Date().valueOf() + kRefreshInterval,
-				})
-			)
-		)
-	);
-	const jwt = [
-		b64url(base64Encode(JSON.stringify({alg: 'HS256', typ: 'JWT'}))),
-		final_payload,
-		b64url(ssb.hmacsha256sign(final_payload, ':auth', id)),
-	].join('.');
-	return jwt;
-}
-
-/**
- * Validates a JWT ?
- * @param {*} session TODOC
- * @returns
- */
-function readSession(session) {
-	let jwt_parts = session?.split('.');
-
-	if (jwt_parts?.length === 3) {
-		let [header, payload, signature] = jwt_parts;
-		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)) {
-				const result = JSON.parse(utf8Decode(base64Decode(unb64url(payload))));
-				const now = new Date().valueOf();
-
-				if (now < result.exp) {
-					print(`JWT valid for another ${(result.exp - now) / 1000} seconds.`);
-					return result;
-				} else {
-					print(`JWT expired by ${(now - result.exp) / 1000} seconds.`);
-				}
-			} else {
-				print('JWT verification failed.');
-			}
-		} else {
-			print('Invalid JWT header.');
-		}
-	}
-}
-
-/**
- * Check the provided password matches the hash
- * @param {string} password
- * @param {string} hash bcrypt hash
- * @returns true if the password matches the hash
- */
-function verifyPassword(password, hash) {
-	return bCrypt.hashpw(password, hash) === hash;
-}
-
-/**
- * Hashes a password
- * @param {string} password
- * @returns {string} TODOC
- */
-function hashPassword(password) {
-	let salt = bCrypt.gensalt(12);
-	return bCrypt.hashpw(password, salt);
-}
-
-/**
- * Check if there is an administrator on the instance
- * @returns TODOC
- */
-function noAdministrator() {
-	return (
-		!core.globalSettings ||
-		!core.globalSettings.permissions ||
-		!Object.keys(core.globalSettings.permissions).some(function (name) {
-			return (
-				core.globalSettings.permissions[name].indexOf('administration') != -1
-			);
-		})
-	);
-}
-
-/**
- * Makes a user an administrator
- * @param {string} name the user's name
- */
-function makeAdministrator(name) {
-	if (!core.globalSettings.permissions) {
-		core.globalSettings.permissions = {};
-	}
-	if (!core.globalSettings.permissions[name]) {
-		core.globalSettings.permissions[name] = [];
-	}
-	if (core.globalSettings.permissions[name].indexOf('administration') == -1) {
-		core.globalSettings.permissions[name].push('administration');
-	}
-
-	core.setGlobalSettings(core.globalSettings);
-}
-
-/**
- * TODOC
- * @param {*} headers most likely an object
- * @returns
- */
-function getCookies(headers) {
-	let cookies = {};
-
-	if (headers.cookie) {
-		let parts = headers.cookie.split(/,|;/);
-		for (let i in parts) {
-			let equals = parts[i].indexOf('=');
-			let name = parts[i].substring(0, equals).trim();
-			let value = parts[i].substring(equals + 1).trim();
-			cookies[name] = value;
-		}
-	}
-
-	return cookies;
-}
-
-/**
- * Validates a username
- * @param {string} name
- * @returns false | boolean[] ?
- */
-function isNameValid(name) {
-	// TODO(tasiaiso): convert this into a regex
-	let c = name.charAt(0);
-	return (
-		((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) &&
-		name
-			.split()
-			.map(
-				(x) =>
-					x >= ('a' && x <= 'z') ||
-					x >= ('A' && x <= 'Z') ||
-					x >= ('0' && x <= '9')
-			)
-	);
-}
-
-/**
- * Request handler ?
- * @param {*} request TODOC
- * @param {*} response
- * @returns
- */
-function handler(request, response) {
-	// TODO(tasiaiso): split this function
-	let session = getCookies(request.headers).session;
-	if (request.uri == '/login') {
-		let formData = form.decodeForm(request.query);
-		if (query(request.headers)?.permissions?.authenticated) {
-			if (formData.return) {
-				response.writeHead(303, {Location: formData.return});
-			} else {
-				response.writeHead(303, {
-					Location:
-						(request.client.tls ? 'https://' : 'http://') +
-						request.headers.host +
-						'/',
-					'Content-Length': '0',
-				});
-			}
-			response.end();
-			return;
-		}
-
-		let sessionIsNew = false;
-		let loginError;
-
-		if (request.method == 'POST' || formData.submit) {
-			sessionIsNew = true;
-			formData = form.decodeForm(utf8Decode(request.body), formData);
-			if (formData.submit == 'Login') {
-				let account = gDatabase.get('user:' + formData.name);
-				account = account ? JSON.parse(account) : account;
-				if (formData.register == '1') {
-					if (
-						!account &&
-						isNameValid(formData.name) &&
-						formData.password == formData.confirm
-					) {
-						let users = new Set();
-						let users_original = gDatabase.get('users');
-						try {
-							users = new Set(JSON.parse(users_original));
-						} catch {}
-						if (!users.has(formData.name)) {
-							users.add(formData.name);
-						}
-						users = JSON.stringify([...users].sort());
-						if (users !== users_original) {
-							gDatabase.set('users', users);
-						}
-						session = makeJwt({name: formData.name});
-						account = {password: hashPassword(formData.password)};
-						gDatabase.set('user:' + formData.name, JSON.stringify(account));
-						if (noAdministrator()) {
-							makeAdministrator(formData.name);
-						}
-					} else {
-						loginError = 'Error registering account.';
-					}
-				} else if (formData.change == '1') {
-					if (
-						account &&
-						isNameValid(formData.name) &&
-						formData.new_password == formData.confirm &&
-						verifyPassword(formData.password, account.password)
-					) {
-						session = makeJwt({name: formData.name});
-						account = {password: hashPassword(formData.new_password)};
-						gDatabase.set('user:' + formData.name, JSON.stringify(account));
-					} else {
-						loginError = 'Error changing password.';
-					}
-				} else {
-					if (
-						account &&
-						account.password &&
-						verifyPassword(formData.password, account.password)
-					) {
-						session = makeJwt({name: formData.name});
-						if (noAdministrator()) {
-							makeAdministrator(formData.name);
-						}
-					} else {
-						loginError = 'Invalid username or password.';
-					}
-				}
-			} else {
-				// Proceed as Guest
-				session = makeJwt({name: 'guest'});
-			}
-		}
-
-		let cookie = `session=${session}; path=/; Max-Age=${kRefreshInterval}; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; HttpOnly`;
-		let entry = readSession(session);
-		if (entry && formData.return) {
-			response.writeHead(303, {
-				Location: formData.return,
-				'Set-Cookie': cookie,
-			});
-			response.end();
-		} else {
-			File.readFile('core/auth.html')
-				.then(function (data) {
-					let html = utf8Decode(data);
-					let auth_data = {
-						session_is_new: sessionIsNew,
-						name: entry?.name,
-						error: loginError,
-						code_of_conduct: core.globalSettings.code_of_conduct,
-						have_administrator: !noAdministrator(),
-					};
-					html = utf8Encode(
-						html.replace('$AUTH_DATA', JSON.stringify(auth_data))
-					);
-					response.writeHead(200, {
-						'Content-Type': 'text/html; charset=utf-8',
-						'Set-Cookie': cookie,
-						'Content-Length': html.length,
-					});
-					response.end(html);
-				})
-				.catch(function (error) {
-					response.writeHead(404, {
-						'Content-Type': 'text/plain; charset=utf-8',
-						Connection: 'close',
-					});
-					response.end('404 File not found');
-				});
-		}
-	} else if (request.uri == '/login/logout') {
-		response.writeHead(303, {
-			'Set-Cookie': `session=; path=/; ${request.client.tls ? 'Secure; ' : ''}SameSite=Strict; expires=Thu, 01 Jan 1970 00:00:00 GMT; HttpOnly`,
-			Location: '/login' + (request.query ? '?' + request.query : ''),
-		});
-		response.end();
-	} else {
-		response.writeHead(200, {
-			'Content-Type': 'text/plain; charset=utf-8',
-			Connection: 'close',
-		});
-		response.end('Hello, ' + request.client.peerName + '.');
-	}
-}
-
-/**
- * Gets a user's permissions based on it's session ?
- * @param {*} session TODOC
- * @returns
- */
-function getPermissions(session) {
-	let permissions;
-	let entry = readSession(session);
-	if (entry) {
-		permissions = getPermissionsForUser(entry.name);
-		permissions.authenticated = entry.name !== 'guest';
-	}
-	return permissions || {};
-}
-
-/**
- * Get a user's permissions ?
- * @param {string} userName TODOC
- * @returns
- */
-function getPermissionsForUser(userName) {
-	let permissions = {};
-	if (
-		core.globalSettings &&
-		core.globalSettings.permissions &&
-		core.globalSettings.permissions[userName]
-	) {
-		for (let i in core.globalSettings.permissions[userName]) {
-			permissions[core.globalSettings.permissions[userName][i]] = true;
-		}
-	}
-	return permissions;
-}
-
-/**
- * TODOC
- * @param {*} headers
- * @returns
- */
-function query(headers) {
-	let session = getCookies(headers).session;
-	let entry;
-	let autologin = tildefriends.args.autologin;
-	if ((entry = autologin ? {name: autologin} : readSession(session))) {
-		return {
-			session: entry,
-			permissions: autologin
-				? getPermissionsForUser(autologin)
-				: getPermissions(session),
-		};
-	}
-}
-
-/**
- * Refreshes a JWT ?
- * @param {*} credentials TODOC
- * @returns
- */
-function makeRefresh(credentials) {
-	if (credentials?.session?.name) {
-		return {
-			token: makeJwt({name: credentials.session.name}),
-			interval: kRefreshInterval,
-		};
-	}
-}
-
-export {handler, query, makeRefresh};

core/client.js

@@ -10,6 +10,7 @@ let gEditor;
 let gOriginalInput;
 
 let kErrorColor = '#dc322f';
+let kDisconnectColor = '#f00';
 let kStatusColor = '#fff';
 
 // Functions that server-side app code can call through the app object.
@@ -55,7 +56,10 @@ class TfNavigationElement extends LitElement {
 			status: {type: Object},
 			spark_lines: {type: Object},
 			version: {type: Object},
-			show_version: {type: Boolean},
+			show_expanded: {type: Boolean},
+			identity: {type: String},
+			identities: {type: Array},
+			names: {type: Object},
 		};
 	}
 
@@ -65,6 +69,8 @@ class TfNavigationElement extends LitElement {
 		this.show_permissions = false;
 		this.status = {};
 		this.spark_lines = {};
+		this.identities = [];
+		this.names = {};
 	}
 
 	/**
@@ -97,10 +103,9 @@ class TfNavigationElement extends LitElement {
 	get_spark_line(key, options) {
 		if (!this.spark_lines[key]) {
 			let spark_line = document.createElement('tf-sparkline');
-			spark_line.style.display = 'flex';
-			spark_line.style.flexDirection = 'row';
-			spark_line.style.flex = '0 50 5em';
 			spark_line.title = key;
+			spark_line.classList.add('w3-bar-item');
+			spark_line.style.paddingRight = '0';
 			if (options) {
 				if (options.max) {
 					spark_line.max = options.max;
@@ -112,17 +117,127 @@ class TfNavigationElement extends LitElement {
 		return this.spark_lines[key];
 	}
 
-	/**
-	 * TODOC
-	 * @returns
-	 */
-	render_login() {
+	set_active_identity(id) {
+		send({action: 'setActiveIdentity', identity: id});
+		this.renderRoot.getElementById('id_dropdown').classList.remove('w3-show');
+	}
+
+	create_identity(event) {
+		if (confirm('Are you sure you want to create a new identity?')) {
+			send({action: 'createIdentity'});
+		}
+	}
+
+	toggle_id_dropdown() {
+		this.renderRoot.getElementById('id_dropdown').classList.toggle('w3-show');
+	}
+
+	edit_profile() {
+		window.location.href = '/~core/ssb/#' + this.identity;
+	}
+
+	logout() {
+		window.location.href = `/login/logout?return=${encodeURIComponent(url() + hash())}`;
+	}
+
+	render_identity() {
+		let self = this;
+
 		if (this?.credentials?.session?.name) {
-			return html`<a id="login" href="/login/logout?return=${url() + hash()}"
-				>logout ${this.credentials.session.name}</a
-			>`;
+			if (this.identities?.length) {
+				return html`
+					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
+					<div class="w3-dropdown-click w3-right" style="max-width: 100%">
+						<button
+							class="w3-button w3-rest w3-cyan"
+							style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap; max-width: 100%"
+							id="identity"
+							@click=${self.toggle_id_dropdown}
+						>
+							${self.names[this.identity]}▾
+						</button>
+						<div
+							id="id_dropdown"
+							class="w3-dropdown-content w3-bar-block w3-card-4"
+							style="max-width: 100%; right: 0"
+						>
+							<div
+								style="position: fixed; left: 0; right: 0; top: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.25); z-index: -100"
+								@click=${self.toggle_id_dropdown}
+							></div>
+							<button
+								class="w3-bar-item w3-button w3-border"
+								@click=${() => (window.location.href = '/~core/identity')}
+							>
+								Manage Identities...
+							</button>
+							<button
+								id="edit_profile"
+								class="w3-bar-item w3-button w3-border"
+								@click=${self.edit_profile}
+							>
+								Edit Profile...
+							</button>
+							${this.identities.map(
+								(x) => html`
+									<button
+										class="w3-bar-item w3-button ${x === self.identity
+											? 'w3-cyan'
+											: ''}"
+										@click=${() => self.set_active_identity(x)}
+										style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+									>
+										${self.names[x]}${self.names[x] === x ? '' : html` - ${x}`}
+									</button>
+								`
+							)}
+							<button
+								class="w3-bar-item w3-button w3-border"
+								id="logout"
+								@click=${self.logout}
+							>
+								Logout ${this.credentials.session.name}
+							</button>
+						</div>
+					</div>
+				`;
+			} else if (
+				this.credentials?.session?.name &&
+				this.credentials.session.name !== 'guest'
+			) {
+				return html`
+					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
+					<button
+						class="w3-bar-item w3-button w3-right w3-cyan"
+						id="logout"
+						@click=${self.logout}
+					>
+						Logout ${this.credentials.session.name}
+					</button>
+					<button
+						id="create_identity"
+						@click=${this.create_identity}
+						class="w3-button w3-mobile w3-red w3-right"
+					>
+						Create an Identity
+					</button>
+				`;
 			} else {
-			return html`<a id="login" href="/login?return=${url() + hash()}"
+				return html`
+					<button
+						class="w3-bar-item w3-button w3-right w3-cyan"
+						id="logout"
+						@click=${self.logout}
+					>
+						Logout ${this.credentials.session.name}
+					</button>
+				`;
+			}
+		} else {
+			return html`<a
+				class="w3-bar-item w3-cyan w3-right"
+				id="login"
+				href="/login?return=${url() + hash()}"
 				>login</a
 			>`;
 		}
@@ -146,8 +261,14 @@ class TfNavigationElement extends LitElement {
 						${Object.keys(this.permissions).map(
 							(key) => html`
 								<div>
-								<span>${key}</span>: ${this.permissions[key] ? '✅ Allowed' : '❌ Denied'}
-								<button @click=${() => this.reset_permission(key)} class='w3-button w3-red">Reset</button>
+									<span>${key}</span>:
+									${this.permissions[key] ? '✅ Allowed' : '❌ Denied'}
+									<button
+										@click=${() => this.reset_permission(key)}
+										class="w3-button w3-red"
+									>
+										Reset
+									</button>
 								</div>
 							`
 						)}
@@ -163,6 +284,10 @@ class TfNavigationElement extends LitElement {
 		}
 	}
 
+	clear_error() {
+		this.status = {};
+	}
+
 	/**
 	 * TODOC
 	 * @returns
@@ -170,6 +295,7 @@ class TfNavigationElement extends LitElement {
 	render() {
 		let self = this;
 		return html`
+			<link type="text/css" rel="stylesheet" href="/static/w3.css" />
 			<style>
 				${k_global_style} .tooltip {
 					position: absolute;
@@ -185,17 +311,17 @@ class TfNavigationElement extends LitElement {
 					display: inline-block;
 				}
 			</style>
-			<div
-				style="margin: 4px; display: flex; flex-direction: row; flex-wrap: nowrap; gap: 3px; align-items: center"
-			>
+			<div class="w3-black w3-bar">
 				<span
+					class="w3-bar-item"
 					style="cursor: pointer"
-					@click=${() => (this.show_version = !this.show_version)}
+					@click=${() => (this.show_expanded = !this.show_expanded)}
 					>😎</span
 				>
 				<span
-					?hidden=${!this.show_version}
-					style="flex: 0 0; white-space: nowrap"
+					class="w3-bar-item"
+					style=${'white-space: nowrap' +
+					(this.show_expanded ? '' : '; display: none')}
 					title=${this.version?.name +
 					' ' +
 					Object.entries(this.version || {})
@@ -204,6 +330,7 @@ class TfNavigationElement extends LitElement {
 					>${this.version?.number}</span
 				>
 				<a
+					class="w3-bar-item"
 					accesskey="h"
 					@mouseover=${set_access_key_title}
 					data-tip="Open home app."
@@ -212,6 +339,7 @@ class TfNavigationElement extends LitElement {
 					>TF</a
 				>
 				<a
+					class="w3-bar-item"
 					accesskey="a"
 					@mouseover=${set_access_key_title}
 					data-tip="Open apps list."
@@ -219,6 +347,7 @@ class TfNavigationElement extends LitElement {
 					>apps</a
 				>
 				<a
+					class="w3-bar-item"
 					accesskey="e"
 					@mouseover=${set_access_key_title}
 					data-tip="Toggle the app editor."
@@ -227,6 +356,7 @@ class TfNavigationElement extends LitElement {
 					>edit</a
 				>
 				<a
+					class="w3-bar-item"
 					accesskey="p"
 					@mouseover=${set_access_key_title}
 					data-tip="View and change permissions."
@@ -234,27 +364,36 @@ class TfNavigationElement extends LitElement {
 					@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()}
-				<span
-					style="flex: 1 1; display: flex; flex-direction: row; white-space: nowrap; margin: 0; padding: 0"
-					>${Object.keys(this.spark_lines)
-						.sort()
-						.map((x) => this.spark_lines[x])
-						.map((x) => [
-							html`<span style="font-size: xx-small">${x.dataset.emoji}</span>`,
-							x,
-						])}</span
-				>
-				<span style="flex: 0 0; white-space: nowrap"
-					>${this.render_login()}</span
+				${this.status?.message && !this.status.is_error
+					? html`
+							<link type="text/css" rel="stylesheet" href="/static/w3.css" />
+							<div
+								class="w3-bar-item"
+								style="color: ${this.status.color ?? kStatusColor}"
 							>
+								${this.status.message}
 							</div>
+						`
+					: undefined}
+				<span class=${this.show_expanded ? '' : 'w3-hide-small'}>
+					${Object.keys(this.spark_lines)
+						.sort()
+						.map((x) => this.spark_lines[x])}
+				</span>
+				${this.render_identity()}
+			</div>
+			${this.status?.is_error
+				? html`
+					<link type="text/css" rel="stylesheet" href="/static/w3.css" />
+					<div class="w3-model w3-animate-top" style="position: absolute; left: 50%; transform: translate(-50%); z-index: 1">
+						<dijv class="w3-modal-content w3-card-4" style="display: block; padding: 1em">
+							<span id="close_error" @click=${self.clear_error} class="w3-button w3-display-topright">&times;</span>
+							<div style="color: ${this.status.color ?? kErrorColor}"><b>ERROR:</b><p id="error" style="white-space: pre">${this.status.message}</p></div>
+						</div>
+					</div>
+					`
+				: undefined}
 		`;
 	}
 }
@@ -578,13 +717,13 @@ class TfSparkLineElement extends LitElement {
 			) / 10.0;
 		return html`
 			<svg
-				style="max-width: 7.5em; max-height: 1.5em; margin: 0; padding: 0; background: #000"
+				style="max-width: 7.5em; margin: 0; padding: 0; background: #000; height: 1em"
 				viewBox="0 0 50 10"
 				xmlns="http://www.w3.org/2000/svg"
 			>
 				${this.lines.map((x) => this.render_line(x))}
 				<text x="0" y="1em" style="font: 8px sans-serif; fill: #fff">
-					${max}
+					${this.dataset.emoji}${max}
 				</text>
 			</svg>
 		`;
@@ -1000,9 +1139,9 @@ function api_postMessage(message) {
 function api_error(error) {
 	if (error) {
 		if (typeof error == 'string') {
-			setStatusMessage('⚠️ ' + error, '#f00');
+			setStatusMessage('⚠️ ' + error, kErrorColor);
 		} else {
-			setStatusMessage('⚠️ ' + error.message + '\n' + error.stack, '#f00');
+			setStatusMessage('⚠️ ' + error.message + '\n' + error.stack, kErrorColor);
 		}
 	}
 	console.log('error', error);
@@ -1041,7 +1180,7 @@ function api_requestPermission(permission, id) {
 
 	let div = document.createElement('div');
 	div.appendChild(
-		document.createTextNode('This app is requesting the following permission:')
+		document.createTextNode('This app is requesting the following permission: ')
 	);
 	let span = document.createElement('span');
 	span.style = 'font-weight: bold';
@@ -1057,6 +1196,7 @@ function api_requestPermission(permission, id) {
 	check.classList.add('w3-check');
 	check.classList.add('w3-blue');
 	div.appendChild(check);
+	div.appendChild(document.createTextNode(' '));
 	let label = document.createElement('label');
 	label.htmlFor = check.id;
 	label.appendChild(document.createTextNode('Remember this decision.'));
@@ -1119,11 +1259,19 @@ function api_setHash(hash) {
 function _receive_websocket_message(message) {
 	if (message && message.action == 'session') {
 		setStatusMessage('🟢 Executing...', kStatusColor);
-		document.getElementsByTagName('tf-navigation')[0].credentials =
-			message.credentials;
+		let navigation = document.getElementsByTagName('tf-navigation')[0];
+		navigation.credentials = message.credentials;
+		navigation.identities = message.identities;
+		navigation.identity = message.identity;
+		navigation.names = message.names;
 	} else if (message && message.action == 'permissions') {
-		document.getElementsByTagName('tf-navigation')[0].permissions =
-			message.permissions ?? {};
+		let navigation = document.getElementsByTagName('tf-navigation')[0];
+		navigation.permissions = message.permissions ?? {};
+	} else if (message && message.action == 'identities') {
+		let navigation = document.getElementsByTagName('tf-navigation')[0];
+		navigation.identities = message.identities;
+		navigation.identity = message.identity;
+		navigation.names = message.names;
 	} else if (message && message.action == 'ready') {
 		setStatusMessage(null);
 		if (window.location.hash) {
@@ -1133,7 +1281,6 @@ function _receive_websocket_message(message) {
 		document.getElementById('viewPane').style.display = message.edit_only
 			? 'none'
 			: 'flex';
-		send({action: 'enableStats', enabled: true});
 	} else if (message && message.action == 'ping') {
 		send({action: 'pong'});
 	} else if (message && message.action == 'stats') {
@@ -1211,6 +1358,7 @@ function setStatusMessage(message, color) {
 	document.getElementsByTagName('tf-navigation')[0].status = {
 		message: message,
 		color: color,
+		is_error: color == kErrorColor,
 	};
 }
 
@@ -1420,7 +1568,7 @@ function connectSocket(path) {
 			};
 			setStatusMessage(
 				'🔴 Closed: ' + (k_codes[event.code] || event.code),
-				kErrorColor
+				kDisconnectColor
 			);
 		};
 	}
@@ -1641,10 +1789,11 @@ 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 prettier_html = (await import('/prettier/html.mjs')).default;
 	let source = gEditor.state.doc.toString();
 	let formatted = await prettier.format(source, {
-		parser: 'babel',
-		plugins: [babel, estree],
+		parser: gCurrentFile?.toLowerCase()?.endsWith('.html') ? 'html' : 'babel',
+		plugins: [babel, estree, prettier_html],
 		trailingComma: 'es5',
 		useTabs: true,
 		semi: true,
@@ -1679,8 +1828,8 @@ function toggleVisibleWhitespace() {
 			.cm-highlightTab {
 				background-image: unset !important;
 			}
-			.cm-highlightSpace:before {
-				content: unset !important;
+			.cm-highlightSpace {
+				background-image: unset !important;
 			}
 		`;
 		window.localStorage.setItem('visible_whitespace', '1');

core/index.html

@@ -4,8 +4,28 @@
 		<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" />
+		<link type="image/svg+xml" rel="icon" href="/static/tildefriends.svg" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<meta
+			name="title"
+			content="Tilde Friends - Make friends and apps from your web browser."
+		/>
+		<meta
+			name="description"
+			content="Tilde Friends is a Secure Scuttlebutt client and a platform for building, running, and sharing web applications. "
+		/>
+		<meta property="og:type" content="website" />
+		<meta property="og:url" content="https://metatags.io/" />
+		<meta
+			property="og:title"
+			content="Tilde Friends - Make friends and apps from your web browser."
+		/>
+		<meta
+			property="og:description"
+			content="Tilde Friends is a Secure Scuttlebutt client and a platform for building, running, and sharing web applications. "
+		/>
+		<meta property="og:image" content="/static/tildefriends.svg" />
+
 		<script>
 			function set_access_key_title(event) {
 				if (!event.srcElement.title) {
@@ -25,6 +45,17 @@
 			max-height: 100%;
 		"
 	>
+		<noscript>
+			<div class="w3-container">
+				<div class="w3-panel w3-red w3-padding w3-card-4">
+					<h1>TildeFriends requires JavaScript.</h1>
+					<p>
+						It looks like JavaScript is disabled or unsupported. This isn't
+						going to work.
+					</p>
+				</div>
+			</div>
+		</noscript>
 		<tf-navigation></tf-navigation>
 		<div id="content" class="hbox" style="flex: 1 0; overflow: auto">
 			<div

core/style.css

@@ -15,22 +15,6 @@ body {
 	margin: 0;
 }
 
-a:link {
-	color: #268bd2;
-}
-
-a:visited {
-	color: #6c71c4;
-}
-
-a:hover {
-	color: #859900;
-}
-
-a:active {
-	color: #2aa198;
-}
-
 #logo {
 	vertical-align: middle;
 }

core/tildefriends.svg

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="65"
+   height="65"
+   viewBox="0 0 61 65"
+   fill="none"
+   version="1.1"
+   id="svg910"
+   sodipodi:docname="tildefriends.svg"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs914" />
+  <sodipodi:namedview
+     id="namedview912"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="18.369231"
+     inkscape:cx="32.472781"
+     inkscape:cy="32.5"
+     inkscape:window-width="2256"
+     inkscape:window-height="1447"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg910" />
+  <path
+     style="fill:#0af;stroke-width:.712717;fill-opacity:1"
+     d="M6 0h49a8 8 45 0 1 8 8v49a8 8 135 0 1-8 8H6a8 8 45 0 1-8-8V8a8 8 135 0 1 8-8Z"
+     id="path886" />
+  <g
+     aria-label="~"
+     id="text890"
+     style="font-size:40px;line-height:1.25;fill:#000000">
+    <path
+       d="m 1.6762187,36.689095 v -4.003907 q 2.0703125,-2.34375 5.4296875,-2.34375 1.171875,0 2.4609375,0.351563 1.2890623,0.332031 3.6718753,1.347656 1.347656,0.566406 2.011718,0.742188 0.683594,0.175781 1.367188,0.175781 1.269531,0 2.617187,-0.761719 1.367188,-0.761719 2.421875,-1.914062 v 4.140625 q -1.25,1.171875 -2.539062,1.699218 -1.269531,0.527344 -2.871094,0.527344 -1.171875,0 -2.246094,-0.273437 -1.054687,-0.273438 -3.378906,-1.308594 -2.3046873,-1.035156 -3.847656,-1.035156 -1.25,0 -2.3632813,0.546875 -1.09375,0.527343 -2.734375,2.109375 z"
+       style="font-family:Arial;-inkscape-font-specification:'Arial, Normal'"
+       id="path1704" />
+  </g>
+  <g
+     transform="translate(16.213 5.975) scale(.72923)"
+     id="g896">
+    <circle
+       cx="36"
+       cy="36"
+       r="23"
+       fill="#fcea2b"
+       id="circle892" />
+    <path
+       fill="#3f3f3f"
+       d="M45.331 38.564c3.963 0 7.178-2.862 7.178-6.389 0-1.765.448-3.53-.852-4.685-1.299-1.156-4.345-1.704-6.326-1.704-2.357 0-5.143.143-6.451 1.704-.894 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389zM25.738 38.564c3.963 0 7.179-2.862 7.179-6.389 0-1.765.447-3.53-.852-4.685-1.3-1.156-4.345-1.704-6.327-1.704-2.356 0-5.142.143-6.451 1.704-.893 1.065-.727 3.253-.727 4.685 0 3.527 3.213 6.389 7.178 6.389z"
+       id="path894" />
+  </g>
+  <g
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-miterlimit="10"
+     stroke-width="2"
+     transform="translate(16.213 5.975) scale(.72923)"
+     id="g908">
+    <circle
+       cx="35.887"
+       cy="36.056"
+       r="23"
+       id="circle898" />
+    <path
+       d="M45.702 44.862c-6.574 3.525-14.045 3.658-19.63 0M18.883 30.464s-.953 8.55 6.86 7.918c2.62-.212 7.817-.65 7.867-8.342.005-.698-.007-1.6-.81-2.63-1.065-1.367-3.572-1.971-9.945-1.422 0 0-3.446-.1-3.972 4.476z"
+       id="path900" />
+    <path
+       d="m18.953 29.931-.433-3.372 3.833-.527M52.741 30.464s.953 8.55-6.86 7.918c-2.62-.212-7.817-.65-7.868-8.342-.004-.698.008-1.6.811-2.63 1.065-1.367 3.572-1.971 9.945-1.422 0 0 3.446-.1 3.972 4.476z"
+       id="path902" />
+    <path
+       d="M31.505 26.416s4.124 2.534 8.657 0M33.536 31.318s2.202-3.751 4.536 0M52.664 29.933l.433-3.371-3.833-.528"
+       id="path904" />
+    <path
+       d="M33.955 30.027s1.795-3.75 3.699 0"
+       id="path906" />
+  </g>
+</svg>