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

events: Clean up derives and other attributes for new types

Browse Source
This commit is contained in:
Jonas Platte 2023-10-19 18:00:09 +02:00
parent 86882d04de
commit 624058ced2
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/ruma-events/src/call/member.rs
View File

@ -18,7 +18,8 @@ use crate::PrivOwnedStr;
/// ///
/// This is the object containing all the data related to a matrix users participation in a /// This is the object containing all the data related to a matrix users participation in a
/// matrixRTC session. It consists of memberships / sessions. /// matrixRTC session. It consists of memberships / sessions.
#[derive(Clone, Debug, Serialize, Deserialize, EventContent, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize, EventContent)]
#[cfg_attr(test, derive(PartialEq))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[ruma_event(type = "org.matrix.msc3401.call.member", kind = State, state_key_type = OwnedUserId)] #[ruma_event(type = "org.matrix.msc3401.call.member", kind = State, state_key_type = OwnedUserId)]
pub struct CallMemberEventContent { pub struct CallMemberEventContent {
@ -76,7 +77,8 @@ impl CallMemberEventContent {
/// A membership describes one of the sessions this user currently partakes. /// A membership describes one of the sessions this user currently partakes.
/// ///
/// The application defines the type of the session. /// The application defines the type of the session.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[cfg_attr(test, derive(PartialEq))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct Membership { pub struct Membership {
/// The type of the matrixRTC session the membership belongs to. /// The type of the matrixRTC session the membership belongs to.
@ -157,6 +159,7 @@ impl Membership {
} }
/// Initial set of fields of [`Membership`]. /// Initial set of fields of [`Membership`].
#[derive(Debug)]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct MembershipInit { pub struct MembershipInit {
/// The type of the matrixRTC session the membership belongs to. /// The type of the matrixRTC session the membership belongs to.
@ -198,17 +201,18 @@ impl From<MembershipInit> for Membership {
/// ///
/// A focus can be any server powering the matrixRTC session (SFU, /// A focus can be any server powering the matrixRTC session (SFU,
/// MCU). It serves as a node to redistribute RTC streams. /// MCU). It serves as a node to redistribute RTC streams.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(tag = "type")] #[cfg_attr(test, derive(PartialEq))]
#[serde(rename_all = "snake_case")]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[serde(tag = "type", rename_all = "snake_case")]
pub enum Focus { pub enum Focus {
/// Livekit is one possible type of SFU/Focus that can be used for a matrixRTC session. /// Livekit is one possible type of SFU/Focus that can be used for a matrixRTC session.
Livekit(LivekitFocus), Livekit(LivekitFocus),
} }
/// The fields to describe livekit as an `active_foci`. /// The fields to describe livekit as an `active_foci`.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[cfg_attr(test, derive(PartialEq))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct LivekitFocus { pub struct LivekitFocus {
/// The alias where the livekit sessions can be reached. /// The alias where the livekit sessions can be reached.
@ -237,9 +241,10 @@ impl LivekitFocus {
/// This is not the application/client used by the user but the /// This is not the application/client used by the user but the
/// type of matrixRTC session e.g. calling (`m.call`), third-room, whiteboard could be /// type of matrixRTC session e.g. calling (`m.call`), third-room, whiteboard could be
/// possible applications. /// possible applications.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(tag = "application")] #[cfg_attr(test, derive(PartialEq))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
#[serde(tag = "application")]
pub enum Application { pub enum Application {
#[serde(rename = "m.call")] #[serde(rename = "m.call")]
/// A VoIP call. /// A VoIP call.
@ -247,7 +252,8 @@ pub enum Application {
} }
/// Call specific parameters membership parameters. /// Call specific parameters membership parameters.
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] #[derive(Clone, Debug, Serialize, Deserialize)]
#[cfg_attr(test, derive(PartialEq))]
#[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
pub struct CallApplicationContent { pub struct CallApplicationContent {
/// An identifier for calls. /// An identifier for calls.