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

Fix duplicate msgtype field in m.message serialization

Browse Source
This commit is contained in:
Jonas Platte 2020-05-03 23:11:34 +02:00
parent f30df65dba
commit c2e3298b2a
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/room/message.rs
View File

@ -197,7 +197,6 @@ pub(crate) mod raw {
/// The payload for an audio message. /// The payload for an audio message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.audio")]
pub struct AudioMessageEventContent { pub struct AudioMessageEventContent {
/// The textual representation of this message. /// The textual representation of this message.
pub body: String, pub body: String,
@ -250,7 +249,6 @@ pub struct EmoteMessageEventContent {
/// The payload for a file message. /// The payload for a file message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.file")]
pub struct FileMessageEventContent { pub struct FileMessageEventContent {
/// A human-readable description of the file. This is recommended to be the filename of the /// A human-readable description of the file. This is recommended to be the filename of the
/// original upload. /// original upload.
@ -300,7 +298,6 @@ pub struct FileInfo {
/// The payload for an image message. /// The payload for an image message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.image")]
pub struct ImageMessageEventContent { pub struct ImageMessageEventContent {
/// A textual representation of the image. This could be the alt text of the image, the filename /// A textual representation of the image. This could be the alt text of the image, the filename
/// of the image, or some kind of content description for accessibility e.g. "image attachment." /// of the image, or some kind of content description for accessibility e.g. "image attachment."
@ -322,7 +319,6 @@ pub struct ImageMessageEventContent {
/// The payload for a location message. /// The payload for a location message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.location")]
pub struct LocationMessageEventContent { pub struct LocationMessageEventContent {
/// A description of the location e.g. "Big Ben, London, UK,"or some kind of content description /// A description of the location e.g. "Big Ben, London, UK,"or some kind of content description
/// for accessibility, e.g. "location attachment." /// for accessibility, e.g. "location attachment."
@ -356,7 +352,6 @@ pub struct LocationInfo {
/// The payload for a notice message. /// The payload for a notice message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.notice")]
pub struct NoticeMessageEventContent { pub struct NoticeMessageEventContent {
/// The notice text to send. /// The notice text to send.
pub body: String, pub body: String,
@ -378,7 +373,6 @@ pub struct NoticeMessageEventContent {
/// The payload for a server notice message. /// The payload for a server notice message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.server_notice")]
pub struct ServerNoticeMessageEventContent { pub struct ServerNoticeMessageEventContent {
/// A human-readable description of the notice. /// A human-readable description of the notice.
pub body: String, pub body: String,
@ -420,7 +414,6 @@ pub enum LimitType {
/// The payload for a text message. /// The payload for a text message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.text")]
pub struct TextMessageEventContent { pub struct TextMessageEventContent {
/// The body of the message. /// The body of the message.
pub body: String, pub body: String,
@ -442,7 +435,6 @@ pub struct TextMessageEventContent {
/// The payload for a video message. /// The payload for a video message.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
#[serde(tag = "msgtype", rename = "m.video")]
pub struct VideoMessageEventContent { pub struct VideoMessageEventContent {
/// A description of the video, e.g. "Gangnam Style," or some kind of content description for /// A description of the video, e.g. "Gangnam Style," or some kind of content description for
/// accessibility, e.g. "video attachment." /// accessibility, e.g. "video attachment."