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

impl Deserialize for m.room.server_acl

Browse Source
This commit is contained in:
Jimmy Cuadra 2019-08-06 15:23:40 -07:00
parent db89aad22c
commit c309eed2ae
1 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/room/server_acl.rs
View File

@ -4,11 +4,12 @@ use std::{convert::TryFrom, str::FromStr};
use js_int::UInt;
use ruma_identifiers::{EventId, RoomId, UserId};
use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer};
use serde::{ser::SerializeStruct, Deserialize, Deserializer, Serialize, Serializer};
use serde_json::Value;
use crate::{
default_true, Event, EventType, InnerInvalidEvent, InvalidEvent, RoomEvent, StateEvent,
default_true, Event, EventResult, EventType, InnerInvalidEvent, InvalidEvent, RoomEvent,
StateEvent,
};
/// An event to indicate which servers are permitted to participate in the room.
@ -69,6 +70,46 @@ pub struct ServerAclEventContent {
pub deny: Vec<String>,
}
impl<'de> Deserialize<'de> for EventResult<ServerAclEvent> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let json = serde_json::Value::deserialize(deserializer)?;
let raw: raw::ServerAclEvent = match serde_json::from_value(json.clone()) {
Ok(raw) => raw,
Err(error) => {
return Ok(EventResult::Err(InvalidEvent(
InnerInvalidEvent::Validation {
json,
message: error.to_string(),
},
)));
}
};
Ok(EventResult::Ok(ServerAclEvent {
content: ServerAclEventContent {
allow_ip_literals: raw.content.allow_ip_literals,
allow: raw.content.allow,
deny: raw.content.deny,
},
event_id: raw.event_id,
origin_server_ts: raw.origin_server_ts,
prev_content: raw.prev_content.map(|prev| ServerAclEventContent {
allow_ip_literals: prev.allow_ip_literals,
allow: prev.allow,
deny: prev.deny,
}),
room_id: raw.room_id,
unsigned: raw.unsigned,
sender: raw.sender,
state_key: raw.state_key,
}))
}
}
impl FromStr for ServerAclEvent {
type Err = InvalidEvent;
@ -139,6 +180,33 @@ impl_state_event!(
EventType::RoomServerAcl
);
impl<'de> Deserialize<'de> for EventResult<ServerAclEventContent> {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
D: Deserializer<'de>,
{
let json = serde_json::Value::deserialize(deserializer)?;
let raw: raw::ServerAclEventContent = match serde_json::from_value(json.clone()) {
Ok(raw) => raw,
Err(error) => {
return Ok(EventResult::Err(InvalidEvent(
InnerInvalidEvent::Validation {
json,
message: error.to_string(),
},
)));
}
};
Ok(EventResult::Ok(ServerAclEventContent {
allow_ip_literals: raw.allow_ip_literals,
allow: raw.allow,
deny: raw.deny,
}))
}
}
impl FromStr for ServerAclEventContent {
type Err = InvalidEvent;