British-Information-Technologies
/
ChatKit-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'channel-structure' of https://github.com/mitch161/rust-chat-server into channel-structure

This commit is contained in:
michael-bailey 2020-07-17 20:53:47 +01:00
parent 8a07d278bf 79e6e425dc
commit 0903a07cc0
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/client/client_profile.rs
View File

@ -75,11 +75,7 @@ impl<'a> Client<'a> {
match command {
Commands::Info(Some(params)) => {
self.get_stream().write_all(a.to_string().as_bytes());
/* why not do this?
*
* self.transmit_data(a.to_string().as_str());
*/
self.transmit_data(a.to_string().as_str());
},
Commands::Disconnect(None) => {
@ -87,10 +83,17 @@ impl<'a> Client<'a> {
Commands::ClientRemove(Some(params)) => {},
Commands::Client(Some(params)) => {
self.transmit_data(a.to_string().as_str());
todo!()
/*
* a success message needs to be read and confirmed
*/
let command = Commands::from(&buffer);
match command{
Commands::Success(None) => {
println!("sucess confirmed");
},
_ => {
let error = Commands::Error(None);
self.transmit_data(error.to_string().as_str());
},
}
},
Commands::Success(data) => {},
_ => {},

5
src/server/server_profile.rs
View File

@ -70,6 +70,11 @@ impl<'server_lifetime> Server<'server_lifetime> {
self.thread_pool.execute(move || {
client.handle_connection();
});
let params: HashMap<String, String> = [(String::from("name"), username.clone()), (String::from("host"), address.clone()), (String::from("uuid"), uuid.clone())];
let new_client = Commands::Client(Some(params));
self.update_all_clients(new_client);
},
Commands::Info(None) => {
let mut params: HashMap<String, String> = HashMap::new();