asonix/lemmy
1
0
Fork 0
forked from nutomic/lemmy
Code Issues Pull requests Releases Wiki Activity

simplify json serialization code

Browse source
This commit is contained in:
Felix 2020-01-18 17:25:45 +01:00
parent 047ec97e18
commit baf77bb6be
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/src/websocket/server.rs
View file

@ -295,18 +295,21 @@ impl Handler<StandardMessage> for ChatServer {
}
}
#[derive(Serialize)]
struct WebsocketResponse<T> {
op: String,
data: T,
}
fn to_json_string<T>(op: &UserOperation, data: T) -> Result<String, Error>
where
T: Serialize,
{
let mut json = serde_json::to_value(&data)?;
match json.as_object_mut() {
Some(j) => j.insert("op".to_string(), serde_json::to_value(op.to_string())?),
None => return Err(format_err!("")),
let response = WebsocketResponse {
op: op.to_string(),
data,
};
// TODO: it seems like this is never called?
let x = serde_json::to_string(&json)?;
Ok(x)
Ok(serde_json::to_string(&response)?)
}
fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<String, Error> {