mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-05-26 20:49:55 +00:00
nexy7574
7e4071c117
**Does not yet work!** Currently, state resolution does not correctly resolve conflicting states. Everything else appears to work as expected, so stateres will be fixed soon, then we should be clear for takeoff. Also: a lot of things currently accept a nullable room ID that really just don't need to. This will need tidying up before merge. Some authentication checks have also been disabled temporarily but nothing important. A lot of things are tagged with `TODO(hydra)`, those need resolving before merge. External contributors should PR to the `hydra/public` branch, *not* ` main`. --- This PR should be squash merged. Reviewed-on: https://forgejo.ellis.link/continuwuation/continuwuity/pulls/943 Co-authored-by: nexy7574 <git@nexy7574.co.uk> Co-committed-by: nexy7574 <git@nexy7574.co.uk>
65 lines
2.4 KiB
Rust
65 lines
2.4 KiB
Rust
use conduwuit::{
|
|
Result, RoomVersion, err, implement, matrix::event::gen_event_id_canonical_json,
|
|
result::FlatOk,
|
|
};
|
|
use ruma::{CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, RoomVersionId};
|
|
use serde_json::value::RawValue as RawJsonValue;
|
|
|
|
type Parsed = (OwnedRoomId, OwnedEventId, CanonicalJsonObject);
|
|
|
|
#[implement(super::Service)]
|
|
pub async fn parse_incoming_pdu(&self, pdu: &RawJsonValue) -> Result<Parsed> {
|
|
let value = serde_json::from_str::<CanonicalJsonObject>(pdu.get()).map_err(|e| {
|
|
err!(BadServerResponse(debug_warn!("Error parsing incoming event {e:?}")))
|
|
})?;
|
|
let event_type = value
|
|
.get("type")
|
|
.and_then(CanonicalJsonValue::as_str)
|
|
.ok_or_else(|| err!(Request(InvalidParam("Missing or invalid type in pdu"))))?;
|
|
|
|
let room_id: OwnedRoomId = if event_type != "m.room.create" {
|
|
value
|
|
.get("room_id")
|
|
.and_then(CanonicalJsonValue::as_str)
|
|
.map(OwnedRoomId::parse)
|
|
.flat_ok_or(err!(Request(InvalidParam("Invalid room_id in pdu"))))?
|
|
} else {
|
|
// v12 rooms might have no room_id in the create event. We'll need to check the
|
|
// content.room_version
|
|
let content = value
|
|
.get("content")
|
|
.and_then(CanonicalJsonValue::as_object)
|
|
.ok_or_else(|| err!(Request(InvalidParam("Missing or invalid content in pdu"))))?;
|
|
let room_version = content
|
|
.get("room_version")
|
|
.and_then(CanonicalJsonValue::as_str)
|
|
.unwrap_or("1");
|
|
let vi = RoomVersionId::try_from(room_version).unwrap_or(RoomVersionId::V1);
|
|
let vf = RoomVersion::new(&vi).expect("supported room version");
|
|
if vf.room_ids_as_hashes {
|
|
let (event_id, _) = gen_event_id_canonical_json(pdu, &vi).map_err(|e| {
|
|
err!(Request(InvalidParam("Could not convert event to canonical json: {e}")))
|
|
})?;
|
|
OwnedRoomId::parse(event_id.as_str().replace('$', "!")).expect("valid room ID")
|
|
} else {
|
|
// V11 or below room, room_id must be present
|
|
value
|
|
.get("room_id")
|
|
.and_then(CanonicalJsonValue::as_str)
|
|
.map(OwnedRoomId::parse)
|
|
.flat_ok_or(err!(Request(InvalidParam("Invalid or missing room_id in pdu"))))?
|
|
}
|
|
};
|
|
|
|
let room_version_id = self
|
|
.services
|
|
.state
|
|
.get_room_version(&room_id)
|
|
.await
|
|
.map_err(|_| err!("Server is not in room {room_id}"))?;
|
|
let (event_id, value) = gen_event_id_canonical_json(pdu, &room_version_id).map_err(|e| {
|
|
err!(Request(InvalidParam("Could not convert event to canonical json: {e}")))
|
|
})?;
|
|
Ok((room_id, event_id, value))
|
|
}
|