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

events: Fix default invite power level

Browse Source
This commit is contained in:
Jonas Platte 2022-04-05 17:43:52 +02:00 committed by GitHub
parent 7de3b4b649
commit 002d863738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/CHANGELOG.md
View File

@ -1,5 +1,11 @@
# [unreleased] # [unreleased]
Bug fixes:
* Change default `invite` power level to `0`
* The spec was determined to be wrong about the default:
<https://github.com/matrix-org/matrix-spec/pull/1021>
Breaking changes: Breaking changes:
* Several ruma crates have been merged into `ruma-common` * Several ruma crates have been merged into `ruma-common`

10
crates/ruma-common/src/events/room/power_levels.rs
View File

@ -67,7 +67,7 @@ pub struct RoomPowerLevelsEventContent {
feature = "compat", feature = "compat",
serde(deserialize_with = "crate::serde::deserialize_v1_powerlevel") serde(deserialize_with = "crate::serde::deserialize_v1_powerlevel")
)] )]
#[serde(default = "default_power_level", skip_serializing_if = "is_default_power_level")] #[serde(default, skip_serializing_if = "crate::serde::is_default")]
pub invite: Int, pub invite: Int,
/// The level required to kick a user. /// The level required to kick a user.
@ -147,13 +147,13 @@ impl RoomPowerLevelsEventContent {
Self { Self {
ban: default_power_level(), ban: default_power_level(),
events: BTreeMap::new(), events: BTreeMap::new(),
events_default: Int::default(), events_default: int!(0),
invite: default_power_level(), invite: int!(0),
kick: default_power_level(), kick: default_power_level(),
redact: default_power_level(), redact: default_power_level(),
state_default: default_power_level(), state_default: default_power_level(),
users: BTreeMap::new(), users: BTreeMap::new(),
users_default: Int::default(), users_default: int!(0),
notifications: NotificationPowerLevels::default(), notifications: NotificationPowerLevels::default(),
} }
} }
@ -193,7 +193,7 @@ mod tests {
ban: default, ban: default,
events: BTreeMap::new(), events: BTreeMap::new(),
events_default: int!(0), events_default: int!(0),
invite: default, invite: int!(0),
kick: default, kick: default,
redact: default, redact: default,
state_default: default, state_default: default,