From 0f910b6229233ea1bb32d0570efc4493d4f960cc Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 18 May 2022 13:28:15 +0200 Subject: [PATCH] fix(base): Make max_power_level reflect the current maximum only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … instead of taking into account an older maximum as well. --- crates/matrix-sdk-base/src/rooms/mod.rs | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/crates/matrix-sdk-base/src/rooms/mod.rs b/crates/matrix-sdk-base/src/rooms/mod.rs index 75c3d21e6..049854a09 100644 --- a/crates/matrix-sdk-base/src/rooms/mod.rs +++ b/crates/matrix-sdk-base/src/rooms/mod.rs @@ -1,7 +1,7 @@ mod members; mod normal; -use std::{cmp::max, collections::HashSet, fmt}; +use std::{collections::HashSet, fmt}; pub use members::RoomMember; pub use normal::{Room, RoomInfo, RoomType}; @@ -143,11 +143,7 @@ impl BaseRoomInfo { self.tombstone = Some(t.into()); } AnySyncStateEvent::RoomPowerLevels(p) => { - self.max_power_level = p - .power_levels() - .users - .values() - .fold(self.max_power_level, |acc, &p| max(acc, p.into())); + self.max_power_level = p.power_levels().max().into(); } _ => return false, } @@ -192,11 +188,7 @@ impl BaseRoomInfo { self.tombstone = Some(t.into()); } AnyStrippedStateEvent::RoomPowerLevels(p) => { - self.max_power_level = p - .content - .users - .values() - .fold(self.max_power_level, |acc, &p| max(acc, p.into())); + self.max_power_level = p.power_levels().max().into(); } _ => return false, }