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

Remove invalid variant from room::message::MessageEventContent

Browse Source
This commit is contained in:
Jonas Platte 2020-05-02 23:12:50 +02:00
parent fc78e49d49
commit 2f706d9a85
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/room/message.rs
View File

@ -6,7 +6,7 @@ use js_int::UInt;
use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_identifiers::{EventId, RoomId, UserId};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use super::{encrypted::EncryptedEventContent, EncryptedFile, ImageInfo, ThumbnailInfo}; use super::{EncryptedFile, ImageInfo, ThumbnailInfo};
use crate::{EventType, FromRaw, UnsignedData}; use crate::{EventType, FromRaw, UnsignedData};
pub mod feedback; pub mod feedback;
@ -68,9 +68,6 @@ pub enum MessageEventContent {
/// A video message. /// A video message.
Video(VideoMessageEventContent), Video(VideoMessageEventContent),
/// A encrypted message.
Encrypted(EncryptedEventContent),
} }
impl FromRaw for MessageEvent { impl FromRaw for MessageEvent {
@ -104,7 +101,6 @@ impl FromRaw for MessageEventContent {
ServerNotice(content) => MessageEventContent::ServerNotice(content), ServerNotice(content) => MessageEventContent::ServerNotice(content),
Text(content) => MessageEventContent::Text(content), Text(content) => MessageEventContent::Text(content),
Video(content) => MessageEventContent::Video(content), Video(content) => MessageEventContent::Video(content),
Encrypted(content) => MessageEventContent::Encrypted(content),
} }
} }
} }
@ -119,10 +115,10 @@ pub(crate) mod raw {
use serde_json::{from_value as from_json_value, Value as JsonValue}; use serde_json::{from_value as from_json_value, Value as JsonValue};
use super::{ use super::{
AudioMessageEventContent, EmoteMessageEventContent, EncryptedEventContent, AudioMessageEventContent, EmoteMessageEventContent, FileMessageEventContent,
FileMessageEventContent, ImageMessageEventContent, LocationMessageEventContent, ImageMessageEventContent, LocationMessageEventContent, MessageType,
MessageType, NoticeMessageEventContent, ServerNoticeMessageEventContent, NoticeMessageEventContent, ServerNoticeMessageEventContent, TextMessageEventContent,
TextMessageEventContent, VideoMessageEventContent, VideoMessageEventContent,
}; };
use crate::UnsignedData; use crate::UnsignedData;
@ -180,9 +176,6 @@ pub(crate) mod raw {
/// A video message. /// A video message.
Video(VideoMessageEventContent), Video(VideoMessageEventContent),
/// A video message.
Encrypted(EncryptedEventContent),
} }
impl<'de> Deserialize<'de> for MessageEventContent { impl<'de> Deserialize<'de> for MessageEventContent {