sus. Disable a warning in c-ares during ltcg with gcc 13 on Haiku.

.fdroid.yml

@@ -1,40 +0,0 @@
-Categories:
-  - Internet
-License: MIT
-
-AutoName: tildefriends
-AuthorName: Cory McWilliams
-AuthorEmail: cory@tildefriends.net
-
-RepoType: git
-Repo: https://dev.tildefriends.net/cory/tildefriends.git
-
-Builds:
-  - versionName: 0.0.21-wip
-    versionCode: 22
-    commit: 09b6a00731d45fa160b23a2c44be6def98d92d6a
-    subdir: src/android
-    submodules: true
-    sudo:
-      - apt-get update
-      - apt-get install -y ant make zip
-    androidupdate:
-      - no
-    scandelete:
-      - deps/libuv/docs/src/static/diagrams.key/Index.zip
-      - deps/openssl_src/cloudflare-quiche/*
-      - deps/openssl_src/fuzz/*
-      - deps/openssl_src/gost-engine/*
-      - deps/openssl_src/test/*
-      - deps/openssl_src/tlslite-ng/*
-    prebuild:
-      - sdkmanager "platforms;android-34" "build-tools;34.0.0"
-    build:
-      - mkdir bin/
-      - ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ANDROID_NDK_ROOT=$$NDK$$ make -C ../../ -j`nproc` fdroid
-    ndk: r26d
-
-AutoUpdateMode: Version ^v[0-9\.]+$
-UpdateCheckMode: Tags
-CurrentVersion: 0.0.21-wip
-CurrentVersionCode: 22

.gitea/workflows/build.yaml

@@ -5,11 +5,31 @@ 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
-      - run: make all -j`nproc` docs
+      - 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

GNUmakefile

@@ -3,9 +3,9 @@
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-VERSION_CODE := 26
+VERSION_CODE := 27
-VERSION_NUMBER := 0.0.22
+VERSION_NUMBER := 0.0.23-wip
-VERSION_NAME := Get born soon.
+VERSION_NAME := Me upon my pony on my boat.
 
 SQLITE_URL := https://www.sqlite.org/2024/sqlite-amalgamation-3460100.zip
 BUNDLETOOL_URL := https://github.com/google/bundletool/releases/download/1.17.0/bundletool-all-1.17.0.jar
@@ -35,7 +35,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 += \
@@ -842,7 +843,7 @@ PACKAGE_DIRS := \
 	deps/prettier/ \
 	deps/lit/
 
-RAW_FILES := $(sort $(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
@@ -1066,14 +1067,27 @@ $(IOS_DEPS):
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
 endif
 
+out/Tilde_Friends-x86_64.AppImage: out/release/tildefriends out/data.zip
+	@mkdir -p out/AppDir/usr/bin
+	@mkdir -p out/AppDir/usr/share/applications
+	@mkdir -p out/AppDir/usr/share/icons/hicolor/scalable/apps
+	@echo "[Desktop Entry]\nName=Tilde Friends\nExec=tildefriends\nIcon=tildefriends\nType=Application\nCategories=Network" > out/AppDir/usr/share/applications/tildefriends.desktop
+	@cp src/ios/tildefriends.svg out/AppDir/usr/share/icons/hicolor/scalable/apps/
+	@cat out/release/tildefriends out/data.zip > out/AppDir/usr/bin/tildefriends
+	@chmod +x out/AppDir/usr/bin/tildefriends
+	@unset SOURCE_DATE_EPOCH; cd out; linuxdeploy-x86_64.AppImage --appdir AppDir --output appimage; cd ..
+
+appimage: out/Tilde_Friends-x86_64.AppImage
+.PHONY: appimage
+
 clean:
 	rm -rf $(BUILD_DIR)
 .PHONY: clean
 
-dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk
+tarball:
-	@echo [archive] dist/tildefriends-$(VERSION_NUMBER).tar.xz
+	@echo [archive] out/tildefriends-$(VERSION_NUMBER).tar.xz
 	@rm -rf out/tildefriends-$(VERSION_NUMBER)
-	@mkdir -p dist/ 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* \
@@ -1090,9 +1104,15 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 		--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: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefriends.standalone.exe) out/TildeFriends-release.fdroid.apk appimage
+	@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"
@@ -1101,8 +1121,12 @@ dist: release-apk iosrelease-ipa aab $(if $(HAVE_WIN), out/winrelease/tildefrien
 	@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/Tilde_Friends-x86_64.AppImage dist/TildeFriends-x86_64-$(VERSION_NUMBER).AppImage
 .PHONY: dist
 
 dist-test: dist

apps/admin/script.js

@@ -28,7 +28,10 @@ function global_settings_set(key, value) {
 }
 
 function title_case(name) {
-	return name.split('_').map(x => x.charAt(0).toUpperCase() + x.substring(1)).join(' ');
+	return name
+		.split('_')
+		.map((x) => x.charAt(0).toUpperCase() + x.substring(1))
+		.join(' ');
 }
 
 window.addEventListener('load', function () {

apps/ssb.json

@@ -1,5 +1,5 @@
 {
 	"type": "tildefriends-app",
 	"emoji": "🐌",
-	"previous": "&xsmsLytB3VvoHphiFHZGGEvrCfTEVGXrGwobGTIYFPQ=.sha256"
+	"previous": "&6oHPQCA26v+4nBXv+YUdCT43j2DpXDspxhHSSRydkiw=.sha256"
 }

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;
@@ -81,7 +98,7 @@ class TfTabSearchElement extends LitElement {
 				<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>
 		`;
 	}
 }

core/core.js

@@ -77,7 +77,8 @@ const k_global_settings = {
 	peer_exchange: {
 		type: 'boolean',
 		default_value: false,
-		description: 'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
+		description:
+			'Enable discovery of, sharing of, and connecting to internet peer strangers, including announcing this instance.',
 	},
 	account_registration: {
 		type: 'boolean',
@@ -1350,8 +1351,4 @@ function storePermission(user, packageOwner, packageName, permission, allow) {
 	}
 }
 
-export {
+export {gGlobalSettings as globalSettings, invoke, getSessionProcessBlob};
-	gGlobalSettings as globalSettings,
-	invoke,
-	getSessionProcessBlob,
-};

default.nix

@@ -28,7 +28,7 @@ pkgs.stdenv.mkDerivation rec {
     owner = "cory";
     repo = "tildefriends";
     rev = "v${version}";
-    hash = "sha256-0x4LJXtMUxBsWEOoWAaQlStTfvqUf4Qs/5vJZ2EvBpY=";
+    hash = "sha256-Su+y++zVXmYNbwfhCP6w5e36oxW5fkURPFzFLjbyFEI=";
     fetchSubmodules = true;
   };
 

deps/codemirror_src/package-lock.json

@@ -37,9 +37,9 @@
       }
     },
     "node_modules/@codemirror/commands": {
-      "version": "6.6.0",
+      "version": "6.6.1",
-      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.1.tgz",
-      "integrity": "sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==",
+      "integrity": "sha512-iBfKbyIoXS1FGdsKcZmnrxmbc8VcbMrSgD7AVrsnX+WyAYjmUDWvE93dt5D874qS4CCVu4O1JpbagHdXbbLiOw==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/language": "^6.0.0",
@@ -49,16 +49,16 @@
       }
     },
     "node_modules/@codemirror/lang-css": {
-      "version": "6.2.1",
+      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.3.0.tgz",
-      "integrity": "sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==",
+      "integrity": "sha512-CyR4rUNG9OYcXDZwMPvJdtb6PHbBDKUc/6Na2BIwZ6dKab1JQqKa4di+RNRY9Myn7JB81vayKwJeQ7jEdmNVDA==",
       "license": "MIT",
       "dependencies": {
         "@codemirror/autocomplete": "^6.0.0",
         "@codemirror/language": "^6.0.0",
         "@codemirror/state": "^6.0.0",
         "@lezer/common": "^1.0.2",
-        "@lezer/css": "^1.0.0"
+        "@lezer/css": "^1.1.7"
       }
     },
     "node_modules/@codemirror/lang-html": {
@@ -239,9 +239,9 @@
       "license": "MIT"
     },
     "node_modules/@lezer/css": {
-      "version": "1.1.8",
+      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.8.tgz",
+      "resolved": "https://registry.npmjs.org/@lezer/css/-/css-1.1.9.tgz",
-      "integrity": "sha512-7JhxupKuMBaWQKjQoLtzhGj83DdnZY9MckEOG5+/iLKNK2ZJqKc6hf6uc0HjwCX7Qlok44jBNqZhHKDhEhZYLA==",
+      "integrity": "sha512-TYwgljcDv+YrV0MZFFvYFQHCfGgbPMR6nuqLabBdmZoFH3EP1gvw8t0vae326Ne3PszQkbXfVBjCnf3ZVCr0bA==",
       "license": "MIT",
       "dependencies": {
         "@lezer/common": "^1.2.0",
@@ -371,9 +371,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
-      "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
+      "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
       "cpu": [
         "arm"
       ],
@@ -384,9 +384,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-      "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
+      "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
       "cpu": [
         "arm64"
       ],
@@ -397,9 +397,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
-      "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
+      "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
       "cpu": [
         "arm64"
       ],
@@ -410,9 +410,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
-      "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
+      "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
       "cpu": [
         "x64"
       ],
@@ -423,9 +423,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
-      "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
+      "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
       "cpu": [
         "arm"
       ],
@@ -436,9 +436,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
-      "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
+      "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
       "cpu": [
         "arm"
       ],
@@ -449,9 +449,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
-      "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
+      "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
       "cpu": [
         "arm64"
       ],
@@ -462,9 +462,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
-      "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
+      "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
       "cpu": [
         "arm64"
       ],
@@ -475,9 +475,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
-      "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
+      "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
       "cpu": [
         "ppc64"
       ],
@@ -488,9 +488,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
-      "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
+      "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
       "cpu": [
         "riscv64"
       ],
@@ -501,9 +501,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
-      "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
+      "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
       "cpu": [
         "s390x"
       ],
@@ -514,9 +514,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
-      "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
+      "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
       "cpu": [
         "x64"
       ],
@@ -527,9 +527,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
-      "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
+      "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
       "cpu": [
         "x64"
       ],
@@ -540,9 +540,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
-      "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
+      "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
       "cpu": [
         "arm64"
       ],
@@ -553,9 +553,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
-      "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
+      "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
       "cpu": [
         "ia32"
       ],
@@ -566,9 +566,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
-      "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
+      "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
       "cpu": [
         "x64"
       ],
@@ -782,9 +782,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.21.0",
+      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-      "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
+      "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -797,22 +797,22 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.21.0",
+        "@rollup/rollup-android-arm-eabi": "4.21.2",
-        "@rollup/rollup-android-arm64": "4.21.0",
+        "@rollup/rollup-android-arm64": "4.21.2",
-        "@rollup/rollup-darwin-arm64": "4.21.0",
+        "@rollup/rollup-darwin-arm64": "4.21.2",
-        "@rollup/rollup-darwin-x64": "4.21.0",
+        "@rollup/rollup-darwin-x64": "4.21.2",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
-        "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
-        "@rollup/rollup-linux-arm64-gnu": "4.21.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.21.2",
-        "@rollup/rollup-linux-arm64-musl": "4.21.0",
+        "@rollup/rollup-linux-arm64-musl": "4.21.2",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
-        "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
-        "@rollup/rollup-linux-s390x-gnu": "4.21.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-gnu": "4.21.0",
+        "@rollup/rollup-linux-x64-gnu": "4.21.2",
-        "@rollup/rollup-linux-x64-musl": "4.21.0",
+        "@rollup/rollup-linux-x64-musl": "4.21.2",
-        "@rollup/rollup-win32-arm64-msvc": "4.21.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.21.2",
-        "@rollup/rollup-win32-ia32-msvc": "4.21.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.21.2",
-        "@rollup/rollup-win32-x64-msvc": "4.21.0",
+        "@rollup/rollup-win32-x64-msvc": "4.21.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -894,9 +894,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.31.6",
+      "version": "5.32.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.32.0.tgz",
-      "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
+      "integrity": "sha512-v3Gtw3IzpBJ0ugkxEX8U0W6+TnPKRRCWGh1jC/iM/e3Ki5+qvO1L1EAZ56bZasc64aXHwRHNIQEzm6//i5cemQ==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {

src/android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
-	android:versionCode="26"
+	android:versionCode="27"
-	android:versionName="0.0.22">
+	android:versionName="0.0.23-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application

src/android/com/unprompted/tildefriends/TildeFriendsActivity.java

@@ -165,6 +165,8 @@ public class TildeFriendsActivity extends Activity {
 		web_view.getSettings().setDatabaseEnabled(true);
 		web_view.getSettings().setDomStorageEnabled(true);
 
+		set_database_path();
+
 		web_view.setDownloadListener(new DownloadListener() {
 			public void onDownloadStart(String url, String userAgent, String content_disposition, String mime_type, long content_length) {
 				Log.w("tildefriends", "Let's download: " + url + " (" + content_disposition + ")");
@@ -458,4 +460,12 @@ public class TildeFriendsActivity extends Activity {
 			s_activity.service_connection = null;
 		}
 	}
+
+	@SuppressWarnings("deprecation")
+	private void set_database_path()
+	{
+		if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT) {
+			web_view.getSettings().setDatabasePath(getDatabasePath("webview").getPath());
+		}
+	}
 }

src/ssb.c

@@ -80,6 +80,7 @@ enum
 	k_seed_expire_seconds = 10 * 60,
 	k_seed_check_interval_seconds = 5 * 60,
 	k_udp_discovery_expires_seconds = 10,
+	k_handshake_timeout_ms = 15000,
 };
 
 typedef struct _tf_ssb_broadcast_t tf_ssb_broadcast_t;
@@ -294,6 +295,7 @@ typedef struct _tf_ssb_connection_t
 	uv_tcp_t tcp;
 	uv_connect_t connect;
 	uv_async_t async;
+	uv_timer_t handshake_timer;
 	bool closing;
 
 	tf_ssb_connection_t* tunnel_connection;
@@ -1258,6 +1260,10 @@ static void _tf_ssb_connection_verify_identity(tf_ssb_connection_t* connection,
 	JS_SetPropertyStr(context, connection->object, "is_client", JS_TRUE);
 
 	connection->state = k_tf_ssb_state_verified;
+	if (connection->handshake_timer.data)
+	{
+		uv_timer_stop(&connection->handshake_timer);
+	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_connect, connection);
 }
 
@@ -1486,6 +1492,10 @@ static void _tf_ssb_connection_verify_client_identity(tf_ssb_connection_t* conne
 	JS_SetPropertyStr(context, connection->object, "is_client", JS_FALSE);
 
 	connection->state = k_tf_ssb_state_server_verified;
+	if (connection->handshake_timer.data)
+	{
+		uv_timer_stop(&connection->handshake_timer);
+	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_connect, connection);
 }
 
@@ -1931,8 +1941,13 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 	{
 		uv_close((uv_handle_t*)&connection->tcp, _tf_ssb_connection_on_close);
 	}
+	if (connection->handshake_timer.data && !uv_is_closing((uv_handle_t*)&connection->handshake_timer))
+	{
+		uv_close((uv_handle_t*)&connection->handshake_timer, _tf_ssb_connection_on_close);
+	}
 
-	if (JS_IsUndefined(connection->object) && !connection->async.data && !connection->tcp.data && !connection->connect.data && connection->ref_count == 0)
+	if (JS_IsUndefined(connection->object) && !connection->async.data && !connection->tcp.data && !connection->connect.data && !connection->handshake_timer.data &&
+		connection->ref_count == 0)
 	{
 		tf_free(connection->message_requests);
 		connection->message_requests = NULL;
@@ -1956,7 +1971,7 @@ static void _tf_ssb_connection_on_close(uv_handle_t* handle)
 {
 	tf_ssb_connection_t* connection = handle->data;
 	handle->data = NULL;
-	if (connection)
+	if (connection && connection->closing)
 	{
 		_tf_ssb_connection_destroy(connection, "handle closed");
 	}
@@ -2643,6 +2658,15 @@ static void _tf_ssb_connection_process_message_async(uv_async_t* async)
 	}
 }
 
+static void _tf_ssb_connection_handshake_timer_callback(uv_timer_t* timer)
+{
+	tf_ssb_connection_t* connection = timer->data;
+	if (connection && connection->state != k_tf_ssb_state_verified && connection->state != k_tf_ssb_state_server_verified)
+	{
+		_tf_ssb_connection_destroy(connection, "handshake timeout");
+	}
+}
+
 tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, const struct sockaddr_in* addr, const uint8_t* public_key)
 {
 	for (tf_ssb_connection_t* connection = ssb->connections; connection; connection = connection->next)
@@ -2677,6 +2701,10 @@ tf_ssb_connection_t* tf_ssb_connection_create(tf_ssb_t* ssb, const char* host, c
 	connection->async.data = connection;
 	uv_async_init(ssb->loop, &connection->async, _tf_ssb_connection_process_message_async);
 
+	connection->handshake_timer.data = connection;
+	uv_timer_init(ssb->loop, &connection->handshake_timer);
+	uv_timer_start(&connection->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
+
 	connection->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(connection->object, connection);
 	char public_key_str[k_id_base64_len] = { 0 };
@@ -2737,6 +2765,10 @@ tf_ssb_connection_t* tf_ssb_connection_tunnel_create(tf_ssb_t* ssb, const char*
 	tunnel->async.data = tunnel;
 	uv_async_init(ssb->loop, &tunnel->async, _tf_ssb_connection_process_message_async);
 
+	tunnel->handshake_timer.data = tunnel;
+	uv_timer_init(ssb->loop, &tunnel->handshake_timer);
+	uv_timer_start(&tunnel->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
+
 	tunnel->object = JS_NewObjectClass(ssb->context, _connection_class_id);
 	JS_SetOpaque(tunnel->object, tunnel);
 	JS_SetPropertyStr(context, tunnel->object, "id", JS_NewString(context, target_id));
@@ -2859,6 +2891,10 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 		return;
 	}
 
+	connection->handshake_timer.data = connection;
+	uv_timer_init(ssb->loop, &connection->handshake_timer);
+	uv_timer_start(&connection->handshake_timer, _tf_ssb_connection_handshake_timer_callback, k_handshake_timeout_ms, 0);
+
 	struct sockaddr_storage addr = { 0 };
 	int size = sizeof(addr);
 	if (uv_tcp_getpeername(&connection->tcp, (struct sockaddr*)&addr, &size) == 0)
@@ -2870,10 +2906,10 @@ static void _tf_ssb_on_connection(uv_stream_t* stream, int status)
 	connection->next = ssb->connections;
 	ssb->connections = connection;
 	ssb->connections_count++;
-	_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_create, connection);
 
 	connection->state = k_tf_ssb_state_server_wait_hello;
 	_tf_ssb_connection_read_start(connection);
+	_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_create, connection);
 }
 
 static void _tf_ssb_send_broadcast(tf_ssb_t* ssb, struct sockaddr_in* address, struct sockaddr_in* netmask)

src/ssb.db.c

@@ -133,6 +133,7 @@ void tf_ssb_db_init(tf_ssb_t* ssb)
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_author_sequence_index ON messages (author, sequence)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_author_timestamp_index ON messages (author, timestamp)");
 	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_timestamp_index ON messages (timestamp)");
+	_tf_ssb_db_exec(db, "CREATE INDEX IF NOT EXISTS messages_type_timestamp_index ON messages (content ->> 'type', timestamp)");
 	_tf_ssb_db_exec(db,
 		"CREATE TABLE IF NOT EXISTS blobs ("
 		"  id TEXT PRIMARY KEY,"

src/version.h

@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.22"
+#define VERSION_NUMBER "0.0.23-wip"
-#define VERSION_NAME "Get born soon."
+#define VERSION_NAME "Me upon my pony on my boat."

tools/ssl-android

@@ -3,7 +3,6 @@
 if [ -z $ANDROID_NDK_ROOT ]; then
 	ANDROID_NDK_ROOT=~/Android/Sdk/ndk/26.1.10909125
 fi
-OPENSSL_VERSION=3.3.1
 
 API_LEVEL=24
 
@@ -11,7 +10,7 @@ BUILD_DIR=out/openssl_android_build
 
 BUILD_TARGETS="x86_64 x86 arm64-v8a armeabi-v7a"
 
-WORK_DIR=out/openssl-${OPENSSL_VERSION}-android
+WORK_DIR=out/openssl-android
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
 

tools/ssl-ios

@@ -1,14 +1,12 @@
 #!/bin/bash
 
-OPENSSL_VERSION=3.3.1
-
 API_LEVEL=28
 
 BUILD_DIR=out/openssl_ios_build
 
 BUILD_TARGETS="ios64-xcrun iossimulator-xcrun"
 
-WORK_DIR=out/openssl-${OPENSSL_VERSION}-ios
+WORK_DIR=out/openssl-ios
 rm -rf $WORK_DIR
 cp -af deps/openssl_src/ $WORK_DIR
 

tools/ssl-mingw64

@@ -1,14 +1,12 @@
 #!/bin/bash
 
-OPENSSL_VERSION=3.3.1
-
 API_LEVEL=24
 
 BUILD_DIR=out/openssl_mingw64_build
 
 BUILD_TARGETS="mingw64"
 
-WORK_DIR=out/openssl-${OPENSSL_VERSION}-mingw64
+WORK_DIR=out/openssl-mingw64
 rm -rf $WORK_DIR
 cp -arf deps/openssl_src/ $WORK_DIR
 
@@ -65,9 +63,9 @@ build_the_thing() {
         -DOPENSSL_SMALL_FOOTPRINT"
     echo "./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS" && \
     ./Configure $SSL_TARGET $OPTIONS $GLOBAL_OPTIONS && \
-    make clean && \
+    make -s clean && \
-    make build_generated && \
+    make -s build_generated && \
-    make libcrypto.a libssl.a || exit 128
+    make -s libcrypto.a libssl.a || exit 128
 }
 
 for build_target in $BUILD_TARGETS