Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Fix remaining errors in api/ (and temporarily switch to a fork of ruma)

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:56 -04:00
parent 7a58074a0d
commit 3ad7c3b30d
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+11 -11
View File
@@ -4640,7 +4640,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@@ -4659,7 +4659,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.14.1" version = "0.14.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4671,7 +4671,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.22.1" version = "0.22.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@@ -4693,7 +4693,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.17.1" version = "0.17.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@@ -4726,7 +4726,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.32.1" version = "0.32.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap", "indexmap",
@@ -4747,7 +4747,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.13.1" version = "0.13.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"bytes", "bytes",
"headers", "headers",
@@ -4770,7 +4770,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.12.0" version = "0.12.0"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.18", "thiserror 2.0.18",
@@ -4779,7 +4779,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.17.1" version = "0.17.1"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"cfg-if", "cfg-if",
@@ -4795,7 +4795,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@@ -4807,7 +4807,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.19.0" version = "0.19.0"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@@ -4823,7 +4823,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.15.0" version = "0.15.0"
source = "git+https://github.com/ruma/ruma.git?rev=ce4708a2727f18d42ba83b1c262142e6ffd0f545#ce4708a2727f18d42ba83b1c262142e6ffd0f545" source = "git+https://github.com/gingershaped/ruwuma.git?rev=ce7ea072a3d47f1e674bb4badcb2af15b30e4088#ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
Cargo.toml
+3 -2
View File
@@ -348,8 +348,8 @@ version = "1.1.1"
# Used for matrix spec type definitions and helpers # Used for matrix spec type definitions and helpers
[workspace.dependencies.ruma] [workspace.dependencies.ruma]
# version = "0.14.1" # version = "0.14.1"
git = "https://github.com/ruma/ruma.git" git = "https://github.com/gingershaped/ruwuma.git"
rev = "ce4708a2727f18d42ba83b1c262142e6ffd0f545" rev = "ce7ea072a3d47f1e674bb4badcb2af15b30e4088"
features = [ features = [
"appservice-api-c", "appservice-api-c",
"client-api", "client-api",
@@ -378,6 +378,7 @@ features = [
"unstable-msc4195", "unstable-msc4195",
"unstable-msc4203", "unstable-msc4203",
"unstable-msc4310", "unstable-msc4310",
"unstable-msc4373",
"unstable-msc4380", "unstable-msc4380",
"unstable-msc4143", "unstable-msc4143",
"unstable-msc4406", "unstable-msc4406",
src/api/server/edutypes.rs
+5 -5
View File
@@ -1,6 +1,6 @@
use axum::extract::State; use axum::extract::State;
use conduwuit::Result; use conduwuit::Result;
use ruma::api::federation::edutypes::get_edutypes; use ruma::{api::federation::query::get_edu_types, assign};
use crate::Ruma; use crate::Ruma;
@@ -9,11 +9,11 @@ use crate::Ruma;
/// Lists EDU types we wish to receive /// Lists EDU types we wish to receive
pub(crate) async fn get_edutypes_route( pub(crate) async fn get_edutypes_route(
State(services): State<crate::State>, State(services): State<crate::State>,
_body: Ruma<get_edutypes::unstable::Request>, _body: Ruma<get_edu_types::unstable::Request>,
) -> Result<get_edutypes::unstable::Response> { ) -> Result<get_edu_types::unstable::Response> {
Ok(get_edutypes::unstable::Response { Ok(assign!(get_edu_types::unstable::Response::new(), {
typing: services.config.allow_incoming_typing, typing: services.config.allow_incoming_typing,
presence: services.config.allow_incoming_presence, presence: services.config.allow_incoming_presence,
receipt: services.config.allow_incoming_read_receipts, receipt: services.config.allow_incoming_read_receipts,
}) }))
} }
src/api/server/make_join.rs
+1 -1
View File
@@ -252,7 +252,7 @@ pub(crate) async fn user_can_perform_restricted_join(
return Ok(true); return Ok(true);
} }
}, },
| AllowRule::UnstableSpamChecker => | other if other.as_str() == "fi.mau.spam_checker" =>
return match services return match services
.antispam .antispam
.meowlnir_accept_make_join(room_id.to_owned(), user_id.to_owned()) .meowlnir_accept_make_join(room_id.to_owned(), user_id.to_owned())