events: Stabilize support for muting in VoIP calls

According to Matrix 1.11

crates/ruma-events/CHANGELOG.md

@@ -7,13 +7,14 @@ Bug fixes:
 
 Improvements:
 
- - Add support for encrypted stickers as sent by several bridges under the flag `compat-encrypted-stickers`
+- Add support for encrypted stickers as sent by several bridges under the flag `compat-encrypted-stickers`
- - Add unstable support for MSC3489 `m.beacon` & `m.beacon_info` events
+- Add unstable support for MSC3489 `m.beacon` & `m.beacon_info` events
-   (unstable types `org.matrix.msc3489.beacon` & `org.matrix.msc3489.beacon_info`)
+  (unstable types `org.matrix.msc3489.beacon` & `org.matrix.msc3489.beacon_info`)
+- Stabilize support for muting in VoIP calls, according to Matrix 1.11
 
 Breaking changes:
 
- - `StickerEventContent::url` was replaced by `StickerEventContent::source` which is a `StickerMediaSource`
+- `StickerEventContent::url` was replaced by `StickerEventContent::source` which is a `StickerMediaSource`
 
 # 0.28.1
 

crates/ruma-events/Cargo.toml

@@ -29,7 +29,6 @@ unstable-msc3245 = ["unstable-msc3246"]
 # https://github.com/matrix-org/matrix-spec-proposals/blob/83f6c5b469c1d78f714e335dcaa25354b255ffa5/proposals/3245-voice-messages.md
 unstable-msc3245-v1-compat = []
 unstable-msc3246 = ["unstable-msc3927"]
-unstable-msc3291 = []
 unstable-msc3381 = ["unstable-msc1767"]
 unstable-msc3401 = []
 unstable-msc3488 = ["unstable-msc1767"]

crates/ruma-events/src/call.rs

@@ -12,7 +12,6 @@ pub mod negotiate;
 #[cfg(feature = "unstable-msc4075")]
 pub mod notify;
 pub mod reject;
-#[cfg(feature = "unstable-msc3291")]
 pub mod sdp_stream_metadata_changed;
 pub mod select_answer;
 
@@ -59,14 +58,12 @@ pub struct StreamMetadata {
     /// Whether the audio track of the stream is muted.
     ///
     /// Defaults to `false`.
-    #[cfg(feature = "unstable-msc3291")]
     #[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
     pub audio_muted: bool,
 
     /// Whether the video track of the stream is muted.
     ///
     /// Defaults to `false`.
-    #[cfg(feature = "unstable-msc3291")]
     #[serde(default, skip_serializing_if = "ruma_common::serde::is_default")]
     pub video_muted: bool,
 }
@@ -74,13 +71,7 @@ pub struct StreamMetadata {
 impl StreamMetadata {
     /// Creates a new `StreamMetadata` with the given purpose.
     pub fn new(purpose: StreamPurpose) -> Self {
-        Self {
+        Self { purpose, audio_muted: false, video_muted: false }
-            purpose,
-            #[cfg(feature = "unstable-msc3291")]
-            audio_muted: false,
-            #[cfg(feature = "unstable-msc3291")]
-            video_muted: false,
-        }
     }
 }
 

crates/ruma-events/src/call/sdp_stream_metadata_changed.rs

@@ -1,6 +1,6 @@
 //! Types for the [`m.call.sdp_stream_metadata_changed`] event.
 //!
-//! [`m.call.sdp_stream_metadata_changed`]: https://github.com/matrix-org/matrix-spec-proposals/pull/3291
+//! [`m.call.sdp_stream_metadata_changed`]: https://spec.matrix.org/latest/client-server-api/#mcallsdp_stream_metadata_changed
 
 use std::collections::BTreeMap;
 
@@ -15,7 +15,7 @@ use super::StreamMetadata;
 /// This event is sent by any party when a stream metadata changes but no negotiation is required.
 #[derive(Clone, Debug, Deserialize, Serialize, EventContent)]
 #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
-#[ruma_event(type = "org.matrix.call.sdp_stream_metadata_changed", kind = MessageLike)]
+#[ruma_event(type = "m.call.sdp_stream_metadata_changed", alias = "org.matrix.call.sdp_stream_metadata_changed", kind = MessageLike)]
 pub struct CallSdpStreamMetadataChangedEventContent {
     /// A unique identifier for the call.
     pub call_id: OwnedVoipId,

crates/ruma-events/src/enums.rs

@@ -45,9 +45,8 @@ event_enum! {
         "m.call.candidates" => super::call::candidates,
         "m.call.negotiate" => super::call::negotiate,
         "m.call.reject" => super::call::reject,
-        #[cfg(feature = "unstable-msc3291")]
+        #[ruma_enum(alias = "org.matrix.call.sdp_stream_metadata_changed")]
-        #[ruma_enum(alias = "m.call.sdp_stream_metadata_changed")]
+        "m.call.sdp_stream_metadata_changed" => super::call::sdp_stream_metadata_changed,
-        "org.matrix.call.sdp_stream_metadata_changed" => super::call::sdp_stream_metadata_changed,
         "m.call.select_answer" => super::call::select_answer,
         #[cfg(feature = "unstable-msc3954")]
         #[ruma_enum(alias = "m.emote")]
@@ -375,9 +374,8 @@ impl AnyMessageLikeEventContent {
             Self::PollStart(_) | Self::UnstablePollStart(_) => None,
             #[cfg(feature = "unstable-msc4075")]
             Self::CallNotify(_) => None,
-            #[cfg(feature = "unstable-msc3291")]
+            Self::CallSdpStreamMetadataChanged(_)
-            Self::CallSdpStreamMetadataChanged(_) => None,
+            | Self::CallNegotiate(_)
-            Self::CallNegotiate(_)
             | Self::CallReject(_)
             | Self::CallSelectAnswer(_)
             | Self::CallAnswer(_)

crates/ruma/Cargo.toml

@@ -203,7 +203,6 @@ unstable-msc3245 = ["ruma-events?/unstable-msc3245"]
 unstable-msc3245-v1-compat = ["ruma-events?/unstable-msc3245-v1-compat"]
 unstable-msc3246 = ["ruma-events?/unstable-msc3246"]
 unstable-msc3266 = ["ruma-client-api?/unstable-msc3266"]
-unstable-msc3291 = ["ruma-events?/unstable-msc3291"]
 unstable-msc3381 = ["ruma-events?/unstable-msc3381"]
 unstable-msc3401 = ["ruma-events?/unstable-msc3401"]
 unstable-msc3488 = ["ruma-client-api?/unstable-msc3488", "ruma-events?/unstable-msc3488"]
@@ -258,7 +257,6 @@ __ci = [
     "unstable-msc3245-v1-compat",
     "unstable-msc3246",
     "unstable-msc3266",
-    "unstable-msc3291",
     "unstable-msc3381",
     "unstable-msc3401",
     "unstable-msc3488",