Explicitly match RoomVersionId::V11

merge-requests/632/merge
Val Lorentz 8 months ago
parent eb7ac91cd5
commit 8175bc1246

@ -146,7 +146,8 @@ pub async fn create_room_route(
})?, })?,
); );
} }
_ => {} // V11 removed the "creator" key RoomVersionId::V11 => {} // V11 removed the "creator" key
_ => panic!("Unexpected room version {}", room_version),
} }
content.insert( content.insert(
@ -170,7 +171,8 @@ pub async fn create_room_route(
| RoomVersionId::V8 | RoomVersionId::V8
| RoomVersionId::V9 | RoomVersionId::V9
| RoomVersionId::V10 => RoomCreateEventContent::new_v1(sender_user.clone()), | RoomVersionId::V10 => RoomCreateEventContent::new_v1(sender_user.clone()),
_ => RoomCreateEventContent::new_v11(), RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
_ => panic!("Unexpected room version {}", room_version),
}; };
let mut content = serde_json::from_str::<CanonicalJsonObject>( let mut content = serde_json::from_str::<CanonicalJsonObject>(
to_raw_value(&content) to_raw_value(&content)
@ -627,10 +629,11 @@ pub async fn upgrade_room_route(
})?, })?,
); );
} }
_ => { RoomVersionId::V11 => {
// "creator" key no longer exists in V11 rooms // "creator" key no longer exists in V11 rooms
create_event_content.remove("creator"); create_event_content.remove("creator");
} }
_ => panic!("Unexpected room version {}", body.new_version)
} }
create_event_content.insert( create_event_content.insert(
"room_version".into(), "room_version".into(),

@ -944,7 +944,8 @@ impl Service {
| RoomVersionId::V8 | RoomVersionId::V8
| RoomVersionId::V9 | RoomVersionId::V9
| RoomVersionId::V10 => RoomCreateEventContent::new_v1(conduit_user.clone()), | RoomVersionId::V10 => RoomCreateEventContent::new_v1(conduit_user.clone()),
_ => RoomCreateEventContent::new_v11(), RoomVersionId::V11 => RoomCreateEventContent::new_v11(),
_ => panic!("Unexpected room version {}", room_version),
}; };
content.federate = true; content.federate = true;
content.predecessor = None; content.predecessor = None;

@ -399,7 +399,7 @@ impl Service {
self.redact_pdu(redact_id, pdu)?; self.redact_pdu(redact_id, pdu)?;
} }
} }
_ => { RoomVersionId::V11 => {
#[derive(Deserialize)] #[derive(Deserialize)]
struct Redaction { struct Redaction {
redacts: Option<OwnedEventId>, redacts: Option<OwnedEventId>,
@ -412,6 +412,7 @@ impl Service {
self.redact_pdu(redact_id, pdu)?; self.redact_pdu(redact_id, pdu)?;
} }
} }
_ => panic!("Unexpected room version {}", room_version_id)
}; };
} }
TimelineEventType::SpaceChild => { TimelineEventType::SpaceChild => {

Loading…
Cancel
Save