Handle alternative status codes
This commit is contained in:
parent
e59b2b1346
commit
2e89a85858
12
src/utils.rs
12
src/utils.rs
@ -514,7 +514,7 @@ pub async fn error(req: Request<()>, msg: String) -> tide::Result {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_recursion]
|
#[async_recursion]
|
||||||
async fn connect(path: String) -> io::Result<(i16, String)> {
|
async fn connect(path: String) -> io::Result<String> {
|
||||||
// Build reddit-compliant user agent for Libreddit
|
// Build reddit-compliant user agent for Libreddit
|
||||||
let user_agent = format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"));
|
let user_agent = format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"));
|
||||||
|
|
||||||
@ -557,7 +557,7 @@ async fn connect(path: String) -> io::Result<(i16, String)> {
|
|||||||
.collect::<Vec<&str>>()[1];
|
.collect::<Vec<&str>>()[1];
|
||||||
connect(location.replace("https://www.reddit.com", "")).await
|
connect(location.replace("https://www.reddit.com", "")).await
|
||||||
} else {
|
} else {
|
||||||
Ok((status, body))
|
Ok(body)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -572,10 +572,7 @@ pub async fn request(path: String) -> Result<Value, String> {
|
|||||||
};
|
};
|
||||||
|
|
||||||
match connect(path).await {
|
match connect(path).await {
|
||||||
Ok((status, body)) => {
|
Ok(body) => {
|
||||||
match status {
|
|
||||||
// If response is success
|
|
||||||
200 => {
|
|
||||||
// Parse the response from Reddit as JSON
|
// Parse the response from Reddit as JSON
|
||||||
let parsed: Result<Value, Error> = from_str(&body);
|
let parsed: Result<Value, Error> = from_str(&body);
|
||||||
match parsed {
|
match parsed {
|
||||||
@ -600,9 +597,6 @@ pub async fn request(path: String) -> Result<Value, String> {
|
|||||||
Err(e) => err("Failed to parse page JSON data", e.to_string()),
|
Err(e) => err("Failed to parse page JSON data", e.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => err("Couldn't send request to Reddit", status.to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => err("Couldn't send request to Reddit", e.to_string()),
|
Err(e) => err("Couldn't send request to Reddit", e.to_string()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user