Better subreddit error messages. Closes #131

This commit is contained in:
spikecodes 2021-02-22 16:43:32 -08:00
parent 2f3315dcfc
commit 8034594006
No known key found for this signature in database
GPG Key ID: 004CECFF9B463BCB
2 changed files with 32 additions and 17 deletions

View File

@ -74,7 +74,12 @@ pub async fn page(req: Request<()>) -> tide::Result {
prefs: prefs(req),
})
}
Err(msg) => error(req, msg).await,
Err(msg) => match msg.as_str() {
"quarantined" => error(req, format!("r/{} has been quarantined by Reddit", sub)).await,
"private" => error(req, format!("r/{} is a private community", sub)).await,
"banned" => error(req, format!("r/{} has been banned from Reddit", sub)).await,
_ => error(req, msg).await,
},
}
}

View File

@ -4,7 +4,7 @@
use askama::Template;
use cached::proc_macro::cached;
use regex::Regex;
use serde_json::{from_str, Value};
use serde_json::{from_str, Error, Value};
use std::collections::HashMap;
use tide::{http::url::Url, http::Cookie, Request, Response};
use time::{Duration, OffsetDateTime};
@ -514,29 +514,39 @@ pub async fn request(path: String) -> Result<Value, String> {
let res = client.send(req).await;
let err = |msg: &str, e: String| -> Result<Value, String> {
println!("{} - {}: {}", url, msg, e);
Err(msg.to_string())
};
match res {
Ok(mut response) => match response.take_body().into_string().await {
// If response is success
Ok(body) => {
// Parse the response from Reddit as JSON
match from_str(&body) {
Ok(json) => Ok(json),
Err(e) => {
println!("{} - Failed to parse page JSON data: {}", url, e);
Err("Failed to parse page JSON data".to_string())
let parsed: Result<Value, Error> = from_str(&body);
match parsed {
Ok(json) => {
// If Reddit returned an error
if json["error"].is_i64() {
Err(
json["reason"]
.as_str()
.unwrap_or_else(|| {
println!("{} - Error parsing reddit error", url);
"Error parsing reddit error"
})
.to_string(),
)
} else {
Ok(json)
}
}
Err(e) => err("Failed to parse page JSON data", e.to_string()),
}
// Failed to parse body
Err(e) => {
println!("{} - Couldn't parse request body: {}", url, e);
Err("Couldn't parse request body".to_string())
}
Err(e) => err("Couldn't parse request body", e.to_string()),
},
// If failed to send request
Err(e) => {
println!("{} - Couldn't send request to Reddit: {}", url, e);
Err("Couldn't send request to Reddit".to_string())
}
Err(e) => err("Couldn't send request to Reddit", e.to_string()),
}
}