From 210e3fd4a9c52238ad5d219c75a9e3265d86e2f6 Mon Sep 17 00:00:00 2001 From: iinuwa Date: Sat, 25 Apr 2020 02:30:20 -0500 Subject: [PATCH] Make display_name of RoomMember optional --- CHANGELOG.md | 1 + src/r0/membership/joined_members.rs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c14b1f66..cd03b19b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ Breaking changes: * Change the messages type that gets sent out using the `r0::client_exchange::send_event_to_device` request. * Add `M_USER_DEACTIVATED` to `error::ErrorKind` +* Make `display_name` field of `r0::membership::joined_events::RoomMember` optional Improvements: diff --git a/src/r0/membership/joined_members.rs b/src/r0/membership/joined_members.rs index f853af60..400ee601 100644 --- a/src/r0/membership/joined_members.rs +++ b/src/r0/membership/joined_members.rs @@ -1,4 +1,4 @@ -//! [GET /_matrix/client/r0/rooms/{roomId}/joined_members](https://matrix.org/docs/spec/client_server/r0.4.0.html#get-matrix-client-r0-rooms-roomid-joined-members) +//! [GET /_matrix/client/r0/rooms/{roomId}/joined_members](https://matrix.org/docs/spec/client_server/r0.6.0#get-matrix-client-r0-rooms-roomid-joined-members) use std::collections::BTreeMap; @@ -31,12 +31,13 @@ ruma_api! { error: crate::Error } -// TODO: Find out whether display_name and avatar_url are optional /// Information about a room member. #[derive(Clone, Debug, Deserialize, Serialize)] pub struct RoomMember { /// The display name of the user. - pub display_name: String, + #[serde(skip_serializing_if = "Option::is_none")] + pub display_name: Option, /// The mxc avatar url of the user. + #[serde(skip_serializing_if = "Option::is_none")] pub avatar_url: Option, }