events: Re-group imports, re-exports in room::message

This commit is contained in:
Jonas Platte 2023-10-09 15:55:08 +02:00
parent 9b1f7363a0
commit cf59d6ecb1
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C

View File

@ -15,6 +15,9 @@ use ruma_macros::EventContent;
use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde::{de::DeserializeOwned, Deserialize, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use self::reply::OriginalEventData;
#[cfg(feature = "html")]
use self::sanitize::remove_plain_reply_fallback;
use crate::{ use crate::{
relation::{CustomRelation, InReplyTo, RelationType, Replacement, Thread}, relation::{CustomRelation, InReplyTo, RelationType, Replacement, Thread},
AnySyncTimelineEvent, Mentions, PrivOwnedStr, AnySyncTimelineEvent, Mentions, PrivOwnedStr,
@ -35,23 +38,21 @@ mod server_notice;
mod text; mod text;
mod video; mod video;
pub use audio::{AudioInfo, AudioMessageEventContent};
#[cfg(feature = "unstable-msc3245-v1-compat")] #[cfg(feature = "unstable-msc3245-v1-compat")]
pub use audio::{UnstableAudioDetailsContentBlock, UnstableVoiceContentBlock}; pub use self::audio::{UnstableAudioDetailsContentBlock, UnstableVoiceContentBlock};
pub use emote::EmoteMessageEventContent; pub use self::{
pub use file::{FileInfo, FileMessageEventContent}; audio::{AudioInfo, AudioMessageEventContent},
pub use image::ImageMessageEventContent; emote::EmoteMessageEventContent,
pub use key_verification_request::KeyVerificationRequestEventContent; file::{FileInfo, FileMessageEventContent},
pub use location::{LocationInfo, LocationMessageEventContent}; image::ImageMessageEventContent,
pub use notice::NoticeMessageEventContent; key_verification_request::KeyVerificationRequestEventContent,
pub use relation_serde::deserialize_relation; location::{LocationInfo, LocationMessageEventContent},
#[cfg(feature = "html")] notice::NoticeMessageEventContent,
use sanitize::remove_plain_reply_fallback; relation_serde::deserialize_relation,
pub use server_notice::{LimitType, ServerNoticeMessageEventContent, ServerNoticeType}; server_notice::{LimitType, ServerNoticeMessageEventContent, ServerNoticeType},
pub use text::TextMessageEventContent; text::TextMessageEventContent,
pub use video::{VideoInfo, VideoMessageEventContent}; video::{VideoInfo, VideoMessageEventContent},
};
use self::reply::OriginalEventData;
/// The content of an `m.room.message` event. /// The content of an `m.room.message` event.
/// ///