diff --git a/Cargo.lock b/Cargo.lock index f1ffb8e..60f2149 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1126,7 +1126,7 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "playerbot" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "dotenvy", diff --git a/Cargo.toml b/Cargo.toml index 58fb353..783336e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "playerbot" -version = "0.5.0" +version = "0.6.0" edition = "2021" [dependencies] diff --git a/src/main.rs b/src/main.rs index dc9b148..0245a5f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,7 @@ mod scpsl; mod types; use dotenvy::{self, dotenv}; use minecraft::Minecraft; -use scpsl::SCPSL; +use scpsl::Scpsl; use tokio::join; use url::{self, Url}; @@ -23,7 +23,7 @@ async fn main() { Url::try_from("https://api.mcstatus.io/v2/status/java/mchprs.shibedrill.site").unwrap(), std::env::var("TOKEN_BOT_MC_MCHPRS").unwrap(), ); - let scpsl = SCPSL::new( + let scpsl = Scpsl::new( Url::try_from("https://api.scplist.kr/api/servers/81460").unwrap(), std::env::var("TOKEN_BOT_SCPSL").unwrap(), ); diff --git a/src/minecraft.rs b/src/minecraft.rs index aac5dd1..9c85869 100644 --- a/src/minecraft.rs +++ b/src/minecraft.rs @@ -98,7 +98,7 @@ pub async fn event_handler( .unwrap(); info!("Got status: {}", status.to_string()); - funcs::set_presence(&ctx, status); + funcs::set_presence(ctx, status); tokio::time::sleep(std::time::Duration::from_secs(30)).await; }, _ => Ok(()), diff --git a/src/scpsl.rs b/src/scpsl.rs index 52804ef..935c925 100644 --- a/src/scpsl.rs +++ b/src/scpsl.rs @@ -12,16 +12,16 @@ struct ServerSummary { } pub struct Data { - controller: SCPSL, + controller: Scpsl, } #[derive(Clone)] -pub struct SCPSL { +pub struct Scpsl { url: Url, token: String, } -impl SCPSL { +impl Scpsl { pub fn new(url: Url, token: String) -> Self { Self { url, token } } @@ -38,8 +38,8 @@ impl SCPSL { Ok(ServerResponse::new( data.online, - playercount_unwrapped.get(0).map(|u| u.clone()), - playercount_unwrapped.get(1).map(|u| u.clone()), + playercount_unwrapped.first().copied(), + playercount_unwrapped.get(1).copied(), )) }