diff options
author | Dessalines <happydooby@gmail.com> | 2019-08-15 16:53:59 -0700 |
---|---|---|
committer | Dessalines <happydooby@gmail.com> | 2019-08-15 16:53:59 -0700 |
commit | 42c9c57a1c169720b8ac5182dc20da5051bd6dcc (patch) | |
tree | 02944106433ef4daa981094b6074583585b27c36 /server/src/websocket/server.rs | |
parent | 1070cd6921ba533772d1ee1cf4e28cbb0c938f32 (diff) | |
parent | d3ecba4405e8a2bfb7ea02ac17c2c9f5be978d4a (diff) |
Merge branch 'dev'
Diffstat (limited to 'server/src/websocket/server.rs')
-rw-r--r-- | server/src/websocket/server.rs | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/server/src/websocket/server.rs b/server/src/websocket/server.rs index 7088f3d5..64f94f4c 100644 --- a/server/src/websocket/server.rs +++ b/server/src/websocket/server.rs @@ -134,17 +134,19 @@ impl ChatServer { use crate::db::*; use crate::db::post_view::*; let conn = establish_connection(); - let posts = PostView::list(&conn, - PostListingType::Community, - &SortType::New, - Some(*community_id), - None, - None, - None, - false, - false, - None, - Some(9999))?; + let posts = PostView::list( + &conn, + PostListingType::Community, + &SortType::New, + Some(*community_id), + None, + None, + None, + false, + false, + false, + None, + Some(9999))?; for post in posts { self.send_room_message(&post.id, message, skip_id); } @@ -303,6 +305,11 @@ fn parse_json_message(chat: &mut ChatServer, msg: StandardMessage) -> Result<Str let res = Oper::new(user_operation, get_user_details).perform()?; Ok(serde_json::to_string(&res)?) }, + UserOperation::SaveUserSettings => { + let save_user_settings: SaveUserSettings = serde_json::from_str(data)?; + let res = Oper::new(user_operation, save_user_settings).perform()?; + Ok(serde_json::to_string(&res)?) + }, UserOperation::AddAdmin => { let add_admin: AddAdmin = serde_json::from_str(data)?; let res = Oper::new(user_operation, add_admin).perform()?; |