chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

serde: Add Raw::deserialize_as

Browse Source
This commit is contained in:
Jonas Platte 2021-05-15 14:17:03 +02:00
parent 60d4ea027f
commit 16e8f498b4
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruma-appservice-api/src/event/push_events/v1.rs
View File

@ -74,7 +74,7 @@ impl IncomingRequest {
let mut response = sync_events::Response::new(next_batch.into()); let mut response = sync_events::Response::new(next_batch.into());
for raw_event in self.events { for raw_event in self.events {
let helper: EventDeHelper = serde_json::from_str(raw_event.json().get())?; let helper = raw_event.deserialize_as::<EventDeHelper>()?;
let event_json = Raw::into_json(raw_event); let event_json = Raw::into_json(raw_event);
if let Some(room_id) = helper.room_id { if let Some(room_id) = helper.room_id {

10
crates/ruma-serde/src/raw.rs
View File

@ -75,7 +75,7 @@ impl<T> Raw<T> {
/// # fn foo() -> serde_json::Result<()> { /// # fn foo() -> serde_json::Result<()> {
/// # let raw_event: ruma_serde::Raw<()> = todo!(); /// # let raw_event: ruma_serde::Raw<()> = todo!();
/// if raw_event.get_field::<String>("type")?.as_deref() == Some("org.custom.matrix.event") { /// if raw_event.get_field::<String>("type")?.as_deref() == Some("org.custom.matrix.event") {
/// let event: CustomMatrixEvent = serde_json::from_str(raw_event.json().get())?; /// let event = raw_event.deserialize_as::<CustomMatrixEvent>()?;
/// // ... /// // ...
/// } /// }
/// # Ok(()) /// # Ok(())
@ -136,6 +136,14 @@ where
pub fn deserialize(&self) -> serde_json::Result<T> { pub fn deserialize(&self) -> serde_json::Result<T> {
serde_json::from_str(self.json.get()) serde_json::from_str(self.json.get())
} }
/// Try to deserialize the JSON as a custom type.
pub fn deserialize_as<U>(&self) -> serde_json::Result<U>
where
U: DeserializeOwned,
{
serde_json::from_str(self.json.get())
}
} }
impl<T: Serialize> From<&T> for Raw<T> { impl<T: Serialize> From<&T> for Raw<T> {