From ef322cc39bd8fe8f4e29885e725f623d3d0bd14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 27 Jan 2024 15:43:30 +0100 Subject: [PATCH] base: Add room member ID to AmbiguityChange MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes AmbiguityChange easier to use, especially outside of SyncResponse, where we might not have the m.room.member event. Signed-off-by: Kévin Commaille --- crates/matrix-sdk-base/src/deserialized_responses.rs | 5 ++++- crates/matrix-sdk-base/src/store/ambiguity_map.rs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/crates/matrix-sdk-base/src/deserialized_responses.rs b/crates/matrix-sdk-base/src/deserialized_responses.rs index 9785e33d6..c37a664ac 100644 --- a/crates/matrix-sdk-base/src/deserialized_responses.rs +++ b/crates/matrix-sdk-base/src/deserialized_responses.rs @@ -34,9 +34,12 @@ use serde::Serialize; /// A change in ambiguity of room members that an `m.room.member` event /// triggers. -#[derive(Clone, Debug, Default)] +#[derive(Clone, Debug)] #[non_exhaustive] pub struct AmbiguityChange { + /// The user ID of the member that is contained in the state key of the + /// `m.room.member` event. + pub member_id: OwnedUserId, /// Is the member that is contained in the state key of the `m.room.member` /// event itself ambiguous because of the event. pub member_ambiguous: bool, diff --git a/crates/matrix-sdk-base/src/store/ambiguity_map.rs b/crates/matrix-sdk-base/src/store/ambiguity_map.rs index 6cded30c2..25ce7366e 100644 --- a/crates/matrix-sdk-base/src/store/ambiguity_map.rs +++ b/crates/matrix-sdk-base/src/store/ambiguity_map.rs @@ -118,6 +118,7 @@ impl AmbiguityCache { self.update(room_id, old_map, new_map); let change = AmbiguityChange { + member_id: member_event.state_key().clone(), disambiguated_member, ambiguated_member, member_ambiguous: ambiguous,