girlbossceo-archive/ruwuma
1
0
Fork 0
mirror of https://github.com/girlbossceo/ruwuma.git synced 2025-04-29 06:49:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

nuke tf out of skip_serializing_if on power levels to improve client compatibility

Browse source 
Signed-off-by: June Clementine Strawberry <june@3.dog>
This commit is contained in:
June Clementine Strawberry 2025-03-05 22:41:49 -05:00
parent b40e765286
commit a2adc6ffa7
No known key found for this signature in database
1 changed files with 7 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
crates/ruma-events/src/room/power_levels.rs
View file

@ -28,7 +28,6 @@ pub struct RoomPowerLevelsEventContent {
/// The level required to ban a user.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub ban: Int,
@ -38,31 +37,21 @@ pub struct RoomPowerLevelsEventContent {
/// This is a mapping from event type to power level required.
#[serde(
default,
skip_serializing_if = "BTreeMap::is_empty",
deserialize_with = "ruma_common::serde::btreemap_deserialize_v1_powerlevel_values"
)]
pub events: BTreeMap<TimelineEventType, Int>,
/// The default level required to send message events.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub events_default: Int,
/// The level required to invite a user.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub invite: Int,
/// The level required to kick a user.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub kick: Int,
@ -70,7 +59,6 @@ pub struct RoomPowerLevelsEventContent {
/// The level required to redact an event.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub redact: Int,
@ -78,7 +66,6 @@ pub struct RoomPowerLevelsEventContent {
/// The default level required to send state events.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub state_default: Int,
@ -88,23 +75,18 @@ pub struct RoomPowerLevelsEventContent {
/// This is a mapping from `user_id` to power level for that user.
#[serde(
default,
skip_serializing_if = "BTreeMap::is_empty",
deserialize_with = "ruma_common::serde::btreemap_deserialize_v1_powerlevel_values"
)]
pub users: BTreeMap<OwnedUserId, Int>,
/// The default power level for every user in the room.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub users_default: Int,
/// The power level requirements for specific notification types.
///
/// This is a mapping from `key` to power level for that notifications key.
#[serde(default, skip_serializing_if = "NotificationPowerLevels::is_default")]
#[serde(default)]
pub notifications: NotificationPowerLevels,
}
@ -179,12 +161,6 @@ impl RedactContent for RoomPowerLevelsEventContent {
}
}
/// Used with `#[serde(skip_serializing_if)]` to omit default power levels.
#[allow(clippy::trivially_copy_pass_by_ref)]
fn is_default_power_level(l: &Int) -> bool {
*l == int!(50)
}
impl RoomPowerLevelsEvent {
/// Obtain the effective power levels, regardless of whether this event is redacted.
pub fn power_levels(&self) -> RoomPowerLevels {
@ -219,7 +195,6 @@ pub struct RedactedRoomPowerLevelsEventContent {
/// The level required to ban a user.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub ban: Int,
@ -229,34 +204,24 @@ pub struct RedactedRoomPowerLevelsEventContent {
/// This is a mapping from event type to power level required.
#[serde(
default,
skip_serializing_if = "BTreeMap::is_empty",
deserialize_with = "ruma_common::serde::btreemap_deserialize_v1_powerlevel_values"
)]
pub events: BTreeMap<TimelineEventType, Int>,
/// The default level required to send message events.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub events_default: Int,
/// The level required to invite a user.
///
/// This field was redacted in room versions 1 through 10. Starting from room version 11 it is
/// preserved.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub invite: Int,
/// The level required to kick a user.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub kick: Int,
@ -264,7 +229,6 @@ pub struct RedactedRoomPowerLevelsEventContent {
/// The level required to redact an event.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub redact: Int,
@ -272,7 +236,6 @@ pub struct RedactedRoomPowerLevelsEventContent {
/// The default level required to send state events.
#[serde(
default = "default_power_level",
skip_serializing_if = "is_default_power_level",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
pub state_default: Int,
@ -282,17 +245,12 @@ pub struct RedactedRoomPowerLevelsEventContent {
/// This is a mapping from `user_id` to power level for that user.
#[serde(
default,
skip_serializing_if = "BTreeMap::is_empty",
deserialize_with = "ruma_common::serde::btreemap_deserialize_v1_powerlevel_values"
)]
pub users: BTreeMap<OwnedUserId, Int>,
/// The default power level for every user in the room.
#[serde(
default,
skip_serializing_if = "ruma_common::serde::is_default",
deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel"
)]
#[serde(default, deserialize_with = "ruma_common::serde::deserialize_v1_powerlevel")]
pub users_default: Int,
}