From cff3c27729c5b8e5c042fb323027f9d92431ac56 Mon Sep 17 00:00:00 2001 From: timedout Date: Fri, 24 Oct 2025 21:32:42 +0100 Subject: [PATCH] fix: Bump ruwuma, export new route, config loading --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 2 +- src/api/server/edutypes.rs | 19 ++++++++++--------- src/api/server/mod.rs | 1 + 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7052a3afb..a9242baaa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4043,7 +4043,7 @@ checksum = "88f8660c1ff60292143c98d08fc6e2f654d722db50410e3f3797d40baaf9d8f3" [[package]] name = "ruma" version = "0.10.1" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "assign", "js_int", @@ -4063,7 +4063,7 @@ dependencies = [ [[package]] name = "ruma-appservice-api" version = "0.10.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "js_int", "ruma-common", @@ -4075,7 +4075,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.18.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "as_variant", "assign", @@ -4098,7 +4098,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.13.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "as_variant", "base64 0.22.1", @@ -4130,7 +4130,7 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.28.1" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "as_variant", "indexmap 2.11.4", @@ -4155,7 +4155,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "bytes", "headers", @@ -4177,7 +4177,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.9.5" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "js_int", "thiserror 2.0.17", @@ -4186,7 +4186,7 @@ dependencies = [ [[package]] name = "ruma-identity-service-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "js_int", "ruma-common", @@ -4196,7 +4196,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.13.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "cfg-if", "proc-macro-crate", @@ -4211,7 +4211,7 @@ dependencies = [ [[package]] name = "ruma-push-gateway-api" version = "0.9.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "js_int", "ruma-common", @@ -4223,7 +4223,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.15.0" -source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=d18823471ab3c09e77ff03eea346d4c07e572654#d18823471ab3c09e77ff03eea346d4c07e572654" +source = "git+https://forgejo.ellis.link/continuwuation/ruwuma?rev=50b2a91b2ab8f9830eea80b9911e11234e0eac66#50b2a91b2ab8f9830eea80b9911e11234e0eac66" dependencies = [ "base64 0.22.1", "ed25519-dalek", diff --git a/Cargo.toml b/Cargo.toml index 3a56205f0..e1a22e872 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -351,7 +351,7 @@ version = "0.1.2" # Used for matrix spec type definitions and helpers [workspace.dependencies.ruma] git = "https://forgejo.ellis.link/continuwuation/ruwuma" -rev = "d18823471ab3c09e77ff03eea346d4c07e572654" +rev = "50b2a91b2ab8f9830eea80b9911e11234e0eac66" features = [ "compat", "rand", diff --git a/src/api/server/edutypes.rs b/src/api/server/edutypes.rs index 963d76234..ee3091a7d 100644 --- a/src/api/server/edutypes.rs +++ b/src/api/server/edutypes.rs @@ -1,5 +1,6 @@ -use conduwuit::{Config, Result}; -use ruma::{api::federation::edutypes::get_edutypes}; +use axum::extract::State; +use conduwuit::Result; +use ruma::api::federation::edutypes::get_edutypes; use crate::Ruma; @@ -7,12 +8,12 @@ use crate::Ruma; /// /// Lists EDU types we wish to receive pub(crate) async fn get_edutypes_route( - body: Ruma, - config: &Config, -) -> Result { - Ok(get_edutypes::v1::Response { - typing: config.allow_incoming_typing, - presence: config.allow_incoming_presence, - receipt: config.allow_incoming_read_receipts, + State(services): State, + _body: Ruma, +) -> Result { + Ok(get_edutypes::unstable::Response { + typing: services.config.allow_incoming_typing, + presence: services.config.allow_incoming_presence, + receipt: services.config.allow_incoming_read_receipts, }) } diff --git a/src/api/server/mod.rs b/src/api/server/mod.rs index d2118599d..eaf03ce22 100644 --- a/src/api/server/mod.rs +++ b/src/api/server/mod.rs @@ -1,4 +1,5 @@ pub(super) mod backfill; +pub(super) mod edutypes; pub(super) mod event; pub(super) mod event_auth; pub(super) mod get_missing_events;