server from db working
This commit is contained in:
@ -1,5 +1,10 @@
|
||||
use crate::minecraft::client::client::Client;
|
||||
|
||||
use diesel::prelude::*;
|
||||
use diesel::result::Error::NotFound;
|
||||
use crate::schema;
|
||||
use crate::models;
|
||||
|
||||
use json::object;
|
||||
|
||||
use crate::minecraft::varint::varint_write;
|
||||
@ -16,27 +21,47 @@ impl Client {
|
||||
"max": 420,
|
||||
"online": 69
|
||||
},
|
||||
"description": "§c".to_string() + &self.handshake.as_ref().unwrap().server_address.clone() + "§r:§a" + &self.handshake.as_ref().unwrap().server_port.to_string(),
|
||||
"description": self.get_description().await,
|
||||
};
|
||||
|
||||
if packet_id == 0 {
|
||||
let mut response : Vec<u8> = vec![];
|
||||
|
||||
let response_json = json::stringify(status_response);
|
||||
let mut response_json_len = varint_write(response_json.len() as i32);
|
||||
let mut response_packet_id = varint_write(0);
|
||||
|
||||
response.append(&mut response_packet_id);
|
||||
response.append(&mut response_json_len);
|
||||
response.append(&mut response_json.as_bytes().into());
|
||||
println!("[{}] sent status response to client", self);
|
||||
|
||||
self.send_packet(response).await;
|
||||
self.send_packet(0x0, response).await;
|
||||
} else if packet_id == 1 {
|
||||
let mut response = varint_write(1);
|
||||
let mut response = vec![];
|
||||
response.extend(packet.drain(..));
|
||||
self.send_packet(response).await;
|
||||
self.send_packet(0x1, response).await;
|
||||
println!("[{}] sent ping response to client", self);
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
pub async fn get_description(&self) -> String {
|
||||
if let None = self.server {
|
||||
"How did you send a status request without a handshake ???".to_string();
|
||||
}
|
||||
|
||||
match self.server.as_ref().unwrap() {
|
||||
Ok(server) => {
|
||||
let login = match server.last_login {
|
||||
Some(date) => { format!("{:?}", date) },
|
||||
None => { "never".to_string() }
|
||||
};
|
||||
format!("§fServer is {}\nlast login: {}", server.status, login)
|
||||
},
|
||||
Err(NotFound) => { "§cThis server does not exist".to_string() },
|
||||
Err(error) => { format!("§cAn error occured while retreiving the information:\n{}", error) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user