prescientmoon/shimmeringmoon
prescientmoon/shimmeringmoon
1
Fork 0
Code Activity

Use Display instead of Debug for raw body strings

Browse source
This commit is contained in:
prescientmoon 2025-04-21 15:50:42 +02:00
parent a0c1835e96
commit b70d9aaae2
Signed by: prescientmoon
SSH key fingerprint: SHA256:UUF9JT2s8Xfyv76b8ZuVL7XrmimH4o49p4b+iexbVH4
1 changed files with 16 additions and 8 deletions

24
src/private_server/mod.rs
View file

@ -147,7 +147,7 @@ pub async fn best(
let mut query_param = BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_string(&options)?); let mut query_param = BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_string(&options)?);
query_param.push_str("=="); // Maximum padding, as otherwise python screams at me query_param.push_str("=="); // Maximum padding, as otherwise python screams at me
let decoded = ctx let bytes = ctx
.http_client .http_client
.get(format!("{url}/api/v1/users/{}/best", private_user_id)) .get(format!("{url}/api/v1/users/{}/best", private_user_id))
.query(&[("query", query_param)]) .query(&[("query", query_param)])
@ -157,17 +157,21 @@ pub async fn best(
.context("Failed to send request")? .context("Failed to send request")?
.error_for_status() .error_for_status()
.context("Request has non-ok status")? .context("Request has non-ok status")?
.json::<PrivateServerResult<RawBestScores>>() .bytes()
.await .await
.context("Failed to get body bytes")?;
let decoded = serde_json::from_slice::<PrivateServerResult<RawBestScores>>(&bytes)
.context("Failed to decode response")?; .context("Failed to decode response")?;
let decoded = if let (true, MaybeData::SomeData(inner)) = (decoded.code == 0, &decoded.data) { let decoded = if let (true, MaybeData::SomeData(inner)) = (decoded.code == 0, &decoded.data) {
inner inner
} else { } else {
return Err(anyhow!( return Err(anyhow!(
"The server returned an error: \"{}\". Full response:\n```\n{:?}\n```", "The server returned an error: \"{}\". Full response:\n```\n{:?}\n``` \nRaw response:\n```\n{}\n```",
&decoded.msg, &decoded.msg,
&decoded &decoded,
String::from_utf8_lossy(&bytes)
) )
.tag(ErrorKind::Internal)); .tag(ErrorKind::Internal));
}; };
@ -222,7 +226,7 @@ pub async fn users(
let mut query_param = BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_string(&options)?); let mut query_param = BASE64_URL_SAFE_NO_PAD.encode(serde_json::to_string(&options)?);
query_param.push_str("=="); // Maximum padding, as otherwise python screams at me query_param.push_str("=="); // Maximum padding, as otherwise python screams at me
let decoded = ctx let bytes = ctx
.http_client .http_client
.get(format!("{url}/api/v1/users")) .get(format!("{url}/api/v1/users"))
.query(&[("query", query_param)]) .query(&[("query", query_param)])
@ -232,17 +236,21 @@ pub async fn users(
.context("Failed to send request")? .context("Failed to send request")?
.error_for_status() .error_for_status()
.context("Request has non-ok status")? .context("Request has non-ok status")?
.json::<PrivateServerResult<Vec<RawUser>>>() .bytes()
.await .await
.context("Failed to get body bytes")?;
let decoded = serde_json::from_slice::<PrivateServerResult<Vec<RawUser>>>(&bytes)
.context("Failed to decode response")?; .context("Failed to decode response")?;
let decoded = if let (true, MaybeData::SomeData(inner)) = (decoded.code == 0, &decoded.data) { let decoded = if let (true, MaybeData::SomeData(inner)) = (decoded.code == 0, &decoded.data) {
inner inner
} else { } else {
return Err(anyhow!( return Err(anyhow!(
"The server returned an error: \"{}\". Full response:\n```\n{:?}\n```", "The server returned an error: \"{}\". Full response:\n```\n{:?}\n``` \nRaw response:\n```\n{}\n```",
&decoded.msg, &decoded.msg,
&decoded &decoded,
String::from_utf8_lossy(&bytes)
) )
.tag(ErrorKind::Internal)); .tag(ErrorKind::Internal));
}; };