char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweak descriptions given by Describe impls.

master
Denis Kasak 2020-08-19 15:34:45 +02:00
parent bf7070b8f2
commit 7519bec9a3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
matrix_sdk_base/src/models/room.rs
View File

@ -647,7 +647,7 @@ impl Room {
if state_event && !self.member_is_tracked(&target_user) { if state_event && !self.member_is_tracked(&target_user) {
debug!( debug!(
"handle_membership: User {user_id} is {state} the room {room_id} ({room_name})", "handle_membership: User {user_id} {state} the room {room_id} ({room_name})",
user_id = target_user, user_id = target_user,
state = event.content.membership.describe(), state = event.content.membership.describe(),
room_id = self.room_id, room_id = self.room_id,
@ -1089,8 +1089,8 @@ impl Describe for MembershipState {
Self::Ban => "is banned in", Self::Ban => "is banned in",
Self::Invite => "is invited to", Self::Invite => "is invited to",
Self::Join => "is a member of", Self::Join => "is a member of",
Self::Knock => "is requesting access", Self::Knock => "is requesting access to",
Self::Leave => "left", Self::Leave => "has left",
} }
.to_string() .to_string()
} }
@ -1112,12 +1112,12 @@ impl Describe for MembershipChange {
displayname_changed, displayname_changed,
avatar_url_changed, avatar_url_changed,
} => match (*displayname_changed, *avatar_url_changed) { } => match (*displayname_changed, *avatar_url_changed) {
(true, true) => "changed their displayname and avatar", (true, true) => "changed their displayname and avatar in",
(true, false) => "changed their displayname", (true, false) => "changed their displayname in",
(false, true) => "changed their avatar", (false, true) => "changed their avatar in",
_ => { _ => {
error!("Got ProfileChanged but nothing changed"); error!("Got ProfileChanged but nothing changed");
"impossible: changed nothing in their profile" "impossible: changed nothing in their profile in"
} }
}, },
Self::None => "did nothing in", Self::None => "did nothing in",