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

events: Remove the serde alias for the blurhash field in events

Browse Source 
Some clients send both the stable and unstable version so deserialization fails.
This commit is contained in:
Kévin Commaille 2023-02-16 10:08:51 +01:00 committed by Kévin Commaille
parent f29bbebf08
commit e490c8893d
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/src/events/room.rs
View File

@ -106,11 +106,7 @@ pub struct ImageInfo {
/// This uses the unstable prefix in /// This uses the unstable prefix in
/// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448). /// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448).
#[cfg(feature = "unstable-msc2448")] #[cfg(feature = "unstable-msc2448")]
#[serde( #[serde(rename = "xyz.amorgan.blurhash", skip_serializing_if = "Option::is_none")]
rename = "xyz.amorgan.blurhash",
alias = "blurhash",
skip_serializing_if = "Option::is_none"
)]
pub blurhash: Option<String>, pub blurhash: Option<String>,
} }

6
crates/ruma-common/src/events/room/avatar.rs
View File

@ -66,11 +66,7 @@ pub struct ImageInfo {
/// This uses the unstable prefix in /// This uses the unstable prefix in
/// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448). /// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448).
#[cfg(feature = "unstable-msc2448")] #[cfg(feature = "unstable-msc2448")]
#[serde( #[serde(rename = "xyz.amorgan.blurhash", skip_serializing_if = "Option::is_none")]
rename = "xyz.amorgan.blurhash",
alias = "blurhash",
skip_serializing_if = "Option::is_none"
)]
pub blurhash: Option<String>, pub blurhash: Option<String>,
} }

6
crates/ruma-common/src/events/room/member.rs
View File

@ -89,11 +89,7 @@ pub struct RoomMemberEventContent {
/// This uses the unstable prefix in /// This uses the unstable prefix in
/// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448). /// [MSC2448](https://github.com/matrix-org/matrix-spec-proposals/pull/2448).
#[cfg(feature = "unstable-msc2448")] #[cfg(feature = "unstable-msc2448")]
#[serde( #[serde(rename = "xyz.amorgan.blurhash", skip_serializing_if = "Option::is_none")]
rename = "xyz.amorgan.blurhash",
alias = "blurhash",
skip_serializing_if = "Option::is_none"
)]
pub blurhash: Option<String>, pub blurhash: Option<String>,
/// User-supplied text for why their membership has changed. /// User-supplied text for why their membership has changed.