nix(module): module boilerplate

nix (test): fix build
2025-02-20 10:27:18 +01:00 · 2025-02-20 10:17:14 +01:00
84 changed files with 86 additions and 115 deletions
--- a/6
+++ b/6
@@ -17,8 +17,8 @@ MAKEFLAGS += --no-builtin-rules
 ## ANDROID_SDK := Path to the Android SDK.

 VERSION_CODE := 33
-VERSION_CODE_IOS := 9
-VERSION_NUMBER := 0.0.28
+VERSION_CODE_IOS := 8
+VERSION_NUMBER := 0.0.28-wip
 VERSION_NAME := This program kills fascists.

 IPHONEOS_VERSION_MIN=14.0
@@ -1419,7 +1419,7 @@ dist-ios: iosrelease-app
 	mkdir -p out/Payload/tildefriends.app
 	cp -avR out/tildefriends-iosrelease.app/* out/Payload/tildefriends.app/
 	cp src/ios/tildefriends.png out/Payload/tildefriends.app/
-	xcrun -sdk iphoneos actool --compile out/Payload/tildefriends.app/ --platform iphoneos --minimum-deployment-target $(IPHONEOS_VERSION_MIN) --app-icon AppIcon src/ios/icons/Assets.xcassets src/ios/icons/*.png --output-partial-info-plist out/actool.plist
+	cp src/ios/icons/Assets.car out/Payload/tildefriends.app/
 	cp src/ios/distribution.mobileprovision out/Payload/tildefriends.app/embedded.mobileprovision
 	xcrun -sdk iphoneos codesign -f -s 'Apple Distribution' --entitlements src/ios/Entitlements.plist --generate-entitlement-der out/Payload/tildefriends.app
 	cd out; zip -r tildefriends.ipa Payload; cd ..
--- a/apps/room/app.js
+++ b/apps/room/app.js
@@ -1,9 +1,7 @@
 async function main() {
-	print(core.url);
-	let host = core.url.match(/.*?\/\/([^:/]*)/)[1];
-	let port = await ssb.port();
+	let host = core.url.match(/.*\/\/(.*?)\//)[1];
 	let id = (await ssb.getServerIdentity()).substring(1);
-	let room = `net:${host}:${port}~shs:${id}:SSB+Room+SK3TLYC2T86EHQCUHBUHASCASE18JBV24=`;
+	let room = `net:${host}:${ssb.port}~shs:${id}:SSB+Room+SK3TLYC2T86EHQCUHBUHASCASE18JBV24=`;
 	await app.setDocument(`
 		<body style="color: #fff">
 			<h1>Server</h1>
--- a/default.nix
+++ b/default.nix
@@ -25,14 +25,14 @@
 }:
 pkgs.stdenv.mkDerivation rec {
  pname = "tildefriends";
-  version = "0.0.27.1";
+  version = "0.0.28";

  src = pkgs.fetchFromGitea {
    domain = "dev.tildefriends.net";
    owner = "cory";
    repo = "tildefriends";
-    rev = "v${version}";
-    hash = "sha256-3t1m9ZomQF3DteWyALJWrnCq0EAROEK8shKXh6Ao38c=";
+    rev = "f02423d0846fefd5ab21fa4542fb77ce5714547c";
+    hash = "sha256-QyM7wmViXJc4r8uTu4oE/HO3Z9tzNbFIX2+AOTQz9ZY=";
    fetchSubmodules = true;
  };

--- a/deps/codemirror/cm6.js
+++ b/deps/codemirror/cm6.js
--- a/deps/codemirror_src/package-lock.json
+++ b/deps/codemirror_src/package-lock.json
@@ -115,9 +115,9 @@
      }
    },
    "node_modules/@codemirror/search": {
-      "version": "6.5.10",
-      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.10.tgz",
-      "integrity": "sha512-RMdPdmsrUf53pb2VwflKGHEe1XVM07hI7vV2ntgw1dmqhimpatSJKva4VA9h4TLUDOD4EIF02201oZurpnEFsg==",
+      "version": "6.5.9",
+      "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.9.tgz",
+      "integrity": "sha512-7DdQ9aaZMMxuWB1u6IIFWWuK9NocVZwvo4nG8QjJTS6oZGvteoLSiXw3EbVZVlO08Ri2ltO89JVInMpfcJxhtg==",
      "dependencies": {
        "@codemirror/state": "^6.0.0",
        "@codemirror/view": "^6.0.0",
--- a/docs/release_checklist.md
+++ b/docs/release_checklist.md
@@ -4,8 +4,7 @@
 - run the tests
 - format + prettier
 - update metadata/en-US/changelogs
- git tag v1.2.3
- git tag -f latest_release
+- git tag
 - push
 - make a release on gitea
 - upload the artifacts
--- a/flake.nix
+++ b/flake.nix
@@ -35,5 +35,27 @@
            graphviz
          ];
        };
+
+        nixosModules.default = {
+          config,
+          lib,
+          ...
+        }: let
+          # Shorter name to access final settings a
+          # user of hello.nix module HAS ACTUALLY SET.
+          # cfg is a typical convention.
+          cfg = config.services.tildefriends;
+        in {
+          options.services.tildefriends = {
+            enable = lib.mkEnableOption "Enable Tilde Friends";
+          };
+
+          config = lib.mkIf cfg.enable {
+            systemd.services.tildefriends = {
+              wantedBy = ["multi-user.target"];
+              serviceConfig.ExecStart = "${pkgs.tildefriends}/bin/tildefriends";
+            };
+          };
+        };
      });
 }
--- a/metadata/en-US/changelogs/33.txt
+++ b/metadata/en-US/changelogs/33.txt
@@ -1,5 +1,3 @@
-* Allow specifying all global settings from the command-line (CLI usage changed).
-* Replication improvements.
 * An iOS build is on TestFlight.
 * macOS targets are debug and release like everywhere else.
 * Running from a subdirectory is fine.
@@ -7,9 +5,10 @@
 * Invite fixes.
 * Follow/block UI fixes.
 * Mobile automatically logs in.
-* Updates:
+* Allow specifying all global settings from the command-line.
+* UpdateS:
  * CodeMirror
  * OpenSSL 3.4.1
  * libbacktrace
-  * speedscope 1.22.2
  * sqlite 3.49.1
+  * speedscope 1.22.2
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,9 +11,9 @@
 			}
 		},
 		"node_modules/prettier": {
-			"version": "3.5.2",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.2.tgz",
-			"integrity": "sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==",
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.1.tgz",
+			"integrity": "sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==",
 			"bin": {
 				"prettier": "bin/prettier.cjs"
 			},
--- a/run.log
+++ b/run.log
--- a/src/android/AndroidManifest.xml
+++ b/src/android/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.unprompted.tildefriends"
 	android:versionCode="33"
-	android:versionName="0.0.28">
+	android:versionName="0.0.28-wip">
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<application
--- a/src/ios/Info.plist
+++ b/src/ios/Info.plist
@@ -19,7 +19,7 @@
 		<string>iPhoneOS</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>8</string>
 	<key>DTPlatformName</key>
 	<string>iphoneos</string>
 	<key>LSRequiresIPhoneOS</key>
--- a/src/ios/icons/Assets.car
+++ b/src/ios/icons/Assets.car
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/100.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/100.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/1024.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/1024.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/114.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/114.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/120.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/120.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/144.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/144.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/152.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/152.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/167.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/167.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/180.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/180.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/20.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/20.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/29.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/29.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/40.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/40.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/50.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/50.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/57.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/57.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/58.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/58.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/60.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/60.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/72.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/72.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/76.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/76.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/80.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/80.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/87.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/87.png
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1 +1 @@
-{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
+{"images":[{"idiom":"ios-marketing","scale":"1x","size":"1024x1024","filename":"icon-ios-marketing-1-1024-1024.png"}],"info":{"author":"xcode","version":1}}
--- a/src/ios/icons/Assets.xcassets/AppIcon.appiconset/icon-ios-marketing-1-1024-1024.png
+++ b/src/ios/icons/Assets.xcassets/AppIcon.appiconset/icon-ios-marketing-1-1024-1024.png
--- a/src/ios/icons/Assets.xcassets/Contents.json
+++ b/src/ios/icons/Assets.xcassets/Contents.json
@@ -0,0 +1 @@
+{"info": {"version": 1, "author": "xcode"}}
--- a/src/ios/icons/android/mipmap-hdpi.png
+++ b/src/ios/icons/android/mipmap-hdpi.png
--- a/src/ios/icons/android/mipmap-ldpi.png
+++ b/src/ios/icons/android/mipmap-ldpi.png
--- a/src/ios/icons/android/mipmap-mdpi.png
+++ b/src/ios/icons/android/mipmap-mdpi.png
--- a/src/ios/icons/android/mipmap-xhdpi.png
+++ b/src/ios/icons/android/mipmap-xhdpi.png
--- a/src/ios/icons/android/mipmap-xxhdpi.png
+++ b/src/ios/icons/android/mipmap-xxhdpi.png
--- a/src/ios/icons/android/mipmap-xxxhdpi.png
+++ b/src/ios/icons/android/mipmap-xxxhdpi.png
--- a/src/ios/icons/appstore.png
+++ b/src/ios/icons/appstore.png
--- a/src/ios/icons/ios/100.png
+++ b/src/ios/icons/ios/100.png
--- a/src/ios/icons/ios/114.png
+++ b/src/ios/icons/ios/114.png
--- a/src/ios/icons/ios/128.png
+++ b/src/ios/icons/ios/128.png
--- a/src/ios/icons/ios/16.png
+++ b/src/ios/icons/ios/16.png
--- a/src/ios/icons/ios/172.png
+++ b/src/ios/icons/ios/172.png
--- a/src/ios/icons/ios/180.png
+++ b/src/ios/icons/ios/180.png
--- a/src/ios/icons/ios/196.png
+++ b/src/ios/icons/ios/196.png
--- a/src/ios/icons/ios/216.png
+++ b/src/ios/icons/ios/216.png
--- a/src/ios/icons/ios/256.png
+++ b/src/ios/icons/ios/256.png
--- a/src/ios/icons/ios/32.png
+++ b/src/ios/icons/ios/32.png
--- a/src/ios/icons/ios/48.png
+++ b/src/ios/icons/ios/48.png
--- a/src/ios/icons/ios/50.png
+++ b/src/ios/icons/ios/50.png
--- a/src/ios/icons/ios/512.png
+++ b/src/ios/icons/ios/512.png
--- a/src/ios/icons/ios/55.png
+++ b/src/ios/icons/ios/55.png
--- a/src/ios/icons/ios/64.png
+++ b/src/ios/icons/ios/64.png
--- a/src/ios/icons/ios/88.png
+++ b/src/ios/icons/ios/88.png
--- a/src/ios/icons/ios/icon-120.png
+++ b/src/ios/icons/ios/icon-120.png
--- a/src/ios/icons/ios/icon-144.png
+++ b/src/ios/icons/ios/icon-144.png
--- a/src/ios/icons/ios/icon-152.png
+++ b/src/ios/icons/ios/icon-152.png
--- a/src/ios/icons/ios/icon-167.png
+++ b/src/ios/icons/ios/icon-167.png
--- a/src/ios/icons/ios/icon-72.png
+++ b/src/ios/icons/ios/icon-72.png
--- a/src/ios/icons/ios/icon-76.png
+++ b/src/ios/icons/ios/icon-76.png
--- a/src/ios/icons/ios/icon-notification.png
+++ b/src/ios/icons/ios/icon-notification.png
--- a/src/ios/icons/ios/icon-notification@2x.png
+++ b/src/ios/icons/ios/icon-notification@2x.png
--- a/src/ios/icons/ios/icon-notification@3x.png
+++ b/src/ios/icons/ios/icon-notification@3x.png
--- a/src/ios/icons/ios/icon-small-120.png
+++ b/src/ios/icons/ios/icon-small-120.png
--- a/src/ios/icons/ios/icon-small-40.png
+++ b/src/ios/icons/ios/icon-small-40.png
--- a/src/ios/icons/ios/icon-small-80.png
+++ b/src/ios/icons/ios/icon-small-80.png
--- a/src/ios/icons/ios/icon-small.png
+++ b/src/ios/icons/ios/icon-small.png
--- a/src/ios/icons/ios/icon-small@2x.png
+++ b/src/ios/icons/ios/icon-small@2x.png
--- a/src/ios/icons/ios/icon-small@3x.png
+++ b/src/ios/icons/ios/icon-small@3x.png
--- a/src/ios/icons/ios/icon-store.png
+++ b/src/ios/icons/ios/icon-store.png
--- a/src/ios/icons/ios/icon.png
+++ b/src/ios/icons/ios/icon.png
--- a/src/ios/icons/ios/icon@2x.png
+++ b/src/ios/icons/ios/icon@2x.png
--- a/src/ios/icons/playstore.png
+++ b/src/ios/icons/playstore.png
--- a/src/ios/icons/uploaded.png
+++ b/src/ios/icons/uploaded.png
--- a/src/main.c
+++ b/src/main.c
@@ -1057,7 +1057,7 @@ static int _tf_command_get_profile(const char* file, int argc, char* argv[])
 	sqlite3_close(db);
 	tf_free((void*)profile);
 	tf_free((void*)default_db_path);
-	return profile != NULL ? EXIT_SUCCESS : EXIT_FAILURE;
+	return profile != NULL;
 }

 static int _tf_command_get_contacts(const char* file, int argc, char* argv[])
@@ -1299,12 +1299,10 @@ static int _tf_run_task(const tf_run_args_t* args, int index)
 	sqlite3* db = tf_ssb_acquire_db_reader(ssb);
 	int64_t http_port = 0;
 	int64_t https_port = 0;
-	char out_http_port_file[512] = "";
 	tf_ssb_db_get_global_setting_int64(db, "http_port", &http_port);
 	tf_ssb_db_get_global_setting_int64(db, "https_port", &https_port);
-	tf_ssb_db_get_global_setting_string(db, "out_http_port_file", out_http_port_file, sizeof(out_http_port_file));
 	tf_ssb_release_db_reader(ssb, db);
-	if (http_port || https_port || *out_http_port_file)
+	if (http_port || https_port)
 	{
 		if (args->zip)
 		{
--- a/src/ssb.c
+++ b/src/ssb.c
@@ -746,16 +746,13 @@ static bool _tf_ssb_connection_get_request_callback(
 			*out_name = request->name;
 		}
 		request->last_active = uv_now(connection->ssb->loop);
-		if (tf_ssb_connection_is_connected(connection) && !tf_ssb_connection_is_closing(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
+		if (connection->flags & k_tf_ssb_connect_flag_one_shot)
 		{
-			if ((connection->flags & k_tf_ssb_connect_flag_one_shot))
-			{
-				uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
-			}
-			if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
-			{
-				uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
-			}
+			uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
+		}
+		if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+		{
+			uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
 		}
 		return true;
 	}
@@ -802,16 +799,13 @@ void tf_ssb_connection_add_request(tf_ssb_connection_t* connection, int32_t requ
 		connection->requests_count++;
 		connection->ssb->request_count++;
 	}
-	if (tf_ssb_connection_is_connected(connection) && !tf_ssb_connection_is_closing(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)))
+	if (connection->flags & k_tf_ssb_connect_flag_one_shot)
 	{
-		if (connection->flags & k_tf_ssb_connect_flag_one_shot)
-		{
-			uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
-		}
-		if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
-		{
-			uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
-		}
+		uv_timer_start(&connection->activity_timer, _tf_ssb_connection_activity_timer, k_activity_timeout_ms, 0);
+	}
+	if (uv_timer_get_due_in(&connection->ssb->request_activity_timer) == 0)
+	{
+		uv_timer_start(&connection->ssb->request_activity_timer, _tf_ssb_request_activity_timer, k_rpc_active_ms, 0);
 	}
 	_tf_ssb_notify_connections_changed(connection->ssb, k_tf_ssb_change_update, connection);
 	connection->last_notified_active = now_ms;
@@ -2003,7 +1997,7 @@ static void _tf_ssb_connection_destroy(tf_ssb_connection_t* connection, const ch
 	if (!connection->is_closing)
 	{
 		connection->is_closing = true;
-		uv_timer_start(&connection->linger_timer, _tf_ssb_connection_linger_timer, ssb->shutting_down ? 0 : 5000, 0);
+		uv_timer_start(&connection->linger_timer, _tf_ssb_connection_linger_timer, 5000, 0);
 		_tf_ssb_notify_connections_changed(ssb, k_tf_ssb_change_update, connection);
 	}
 	if (connection->connect_callback)
--- a/src/ssb.db.c
+++ b/src/ssb.db.c
@@ -1277,7 +1277,7 @@ static int _following_compare(const void* a, const void* b)

 static bool _has_following_entry(const char* id, following_t** list, int count)
 {
-	return count ? bsearch(id, list, count, sizeof(following_t*), _following_compare) != NULL : false;
+	return count ? bsearch(id, list, count, sizeof(following_t*), _following_compare) != 0 : false;
 }

 static bool _add_following_entry(following_t*** list, int* count, following_t* add)
@@ -1432,22 +1432,21 @@ static void _populate_follows_and_blocks(tf_ssb_t* ssb, following_t* entry, foll
 static void _get_following(
 	tf_ssb_t* ssb, following_t* entry, following_t*** following, int* following_count, int depth, int max_depth, block_node_t* active_blocks, bool include_blocks)
 {
-	int old_depth = entry->depth;
 	entry->depth = tf_min(depth, entry->depth);
-	if (depth < max_depth && depth < old_depth)
+	if (depth < max_depth && !entry->populated && !_is_blocked_by_active_blocks(entry->id, active_blocks))
 	{
-		if (!_is_blocked_by_active_blocks(entry->id, active_blocks))
-		{
-			if (!entry->populated)
-			{
-				entry->populated = true;
-				_populate_follows_and_blocks(ssb, entry, following, following_count, active_blocks, include_blocks);
-			}
+		entry->populated = true;
+		_populate_follows_and_blocks(ssb, entry, following, following_count, active_blocks, include_blocks);

+		if (depth < max_depth)
+		{
 			block_node_t blocks = { .entry = entry, .parent = active_blocks };
 			for (int i = 0; i < entry->following_count; i++)
 			{
-				_get_following(ssb, entry->following[i], following, following_count, depth + 1, max_depth, &blocks, include_blocks);
+				if (!_has_following_entry(entry->following[i]->id, entry->blocking, entry->blocking_count))
+				{
+					_get_following(ssb, entry->following[i], following, following_count, depth + 1, max_depth, &blocks, include_blocks);
+				}
 			}
 		}
 	}
--- a/src/ssb.rpc.c
+++ b/src/ssb.rpc.c
@@ -83,19 +83,6 @@ static void _tf_ssb_rpc_blobs_get_after_work(tf_ssb_connection_t* connection, in
 	tf_free(work);
 }

-static void _tf_ssb_blobs_get_callback(tf_ssb_connection_t* connection, bool skip, void* user_data)
-{
-	blobs_get_work_t* work = user_data;
-	if (!skip)
-	{
-		tf_ssb_connection_run_work(connection, _tf_ssb_rpc_blobs_get_work, _tf_ssb_rpc_blobs_get_after_work, work);
-	}
-	else
-	{
-		_tf_ssb_rpc_blobs_get_after_work(connection, -1, work);
-	}
-}
-
 static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
 	if (flags & k_ssb_rpc_flag_end_error)
@@ -135,7 +122,7 @@ static void _tf_ssb_rpc_blobs_get(tf_ssb_connection_t* connection, uint8_t flags
 			.request_number = request_number,
 		};
 		snprintf(work->id, sizeof(work->id), "%s", id);
-		tf_ssb_connection_schedule_idle(connection, id, _tf_ssb_blobs_get_callback, work);
+		tf_ssb_connection_run_work(connection, _tf_ssb_rpc_blobs_get_work, _tf_ssb_rpc_blobs_get_after_work, work);

 		JS_FreeCString(context, id);
 		JS_FreeValue(context, arg);
@@ -1114,23 +1101,6 @@ static void _tf_ssb_rpc_ebt_replicate_resend_clock(tf_ssb_connection_t* connecti
 	}
 }

-static void _tf_ssb_rpc_ebt_schedule_send_clock(tf_ssb_connection_t* connection)
-{
-	tf_ssb_ebt_t* ebt = tf_ssb_connection_get_ebt(connection);
-	int pending = tf_ssb_ebt_get_send_clock_pending(ebt) + 1;
-	tf_ssb_ebt_set_send_clock_pending(ebt, pending);
-	if (pending == 1)
-	{
-		resend_clock_t* resend = tf_malloc(sizeof(resend_clock_t));
-		*resend = (resend_clock_t) {
-			.connection = connection,
-			.request_number = -tf_ssb_connection_get_ebt_request_number(connection),
-			.pending = pending,
-		};
-		tf_ssb_connection_schedule_idle(connection, "ebt.clock", _tf_ssb_rpc_ebt_replicate_resend_clock, resend);
-	}
-}
-
 static void _tf_ssb_rpc_ebt_replicate(tf_ssb_connection_t* connection, uint8_t flags, int32_t request_number, JSValue args, const uint8_t* message, size_t size, void* user_data)
 {
 	tf_ssb_t* ssb = tf_ssb_connection_get_ssb(connection);
@@ -1170,7 +1140,18 @@ static void _tf_ssb_rpc_ebt_replicate(tf_ssb_connection_t* connection, uint8_t f

 	if (resend_clock && tf_ssb_connection_is_connected(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)) && !tf_ssb_connection_is_closing(connection))
 	{
-		_tf_ssb_rpc_ebt_schedule_send_clock(connection);
+		int pending = tf_ssb_ebt_get_send_clock_pending(ebt) + 1;
+		tf_ssb_ebt_set_send_clock_pending(ebt, pending);
+		if (pending == 1)
+		{
+			resend_clock_t* resend = tf_malloc(sizeof(resend_clock_t));
+			*resend = (resend_clock_t) {
+				.connection = connection,
+				.request_number = request_number,
+				.pending = pending,
+			};
+			tf_ssb_connection_schedule_idle(connection, "ebt.clock", _tf_ssb_rpc_ebt_replicate_resend_clock, resend);
+		}
 	}
 	JS_FreeValue(context, name);
 	JS_FreeValue(context, author);
@@ -1874,25 +1855,10 @@ static void _tf_ssb_rpc_invite_use(tf_ssb_connection_t* connection, uint8_t flag
 	tf_ssb_connection_run_work(connection, _tf_ssb_rpc_invite_use_work, _tf_ssb_rpc_invite_use_after_work, work);
 }

-static void _tf_ssb_rpc_message_added_callback(tf_ssb_t* ssb, const char* id, void* user_data)
-{
-	tf_ssb_connection_t* connections[256];
-	int count = tf_ssb_get_connections(ssb, connections, tf_countof(connections));
-	for (int i = 0; i < count; i++)
-	{
-		tf_ssb_connection_t* connection = connections[i];
-		if (tf_ssb_connection_is_connected(connection) && !tf_ssb_is_shutting_down(tf_ssb_connection_get_ssb(connection)) && !tf_ssb_connection_is_closing(connection))
-		{
-			_tf_ssb_rpc_ebt_schedule_send_clock(connections[i]);
-		}
-	}
-}
-
 void tf_ssb_rpc_register(tf_ssb_t* ssb)
 {
 	tf_ssb_add_connections_changed_callback(ssb, _tf_ssb_rpc_connections_changed_callback, NULL, NULL);
 	tf_ssb_add_broadcasts_changed_callback(ssb, _tf_ssb_rpc_broadcasts_changed_callback, NULL, NULL);
-	tf_ssb_add_message_added_callback(ssb, _tf_ssb_rpc_message_added_callback, NULL, NULL);
 	tf_ssb_add_rpc_callback(ssb, "gossip.ping", _tf_ssb_rpc_gossip_ping, NULL, NULL); /* DUPLEX */
 	tf_ssb_add_rpc_callback(ssb, "blobs.get", _tf_ssb_rpc_blobs_get, NULL, NULL); /* SOURCE */
 	tf_ssb_add_rpc_callback(ssb, "blobs.has", _tf_ssb_rpc_blobs_has, NULL, NULL); /* ASYNC */
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
-#define VERSION_NUMBER "0.0.28"
+#define VERSION_NUMBER "0.0.28-wip"
 #define VERSION_NAME "This program kills fascists."
--- a/tools/buttfeed.py
+++ b/tools/buttfeed.py
@@ -25,7 +25,6 @@ def fix_title(entry):
    return entry.title.split('\n')[0]

 def get_entries():
-    seen = set()
    results = []
    for name, url in k_feeds.items():
        feed = feedparser.parse(url)
@@ -42,13 +41,9 @@ def get_entries():
                    continue
            if entry.summary.startswith('<a href='):
                for m in re.findall(r'<a href="(.*?)">.*?</a>$\s*^([^\n]+)$', entry.summary, re.S | re.M):
-                    if not m[0] in seen:
-                        seen.add(m[0])
-                        results.append((time.mktime(entry.get('updated_parsed')), name, m[0], m[1]))
+                    results.append((time.mktime(entry.get('updated_parsed')), name, m[0], m[1]))
            else:
-                if not entry.link in seen:
-                    seen.add(entry.link)
-                    results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, entry.title.split('\n')[0]))
+                results.append((time.mktime(entry.get('updated_parsed')), name, entry.link, entry.title.split('\n')[0]))
    results.sort()
    results.reverse()
    return results
Author	SHA1	Message	Date
Tasia Iso	d67e47ae4b	nix(module): module boilerplate	2025-02-20 10:27:18 +01:00
Tasia Iso	b43b8da9ab	nix (test): fix build	2025-02-20 10:17:14 +01:00
				`@@ -0,0 +1 @@`
				`{"info": {"version": 1, "author": "xcode"}}`