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

src/api/server/edutypes.rs

@@ -1,6 +1,6 @@
 use axum::extract::State;
 use conduwuit::Result;
-use ruma::api::federation::edutypes::get_edutypes;
+use ruma::{api::federation::query::get_edu_types, assign};
 
 use crate::Ruma;
 
@@ -9,11 +9,11 @@ use crate::Ruma;
 /// Lists EDU types we wish to receive
 pub(crate) async fn get_edutypes_route(
 	State(services): State<crate::State>,
-	_body: Ruma<get_edutypes::unstable::Request>,
-) -> Result<get_edutypes::unstable::Response> {
-	Ok(get_edutypes::unstable::Response {
+	_body: Ruma<get_edu_types::unstable::Request>,
+) -> Result<get_edu_types::unstable::Response> {
+	Ok(assign!(get_edu_types::unstable::Response::new(), {
 		typing: services.config.allow_incoming_typing,
 		presence: services.config.allow_incoming_presence,
 		receipt: services.config.allow_incoming_read_receipts,
-	})
+	}))
 }

src/api/server/make_join.rs

@@ -252,7 +252,7 @@ pub(crate) async fn user_can_perform_restricted_join(
 					return Ok(true);
 				}
 			},
-			| AllowRule::UnstableSpamChecker =>
+			| other if other.as_str() == "fi.mau.spam_checker" =>
 				return match services
 					.antispam
 					.meowlnir_accept_make_join(room_id.to_owned(), user_id.to_owned())