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

Fix missing "m." in serialization of the "m.relates_to" key

Browse Source
This commit is contained in:
Marcel 2020-02-28 11:38:44 +01:00 committed by GitHub
parent 9d7ff18463
commit c81cc48aeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/room/message.rs
View File

@ -911,7 +911,7 @@ impl Serialize for NoticeMessageEventContent {
state.serialize_field("msgtype", "m.notice")?; state.serialize_field("msgtype", "m.notice")?;
if self.relates_to.is_some() { if self.relates_to.is_some() {
state.serialize_field("relates_to", &self.relates_to)?; state.serialize_field("m.relates_to", &self.relates_to)?;
} }
state.end() state.end()
@ -985,7 +985,7 @@ impl Serialize for TextMessageEventContent {
state.serialize_field("msgtype", "m.text")?; state.serialize_field("msgtype", "m.text")?;
if self.relates_to.is_some() { if self.relates_to.is_some() {
state.serialize_field("relates_to", &self.relates_to)?; state.serialize_field("m.relates_to", &self.relates_to)?;
} }
state.end() state.end()
@ -1037,7 +1037,10 @@ mod tests {
use serde_json::to_string; use serde_json::to_string;
use super::{AudioMessageEventContent, MessageEventContent}; use super::{AudioMessageEventContent, MessageEventContent};
use crate::room::message::{InReplyTo, RelatesTo, TextMessageEventContent};
use crate::EventResult; use crate::EventResult;
use ruma_identifiers::EventId;
use std::convert::TryFrom;
#[test] #[test]
fn serialization() { fn serialization() {
@ -1054,6 +1057,25 @@ mod tests {
); );
} }
#[test]
fn relates_to_serialization() {
let message_event_content = MessageEventContent::Text(TextMessageEventContent {
body: "> <@test:example.com> test\n\ntest reply".to_owned(),
format: None,
formatted_body: None,
relates_to: Some(RelatesTo {
in_reply_to: InReplyTo {
event_id: EventId::try_from("$15827405538098VGFWH:example.com").unwrap(),
},
}),
});
assert_eq!(
to_string(&message_event_content).unwrap(),
r#"{"body":"> <@test:example.com> test\n\ntest reply","msgtype":"m.text","m.relates_to":{"m.in_reply_to":{"event_id":"$15827405538098VGFWH:example.com"}}}"#
);
}
#[test] #[test]
fn deserialization() { fn deserialization() {
let message_event_content = MessageEventContent::Audio(AudioMessageEventContent { let message_event_content = MessageEventContent::Audio(AudioMessageEventContent {