From 760cbb94fc0021800a867063a98be2d2c1d34a55 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Tue, 1 Feb 2022 21:35:32 +0100
Subject: [PATCH] events: Move join_authorized_via_users_server to
 unstable-spec

---
 crates/ruma-events/src/room/member.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/crates/ruma-events/src/room/member.rs b/crates/ruma-events/src/room/member.rs
index 59af2f0a..45731466 100644
--- a/crates/ruma-events/src/room/member.rs
+++ b/crates/ruma-events/src/room/member.rs
@@ -98,7 +98,7 @@ pub struct RoomMemberEventContent {
     pub reason: Option<String>,
 
     /// Arbitrarily chosen `UserId` (MxID) of a local user who can send an invite.
-    #[cfg(feature = "unstable-pre-spec")]
+    #[cfg(feature = "unstable-spec")]
     #[serde(rename = "join_authorised_via_users_server")]
     #[serde(skip_serializing_if = "Option::is_none")]
     pub join_authorized_via_users_server: Option<Box<UserId>>,
@@ -116,7 +116,7 @@ impl RoomMemberEventContent {
             #[cfg(feature = "unstable-pre-spec")]
             blurhash: None,
             reason: None,
-            #[cfg(feature = "unstable-pre-spec")]
+            #[cfg(feature = "unstable-spec")]
             join_authorized_via_users_server: None,
         }
     }
@@ -128,9 +128,8 @@ impl RedactContent for RoomMemberEventContent {
     fn redact(self, _version: &RoomVersionId) -> RedactedRoomMemberEventContent {
         RedactedRoomMemberEventContent {
             membership: self.membership,
-            #[cfg(feature = "unstable-pre-spec")]
+            #[cfg(feature = "unstable-spec")]
             join_authorized_via_users_server: match _version {
-                #[cfg(feature = "unstable-pre-spec")]
                 RoomVersionId::V9 => self.join_authorized_via_users_server,
                 _ => None,
             },
@@ -149,7 +148,7 @@ pub struct RedactedRoomMemberEventContent {
     ///
     /// This is redacted in room versions 8 and below. It is used for validating
     /// joins when the join rule is restricted.
-    #[cfg(feature = "unstable-pre-spec")]
+    #[cfg(feature = "unstable-spec")]
     #[serde(rename = "join_authorised_via_users_server")]
     pub join_authorized_via_users_server: Option<Box<UserId>>,
 }
@@ -159,7 +158,7 @@ impl RedactedRoomMemberEventContent {
     pub fn new(membership: MembershipState) -> Self {
         Self {
             membership,
-            #[cfg(feature = "unstable-pre-spec")]
+            #[cfg(feature = "unstable-spec")]
             join_authorized_via_users_server: None,
         }
     }
@@ -353,7 +352,7 @@ fn membership_change(
             #[cfg(feature = "unstable-pre-spec")]
             blurhash: None,
             reason: None,
-            #[cfg(feature = "unstable-pre-spec")]
+            #[cfg(feature = "unstable-spec")]
             join_authorized_via_users_server: None,
         }
     };
@@ -747,7 +746,7 @@ mod tests {
         );
     }
 
-    #[cfg(feature = "unstable-pre-spec")]
+    #[cfg(feature = "unstable-spec")]
     #[test]
     fn serde_with_join_authorized() {
         let json = json!({