64 ); |
64 ); |
65 } |
65 } |
66 JoinRoom(name, password) => { |
66 JoinRoom(name, password) => { |
67 match server.join_room_by_name(client_id, &name, password.as_deref()) { |
67 match server.join_room_by_name(client_id, &name, password.as_deref()) { |
68 Err(error) => super::common::get_room_join_error(error, response), |
68 Err(error) => super::common::get_room_join_error(error, response), |
69 Ok((client, room, room_clients)) => { |
69 Ok((client, master, room, room_clients)) => { |
70 super::common::get_room_join_data(client, room, room_clients, response) |
70 super::common::get_room_join_data(client, master, room, room_clients, response) |
71 } |
71 } |
72 } |
72 } |
73 } |
73 } |
74 Follow(nick) => { |
74 Follow(nick) => { |
75 if let Some(client) = server.find_client(&nick) { |
75 if let Some(client) = server.find_client(&nick) { |
76 if let Some(room_id) = client.room_id { |
76 if let Some(room_id) = client.room_id { |
77 match server.join_room(client_id, room_id, None) { |
77 match server.join_room(client_id, room_id, None) { |
78 Err(error) => super::common::get_room_join_error(error, response), |
78 Err(error) => super::common::get_room_join_error(error, response), |
79 Ok((client, room, room_clients)) => { |
79 Ok((client, master, room, room_clients)) => { |
80 super::common::get_room_join_data(client, room, room_clients, response) |
80 super::common::get_room_join_data(client, master, room, room_clients, response) |
81 } |
81 } |
82 } |
82 } |
83 } else { |
83 } else { |
84 response.warn(NO_ROOM); |
84 response.warn(NO_ROOM); |
85 } |
85 } |