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

events: Make sure matches with RoomVersionId default to behavior of latest room version

Browse Source 
Avoids forgetting to update the match if nothing changed since the last version.
This commit is contained in:
Kévin Commaille 2023-08-10 12:49:23 +02:00 committed by Kévin Commaille
parent 9a5bc6d8c3
commit cf70f74fb7
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,12 +164,19 @@ impl RoomMemberEventContent {
impl RedactContent for RoomMemberEventContent {
type Redacted = RedactedRoomMemberEventContent;
fn redact(self, _version: &RoomVersionId) -> RedactedRoomMemberEventContent {
fn redact(self, version: &RoomVersionId) -> RedactedRoomMemberEventContent {
RedactedRoomMemberEventContent {
membership: self.membership,
join_authorized_via_users_server: match _version {
RoomVersionId::V9 | RoomVersionId::V10 => self.join_authorized_via_users_server,
_ => None,
join_authorized_via_users_server: match version {
RoomVersionId::V1
| RoomVersionId::V2
| RoomVersionId::V3
| RoomVersionId::V4
| RoomVersionId::V5
| RoomVersionId::V6
| RoomVersionId::V7
| RoomVersionId::V8 => None,
_ => self.join_authorized_via_users_server,
},
}
}