From 443bb244fcf30c73fc9a217c57dfa525c5c62dd3 Mon Sep 17 00:00:00 2001 From: strawberry Date: Sun, 25 Feb 2024 16:08:40 -0500 Subject: [PATCH] bump ruma fork Signed-off-by: strawberry --- Cargo.lock | 24 ++++++++++++------------ Cargo.toml | 2 +- DIFFERENCES.md | 2 -- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3d76404..7fa5896c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2092,7 +2092,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.9.4" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "assign", "js_int", @@ -2111,7 +2111,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.9.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "js_int", "ruma-common", @@ -2123,7 +2123,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.17.4" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "as_variant", "assign", @@ -2142,7 +2142,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.12.1" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "as_variant", "base64", @@ -2170,7 +2170,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.27.11" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "as_variant", "indexmap", @@ -2192,7 +2192,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "js_int", "ruma-common", @@ -2204,7 +2204,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.3" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "js_int", "thiserror", @@ -2213,7 +2213,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "js_int", "ruma-common", @@ -2223,7 +2223,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.12.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "once_cell", "proc-macro-crate", @@ -2238,7 +2238,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.8.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "js_int", "ruma-common", @@ -2250,7 +2250,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.14.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "base64", "ed25519-dalek", @@ -2266,7 +2266,7 @@ dependencies = [ [[package]] name = "ruma-state-res" version = "0.10.0" -source = "git+https://github.com/girlbossceo/ruma?rev=3b4946d66e45cbf0bf522d6f76e16632316254c6#3b4946d66e45cbf0bf522d6f76e16632316254c6" +source = "git+https://github.com/girlbossceo/ruma?rev=9f243f1e89bd2ef52dde521c34a791fee7b36d5a#9f243f1e89bd2ef52dde521c34a791fee7b36d5a" dependencies = [ "itertools 0.11.0", "js_int", diff --git a/Cargo.toml b/Cargo.toml index 30e734f4..dca443f5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ tower-http = { version = "0.4.4", features = ["add-extension", "cors", "sensitiv # Used for matrix spec type definitions and helpers #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] } #ruma = { git = "https://github.com/ruma/ruma", rev = "4d9f754657a099df8e61533787b8eebd12946435", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] } -ruma = { git = "https://github.com/girlbossceo/ruma", rev = "3b4946d66e45cbf0bf522d6f76e16632316254c6", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] } +ruma = { git = "https://github.com/girlbossceo/ruma", rev = "9f243f1e89bd2ef52dde521c34a791fee7b36d5a", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified", "unstable-msc2870", "unstable-msc3061", "unstable-msc2867", "unstable-extensible-events"] } #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-msc3575", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] } # Async runtime and utilities diff --git a/DIFFERENCES.md b/DIFFERENCES.md index c72f9fc9..9158a980 100644 --- a/DIFFERENCES.md +++ b/DIFFERENCES.md @@ -16,7 +16,6 @@ - Explicit startup error/warning if your configuration allows open registration without a token or such like Synapse - Improved RocksDB defaults to use new features that help with performance significantly, uses settings tailored to SSDs, and a conduwuit setting to tell RocksDB to use settings that are tailored to HDDs or slow spinning rust storage. - Updated Ruma to latest commit where possible, and add some unstable MSCs (some still require an implementation though) -- conduwuit allows MXIDs with `+` in them (thanks to Ruma update) - Revamped admin room infrastructure and commands (via upstream MR) - Admin room commands to delete room aliases and unpublish rooms from our room directory (via upstream MR) - Make spaces/hierarchy cache use cache_capacity_modifier instead of hardcoded small value @@ -66,7 +65,6 @@ - URL preview support (via upstream MR) with various improvements - Increased graceful shutdown timeout from a low 60 seconds to 180 seconds to avoid killing connections and let the remaining ones finish processing, and ask systemd for more time to shutdown if needed to prevent systemd's default [`TimeoutStopSec=`](https://www.freedesktop.org/software/systemd/man/latest/systemd.service.html#TimeoutStopSec=) of 90 seconds from killing conduwuit - Bumped default max_concurrent_requests to 500 -- Add support for the deprecated `user` identifier field for all `/login` requests - Query parameter `?format=event|content` for returning either the room state event's content (default) for the full room state event on ` /_matrix/client/v3/rooms/{roomId}/state/{eventType}[/{stateKey}]` requests (see https://github.com/matrix-org/matrix-spec/issues/1047) - Add admin commands for banning (blocking) room IDs from our local users joining (admins are always allowed) and evicts all our local users from that room, in addition to bulk room banning support, as a moderation feature - Add admin command to delete media via a specific MXC (currently only deletes that MXC only, not the thumbnail with it as they are entirely different MXC URLs). This deletes the MXC from our database, and the file locally.