magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup rooms.rs, globals.rs, and pdu.rs

Browse source
This commit is contained in:
Nyaaori 2021-11-05 20:47:11 +00:00 • committed by Timo Kösters
parent 4b28146ee7
commit d655f4c1be
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
3 changed files with 19 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/database/rooms.rs
View file

@ -3440,10 +3440,8 @@ impl Rooms {
/// Returns the room's version.
#[tracing::instrument(skip(self))]
pub fn get_room_version(&self, room_id: &RoomId) -> RoomVersionId {
let create_event = self
.room_state_get(room_id, &StateEventType::RoomCreate, "")
.unwrap();
pub fn get_room_version(&self, room_id: &RoomId) -> Result<RoomVersionId> {
let create_event = self.room_state_get(room_id, &StateEventType::RoomCreate, "")?;
let create_event_content: Option<RoomCreateEventContent> = create_event
.as_ref()
@ -3453,11 +3451,10 @@ impl Rooms {
Error::bad_database("Invalid create event in db.")
})
})
.transpose()
.unwrap();
create_event_content
.transpose()?;
let room_version = create_event_content
.map(|create_event| create_event.room_version)
.expect("Invalid room version")
.ok_or_else(|| Error::BadDatabase("Invalid room version"))?;
Ok(room_version)
}
}