dandri/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity/ synced 2026-04-26 14:27:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Fix errors in api/server/make_knock.rs

Browse Source
This commit is contained in:
Ginger
2026-04-13 11:33:23 -04:00
parent 8fa2eb06eb
commit 10059ecd3b
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/api/server/make_knock.rs
View File

@@ -1,9 +1,10 @@
use RoomVersionId::*;
use axum::extract::State;
use conduwuit::{Err, Error, Result, debug_warn, info, matrix::pdu::PartialPdu, utils, warn};
use ruma::{
RoomVersionId,
api::{client::error::ErrorKind, federation::knock::create_knock_event_template},
api::{
error::{ErrorKind, IncompatibleRoomVersionErrorData},
federation::membership::prepare_knock_event,
},
events::room::member::{MembershipState, RoomMemberEventContent},
};
use serde_json::value::to_raw_value;
@@ -15,8 +16,8 @@
/// Creates a knock template.
pub(crate) async fn create_knock_event_template_route(
State(services): State<crate::State>,
body: Ruma<create_knock_event_template::v1::Request>,
) -> Result<create_knock_event_template::v1::Response> {
body: Ruma<prepare_knock_event::v1::Request>,
) -> Result<prepare_knock_event::v1::Response> {
if !services.rooms.metadata.exists(&body.room_id).await {
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(
ErrorKind::IncompatibleRoomVersion { room_version: room_version_id },
ErrorKind::IncompatibleRoomVersion(IncompatibleRoomVersionErrorData::new(
room_version,
)),
"Room version does not support knocking.",
));
}
if !body.ver.contains(&room_version_id) {
if !body.ver.contains(&room_version) {
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.",
));
}
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
.rooms
@@ -118,8 +124,8 @@ pub(crate) async fn create_knock_event_template_route(
.expect("Barebones PDU should be convertible to canonical JSON");
pdu_json.remove("event_id");
Ok(create_knock_event_template::v1::Response {
room_version: room_version_id,
event: to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"),
})
Ok(prepare_knock_event::v1::Response::new(
room_version,
to_raw_value(&pdu_json).expect("CanonicalJson can be serialized to JSON"),
))
}