diff --git a/Cargo.toml b/Cargo.toml index d47e54ca..90085ecd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ thiserror = "1.0.20" tracing-subscriber = "0.2.8" [dependencies.ruma] -git = "https://github.com/DevinR528/ruma" -branch = "pdu-deserialize" +git = "https://github.com/ruma/ruma" +rev = "d5d2d1d893fa12d27960e4c58d6c09b215d06e95" features = ["client-api", "federation-api", "appservice-api"] [dev-dependencies] diff --git a/src/state_event.rs b/src/state_event.rs index f2f8cd95..0f8e7154 100644 --- a/src/state_event.rs +++ b/src/state_event.rs @@ -173,7 +173,7 @@ impl StateEvent { pub fn prev_event_ids(&self) -> Vec { match self { Self::Full(ev) => match ev { - Pdu::RoomV1Pdu(ev) => ev.prev_events.to_vec(), + Pdu::RoomV1Pdu(ev) => ev.prev_events.iter().map(|(id, _)| id).cloned().collect(), Pdu::RoomV3Pdu(ev) => ev.prev_events.clone(), }, Self::Sync(ev) => match ev { @@ -188,7 +188,7 @@ impl StateEvent { pub fn auth_events(&self) -> Vec { match self { Self::Full(ev) => match ev { - Pdu::RoomV1Pdu(ev) => ev.auth_events.to_vec(), + Pdu::RoomV1Pdu(ev) => ev.auth_events.iter().map(|(id, _)| id).cloned().collect(), Pdu::RoomV3Pdu(ev) => ev.auth_events.to_vec(), }, Self::Sync(ev) => match ev {