From e72e51f60c6bcb27859f4508b0f0b1d00c708c1b Mon Sep 17 00:00:00 2001
From: funtimes909 <68979259+Funtimes909@users.noreply.github.com>
Date: Sun, 5 Apr 2026 12:57:18 +1200
Subject: [PATCH] fix clippy lints

---
 src/database/country_tracking.rs |  2 +-
 src/database/mod.rs              |  4 ++--
 src/protocol/response.rs         | 14 ++++++------
 src/scanning/discovery.rs        | 38 ++++++++++++++++----------------
 src/scanning/rescanner.rs        |  5 ++---
 5 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/src/database/country_tracking.rs b/src/database/country_tracking.rs
index d266af7..f8e99f3 100644
--- a/src/database/country_tracking.rs
+++ b/src/database/country_tracking.rs
@@ -38,7 +38,7 @@ pub async fn run(pool: &PgPool) {
 			error!("Error while downloading countries database from ipinfo: {e}");
 		};
 
-		if let Err(e) = insert_records_to_database(&pool).await {
+		if let Err(e) = insert_records_to_database(pool).await {
 			error!("Error while inserting rows to countries table: {e}");
 		}
 	}
diff --git a/src/database/mod.rs b/src/database/mod.rs
index 298d93e..72edae4 100644
--- a/src/database/mod.rs
+++ b/src/database/mod.rs
@@ -4,10 +4,10 @@ use std::str::FromStr;
 
 use super::protocol::response::MinecraftServer;
 use chrono::NaiveDateTime;
-use sqlx::postgres::{PgArguments, PgQueryResult};
+use sqlx::postgres::PgQueryResult;
 use sqlx::types::Uuid;
 use sqlx::types::ipnet::IpNet;
-use sqlx::{Encode, Execute, Pool, Postgres, QueryBuilder, Row};
+use sqlx::{Pool, Postgres, QueryBuilder, Row};
 
 #[derive(Debug, Clone)]
 pub struct Database {
diff --git a/src/protocol/response.rs b/src/protocol/response.rs
index 8caeca3..6eee321 100644
--- a/src/protocol/response.rs
+++ b/src/protocol/response.rs
@@ -117,17 +117,17 @@ impl MinecraftServer {
 		}
 
 		// Check for duplicate uuids
-		self.players.sample.as_ref().map(|a| {
+		if let Some(a) = &self.players.sample {
 			a.iter().for_each(|a| {
-				let uuid = Uuid::parse_str(&a.id).unwrap();
+				if let Ok(uuid) = Uuid::parse_str(&a.id) {
+					if seen_uuids.contains(&uuid) {
+						is_fake_sample = true
+					}
 
-				if seen_uuids.contains(&uuid) {
-					is_fake_sample = true
+					seen_uuids.insert(uuid);
 				}
-
-				seen_uuids.insert(uuid);
 			})
-		});
+		}
 
 		is_fake_sample
 	}
diff --git a/src/scanning/discovery.rs b/src/scanning/discovery.rs
index 9605f75..66bcecd 100644
--- a/src/scanning/discovery.rs
+++ b/src/scanning/discovery.rs
@@ -65,27 +65,27 @@ impl DiscoveryScanner {
 				let socket = SocketAddrV4::new(address, port);
 				let mut stream = tokio::net::TcpStream::connect(socket).await.unwrap();
 
-				if let Ok(response) = simple_ping(&mut stream).await {
-					if let Ok(server) = serde_json::from_str::<MinecraftServer>(&response) {
-						let address = IpNet::from(Ipv4Net::from(address));
+				if let Ok(response) = simple_ping(&mut stream).await
+					&& let Ok(server) = serde_json::from_str::<MinecraftServer>(&response)
+				{
+					let address = IpNet::from(Ipv4Net::from(address));
 
-						if server.has_opted_out() {
-							println!("Deleting server!");
-							database_clone.delete_server(address).await.unwrap();
-						}
-
-						let update_operation = ServerUpdateOperation {
-							server,
-							address,
-							port: port as i32,
-							timestamp: chrono::Utc::now().naive_utc().with_nanosecond(0).unwrap(),
-							database: database_clone,
-						};
-
-						update_operation.update_or_insert_server().await.unwrap();
-						update_operation.update_or_insert_players().await.unwrap();
-						update_operation.update_or_insert_mods().await.unwrap();
+					if server.has_opted_out() {
+						println!("Deleting server!");
+						database_clone.delete_server(address).await.unwrap();
 					}
+
+					let update_operation = ServerUpdateOperation {
+						server,
+						address,
+						port: port as i32,
+						timestamp: chrono::Utc::now().naive_utc().with_nanosecond(0).unwrap(),
+						database: database_clone,
+					};
+
+					update_operation.update_or_insert_server().await.unwrap();
+					update_operation.update_or_insert_players().await.unwrap();
+					update_operation.update_or_insert_mods().await.unwrap();
 				}
 			});
 		}
diff --git a/src/scanning/rescanner.rs b/src/scanning/rescanner.rs
index f61241c..39b6133 100644
--- a/src/scanning/rescanner.rs
+++ b/src/scanning/rescanner.rs
@@ -48,8 +48,8 @@ impl Rescanner {
 
             let database_clone = self.database.clone();
 
-            if let Ok(ping_response) = simple_ping(&mut stream).await {
-                if let Ok(server) = serde_json::from_str::<MinecraftServer>(&ping_response) {
+            if let Ok(ping_response) = simple_ping(&mut stream).await 
+                && let Ok(server) = serde_json::from_str::<MinecraftServer>(&ping_response) {
 
 					if server.has_opted_out() {
 						database_clone.delete_server(address).await.unwrap();
@@ -67,7 +67,6 @@ impl Rescanner {
 					update_operation.update_or_insert_players().await.unwrap();
 					update_operation.update_or_insert_mods().await.unwrap();
                 }
-            }
 
             bar.inc(1);
         }