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 errors in api/server/make_knock.rs

Browse Source
This commit is contained in:
Ginger
2026-04-28 09:16:52 -04:00
parent 8871b1f74b
commit 1827888f09
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/server/make_knock.rs
+21 -15
View File
@@ -1,9 +1,10 @@
use RoomVersionId::*;
use axum::extract::State; use axum::extract::State;
use conduwuit::{Err, Error, Result, debug_warn, info, matrix::pdu::PartialPdu, utils, warn}; use conduwuit::{Err, Error, Result, debug_warn, info, matrix::pdu::PartialPdu, utils, warn};
use ruma::{ use ruma::{
RoomVersionId, api::{
api::{client::error::ErrorKind, federation::knock::create_knock_event_template}, error::{ErrorKind, IncompatibleRoomVersionErrorData},
federation::membership::prepare_knock_event,
},
events::room::member::{MembershipState, RoomMemberEventContent}, events::room::member::{MembershipState, RoomMemberEventContent},
}; };
use serde_json::value::to_raw_value; use serde_json::value::to_raw_value;
@@ -15,8 +16,8 @@ use crate::Ruma;
/// Creates a knock template. /// Creates a knock template.
pub(crate) async fn create_knock_event_template_route( pub(crate) async fn create_knock_event_template_route(
State(services): State<crate::State>, State(services): State<crate::State>,
body: Ruma<create_knock_event_template::v1::Request>, body: Ruma<prepare_knock_event::v1::Request>,
) -> Result<create_knock_event_template::v1::Response> { ) -> Result<prepare_knock_event::v1::Response> {
if !services.rooms.metadata.exists(&body.room_id).await { if !services.rooms.metadata.exists(&body.room_id).await {
return Err!(Request(NotFound("Room is unknown to this server."))); return Err!(Request(NotFound("Room is unknown to this server.")));
} }
@@ -65,23 +66,28 @@ pub(crate) async fn create_knock_event_template_route(
} }
} }
let room_version_id = services.rooms.state.get_room_version(&body.room_id).await?; let room_version = services.rooms.state.get_room_version(&body.room_id).await?;
let room_version_rules = room_version.rules().unwrap();
if matches!(room_version_id, V1 | V2 | V3 | V4 | V5 | V6) { if !room_version_rules.authorization.knocking {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::IncompatibleRoomVersion { room_version: room_version_id }, ErrorKind::IncompatibleRoomVersion(IncompatibleRoomVersionErrorData::new(
room_version,
)),
"Room version does not support knocking.", "Room version does not support knocking.",
)); ));
} }
if !body.ver.contains(&room_version_id) { if !body.ver.contains(&room_version) {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::IncompatibleRoomVersion { room_version: room_version_id }, ErrorKind::IncompatibleRoomVersion(IncompatibleRoomVersionErrorData::new(
room_version,
)),
"Your homeserver does not support the features required to knock on this room.", "Your homeserver does not support the features required to knock on this room.",
)); ));
} }
let state_lock = services.rooms.state.mutex.lock(&body.room_id).await; let state_lock = services.rooms.state.mutex.lock(body.room_id.as_str()).await;
if let Ok(membership) = services if let Ok(membership) = services
.rooms .rooms
@@ -118,8 +124,8 @@ pub(crate) async fn create_knock_event_template_route(
.expect("Barebones PDU should be convertible to canonical JSON"); .expect("Barebones PDU should be convertible to canonical JSON");
pdu_json.remove("event_id"); pdu_json.remove("event_id");
Ok(create_knock_event_template::v1::Response { Ok(prepare_knock_event::v1::Response::new(
room_version: room_version_id, room_version,
event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"), to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"),
}) ))
} }