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

events: Don't return body as part of MessageType::data

Browse Source
This commit is contained in:
Jonas Platte 2021-09-27 13:01:50 +02:00
parent af250cf108
commit 27a3e70465
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crates/ruma-events/src/room/message.rs
View File

@ -255,12 +255,18 @@ impl MessageType {
/// Returns the associated data. /// Returns the associated data.
/// ///
/// The returned JSON object won't contain the `msgtype` and `body` fields, use
/// [`.msgtype()`][Self::msgtype] / [`.body()`](Self::body) to access those.
///
/// Prefer to use the public variants of `MessageType` where possible; this method is meant to /// Prefer to use the public variants of `MessageType` where possible; this method is meant to
/// be used for custom message types only. /// be used for custom message types only.
pub fn data(&self) -> Cow<'_, JsonObject> { pub fn data(&self) -> Cow<'_, JsonObject> {
fn serialize<T: Serialize>(obj: &T) -> JsonObject { fn serialize<T: Serialize>(obj: &T) -> JsonObject {
match serde_json::to_value(obj).expect("message type serialization to succeed") { match serde_json::to_value(obj).expect("message type serialization to succeed") {
JsonValue::Object(obj) => obj, JsonValue::Object(mut obj) => {
obj.remove("body");
obj
}
_ => panic!("all message types must serialize to objects"), _ => panic!("all message types must serialize to objects"),
} }
} }