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

Simplify extraction of JSON object from event content.

Browse Source
This commit is contained in:
Jimmy Cuadra 2019-07-09 04:00:21 -07:00
parent 935407c805
commit 152458707c
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/functions.rs
View File

@ -322,27 +322,26 @@ fn redact(value: &Value) -> Result<Value, Error> {
}; };
if let Some(content_value) = event.get_mut("content") { if let Some(content_value) = event.get_mut("content") {
if !content_value.is_object() { let map = match content_value {
return Err(Error::new( Value::Object(ref mut map) => map,
"Field `content` in JSON value must be a JSON object", _ => {
)); return Err(Error::new(
} "Field `content` in JSON value must be a JSON object",
))
}
};
let content = content_value for key in map.clone().keys() {
.as_object_mut()
.expect("safe since we checked above");
for key in content.clone().keys() {
match event_type.as_ref() { match event_type.as_ref() {
"m.room.member" if key != "membership" => content.remove(key), "m.room.member" if key != "membership" => map.remove(key),
"m.room.create" if key != "creator" => content.remove(key), "m.room.create" if key != "creator" => map.remove(key),
"m.room.join_rules" if key != "join_rules" => content.remove(key), "m.room.join_rules" if key != "join_rules" => map.remove(key),
"m.room.power_levels" if !ALLOWED_POWER_LEVELS_KEYS.contains(&key.as_ref()) => { "m.room.power_levels" if !ALLOWED_POWER_LEVELS_KEYS.contains(&key.as_ref()) => {
content.remove(key) map.remove(key)
} }
"m.room.aliases" if key != "aliases" => content.remove(key), "m.room.aliases" if key != "aliases" => map.remove(key),
"m.room.history_visibility" if key != "history_visibility" => content.remove(key), "m.room.history_visibility" if key != "history_visibility" => map.remove(key),
_ => content.remove(key), _ => map.remove(key),
}; };
} }
} }