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

api: Add MatrixVersion::V1_12

Browse Source
This commit is contained in:
Kévin Commaille 2024-10-07 22:25:26 +02:00 committed by strawberry
parent 1aa2eadd70
commit 56b400b832
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruma-common/CHANGELOG.md
View File

@ -22,7 +22,7 @@ Improvements:
cases where we receive a HTTP header with an unexpected value. cases where we receive a HTTP header with an unexpected value.
- Implement `Eq`/`Hash`/`PartialEq` for `ThirdPartyIdentifier`, to check whether - Implement `Eq`/`Hash`/`PartialEq` for `ThirdPartyIdentifier`, to check whether
a `ThirdPartyIdentifier` has already been added by another user. a `ThirdPartyIdentifier` has already been added by another user.
- Add `MatrixVersion::V1_11` - Add `MatrixVersion::V1_11` and `MatrixVersion::V1_12`.
- Clarify in the docs of `AuthScheme` that sending an access token via a query - Clarify in the docs of `AuthScheme` that sending an access token via a query
parameter is deprecated, according to MSC4126 / Matrix 1.11. parameter is deprecated, according to MSC4126 / Matrix 1.11.
- Constructing a Matrix URI for an event with a room alias is deprecated, - Constructing a Matrix URI for an event with a room alias is deprecated,

12
crates/ruma-common/src/api/metadata.rs
View File

@ -548,6 +548,11 @@ pub enum MatrixVersion {
/// ///
/// See <https://spec.matrix.org/v1.11/>. /// See <https://spec.matrix.org/v1.11/>.
V1_11, V1_11,
/// Version 1.12 of the Matrix specification, released in Q3 2024.
///
/// See <https://spec.matrix.org/v1.12/>.
V1_12,
} }
impl TryFrom<&str> for MatrixVersion { impl TryFrom<&str> for MatrixVersion {
@ -572,6 +577,7 @@ impl TryFrom<&str> for MatrixVersion {
"v1.9" => V1_9, "v1.9" => V1_9,
"v1.10" => V1_10, "v1.10" => V1_10,
"v1.11" => V1_11, "v1.11" => V1_11,
"v1.12" => V1_12,
_ => return Err(UnknownVersionError), _ => return Err(UnknownVersionError),
}) })
} }
@ -622,6 +628,7 @@ impl MatrixVersion {
MatrixVersion::V1_9 => (1, 9), MatrixVersion::V1_9 => (1, 9),
MatrixVersion::V1_10 => (1, 10), MatrixVersion::V1_10 => (1, 10),
MatrixVersion::V1_11 => (1, 11), MatrixVersion::V1_11 => (1, 11),
MatrixVersion::V1_12 => (1, 12),
} }
} }
@ -640,6 +647,7 @@ impl MatrixVersion {
(1, 9) => Ok(MatrixVersion::V1_9), (1, 9) => Ok(MatrixVersion::V1_9),
(1, 10) => Ok(MatrixVersion::V1_10), (1, 10) => Ok(MatrixVersion::V1_10),
(1, 11) => Ok(MatrixVersion::V1_11), (1, 11) => Ok(MatrixVersion::V1_11),
(1, 12) => Ok(MatrixVersion::V1_12),
_ => Err(UnknownVersionError), _ => Err(UnknownVersionError),
} }
} }
@ -736,7 +744,9 @@ impl MatrixVersion {
// <https://spec.matrix.org/v1.10/rooms/#complete-list-of-room-versions> // <https://spec.matrix.org/v1.10/rooms/#complete-list-of-room-versions>
| MatrixVersion::V1_10 | MatrixVersion::V1_10
// <https://spec.matrix.org/v1.11/rooms/#complete-list-of-room-versions> // <https://spec.matrix.org/v1.11/rooms/#complete-list-of-room-versions>
| MatrixVersion::V1_11 => RoomVersionId::V10, | MatrixVersion::V1_11
// <https://spec.matrix.org/v1.12/rooms/#complete-list-of-room-versions>
| MatrixVersion::V1_12 => RoomVersionId::V10,
} }
} }
} }