From 74cf2b9a57f3c74cabfd6d77f27f48a1d25ec28e Mon Sep 17 00:00:00 2001
From: funtimes909 <funtimes90969@proton.me>
Date: Sun, 20 Apr 2025 17:21:21 +1200
Subject: [PATCH] Cleaner and more idiomatic database code, should allow way
 more servers to be updated in the DB

---
 src/database.rs | 63 +++++++++++++++++++++++--------------------------
 src/main.rs     |  5 +---
 src/response.rs |  2 +-
 3 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/src/database.rs b/src/database.rs
index 8b22eab..96de103 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -7,7 +7,7 @@ use tracing::error;
 
 pub async fn connect(url: &str) -> Pool<Postgres> {
 	match sqlx::postgres::PgPoolOptions::new()
-		.max_connections(50)
+		.max_connections(25)
 		.connect(url)
 		.await
 	{
@@ -20,7 +20,7 @@ pub async fn connect(url: &str) -> Pool<Postgres> {
 }
 
 pub async fn fetch_servers(pool: &Pool<Postgres>) -> BoxStream<Result<PgRow, Error>> {
-	sqlx::query("SELECT address FROM servers ORDER BY lastseen DESC LIMIT 100").fetch(pool)
+	sqlx::query("SELECT address FROM servers ORDER BY lastseen DESC").fetch(pool)
 }
 
 pub async fn fetch_count(pool: &Pool<Postgres>) -> i64 {
@@ -35,19 +35,13 @@ pub async fn update(server: Server, conn: &PgPool, host: &(String, u16)) -> anyh
 	let mut transaction = conn.begin().await?;
 	let timestamp = SystemTime::now()
 		.duration_since(UNIX_EPOCH)
-		.expect("system time is before the unix epoch")
+		.expect("System time is before the unix epoch")
 		.as_secs() as i32;
 
 	let (address, port) = host;
 	// TODO: Can't be used in the database yet
 	// let server_type = server.get_type();
 
-	let players = server
-		.players
-		.ok_or(anyhow::Error::msg("Players object is missing!"))?;
-	let forge_data = server
-		.forge_data
-		.ok_or(anyhow::Error::msg("ForgeData object is missing!"))?;
 	let description: String = server
 		.description
 		.ok_or(anyhow::Error::msg("MOTD is missing!"))?
@@ -75,43 +69,44 @@ pub async fn update(server: Server, conn: &PgPool, host: &(String, u16)) -> anyh
 	.bind(server.prevents_reports)
 	.bind(server.enforces_secure_chat)
 	.bind(timestamp)
-	.bind(players.online)
-	.bind(players.max)
+	.bind(server.players.online)
+	.bind(server.players.max)
 	.bind(address)
 	.bind(*port as i64)
 	.execute(&mut *transaction)
 	.await?;
 
 	// Update players
-	for player in players
-		.sample
-		.ok_or(anyhow::Error::msg("Players sample is missing!"))?
-	{
-		sqlx::query("INSERT INTO playerhistory (address, port, playeruuid, playername, firstseen, lastseen) VALUES ($1, $2, $3, $4, $5, $6)
+	if let Some(sample) = server.players.sample {
+		for player in sample {
+			sqlx::query("INSERT INTO playerhistory (address, port, playeruuid, playername, firstseen, lastseen) VALUES ($1, $2, $3, $4, $5, $6)
                     ON CONFLICT (address, port, playeruuid) DO UPDATE SET
                     lastseen = EXCLUDED.lastseen,
                     playername = EXCLUDED.playername")
-            .bind(address)
-            .bind(*port as i64)
-            .bind(player.id)
-            .bind(player.name)
-            .bind(timestamp)
-            .bind(timestamp)
-            .execute(&mut *transaction)
-            .await?;
+						.bind(address)
+						.bind(*port as i64)
+						.bind(player.id)
+						.bind(player.name)
+						.bind(timestamp)
+						.bind(timestamp)
+						.execute(&mut *transaction)
+						.await?;
+		}
 	}
 
 	// Update mods
-	for mods in forge_data.mods {
-		sqlx::query("INSERT INTO mods (address, port, modid, modmarker) VALUES ($1, $2, $3, $4) ON CONFLICT (address, port, modid) DO NOTHING")
-            .bind(address)
-            .bind(*port as i64)
-            .bind(mods.id)
-            .bind(mods.marker)
-            .bind(timestamp)
-            .bind(timestamp)
-            .execute(&mut *transaction)
-            .await?;
+	if let Some(mods_sample) = server.forge_data {
+		for mods in mods_sample.mods {
+			sqlx::query("INSERT INTO mods (address, port, modid, modmarker) VALUES ($1, $2, $3, $4) ON CONFLICT (address, port, modid) DO NOTHING")
+				.bind(address)
+				.bind(*port as i64)
+				.bind(mods.id)
+				.bind(mods.marker)
+				.bind(timestamp)
+				.bind(timestamp)
+				.execute(&mut *transaction)
+				.await?;
+		}
 	}
 
 	transaction
diff --git a/src/main.rs b/src/main.rs
index c94eeff..ea63b23 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -133,7 +133,7 @@ enum RunError {
 // TODO: add to config file
 const TIMEOUT_SECS: Duration = Duration::from_secs(5);
 
-static PERMITS: Semaphore = Semaphore::const_new(500);
+static PERMITS: Semaphore = Semaphore::const_new(200);
 
 #[tracing::instrument(skip(pool, progress_bar))]
 async fn run(
@@ -159,9 +159,6 @@ async fn run(
 	}
 
 	let result = run_inner(host, pool).await;
-	if let Err(ref e) = result {
-		debug!("{e}");
-	}
 
 	progress_bar.inc(1);
 	result
diff --git a/src/response.rs b/src/response.rs
index 02b95bc..c13dd59 100644
--- a/src/response.rs
+++ b/src/response.rs
@@ -22,12 +22,12 @@ pub enum ServerType {
 pub struct Server {
 	pub version: Version,
 	pub favicon: Option<String>,
+	pub players: Players,
 	pub description: Option<Description>,
 	#[serde(rename = "preventsChatReports")]
 	pub prevents_reports: Option<bool>,
 	#[serde(rename = "enforcesSecureChat")]
 	pub enforces_secure_chat: Option<bool>,
-	pub players: Option<Players>,
 	#[serde(rename = "isModded")]
 	pub modded: Option<bool>,
 	#[serde(rename = "forgeData")]