mirrors/redlib
1
0
Fork 0
mirror of https://github.com/redlib-org/redlib.git synced 2025-04-05 22:17:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make User-Agent Reddit-compliant

Browse source
This commit is contained in:
spikecodes 2021-01-15 20:29:34 -08:00
parent 0099021478
commit 65543a43b2
3 changed files with 82 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

152
src/utils.rs
View file

@ -363,85 +363,85 @@ pub async fn request(path: &str) -> Result<Value, String> {
let url = format!("https://www.reddit.com{}", path);
// Send request using awc
// async fn send(url: &str) -> Result<String, (bool, String)> {
// let client = actix_web::client::Client::default();
// let response = client.get(url).send().await;
async fn send(url: &str) -> Result<String, (bool, String)> {
let client = actix_web::client::Client::default();
let response = client.get(url).header("User-Agent", format!("web:libreddit:{}", env!("CARGO_PKG_VERSION"))).send().await;
// match response {
// Ok(mut payload) => {
// // Get first number of response HTTP status code
// match payload.status().to_string().chars().next() {
// // If success
// Some('2') => Ok(String::from_utf8(payload.body().limit(20_000_000).await.unwrap_or_default().to_vec()).unwrap_or_default()),
// // If redirection
// Some('3') => match payload.headers().get("location") {
// Some(location) => Err((true, location.to_str().unwrap_or_default().to_string())),
// None => Err((false, "Page not found".to_string())),
// },
// // Otherwise
// _ => Err((false, "Page not found".to_string())),
// }
// }
// Err(_) => Err((false, "Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())),
// }
// }
// // Print error if debugging then return error based on error message
// fn err(url: String, msg: String) -> Result<Value, String> {
// // #[cfg(debug_assertions)]
// dbg!(format!("{} - {}", url, msg));
// Err(msg)
// };
// // Parse JSON from body. If parsing fails, return error
// fn json(url: String, body: String) -> Result<Value, String> {
// match from_str(body.as_str()) {
// Ok(json) => Ok(json),
// Err(_) => err(url, "Failed to parse page JSON data".to_string()),
// }
// }
// // Make request to Reddit using send function
// match send(&url).await {
// // If success, parse and return body
// Ok(body) => json(url, body),
// // Follow any redirects
// Err((true, location)) => match send(location.as_str()).await {
// // If success, parse and return body
// Ok(body) => json(url, body),
// // Follow any redirects again
// Err((true, location)) => err(url, location),
// // Return errors if request fails
// Err((_, msg)) => err(url, msg),
// },
// // Return errors if request fails
// Err((_, msg)) => err(url, msg),
// }
// Send request using ureq
match ureq::get(&url).call() {
// If response is success
Ok(response) => {
// Parse the response from Reddit as JSON
match from_str(&response.into_string().unwrap()) {
Ok(json) => Ok(json),
Err(_) => {
#[cfg(debug_assertions)]
dbg!(format!("{} - Failed to parse page JSON data", url));
Err("Failed to parse page JSON data".to_string())
match response {
Ok(mut payload) => {
// Get first number of response HTTP status code
match payload.status().to_string().chars().next() {
// If success
Some('2') => Ok(String::from_utf8(payload.body().limit(20_000_000).await.unwrap_or_default().to_vec()).unwrap_or_default()),
// If redirection
Some('3') => match payload.headers().get("location") {
Some(location) => Err((true, location.to_str().unwrap_or_default().to_string())),
None => Err((false, "Page not found".to_string())),
},
// Otherwise
_ => Err((false, "Page not found".to_string())),
}
}
}
// If response is error
Err(ureq::Error::Status(_, _)) => {
#[cfg(debug_assertions)]
dbg!(format!("{} - Page not found", url));
Err("Page not found".to_string())
}
// If failed to send request
Err(e) => {
dbg!(format!("{} - {}", url, e));
Err("Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())
Err(_) => Err((false, "Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())),
}
}
// Print error if debugging then return error based on error message
fn err(url: String, msg: String) -> Result<Value, String> {
// #[cfg(debug_assertions)]
dbg!(format!("{} - {}", url, msg));
Err(msg)
};
// Parse JSON from body. If parsing fails, return error
fn json(url: String, body: String) -> Result<Value, String> {
match from_str(body.as_str()) {
Ok(json) => Ok(json),
Err(_) => err(url, "Failed to parse page JSON data".to_string()),
}
}
// Make request to Reddit using send function
match send(&url).await {
// If success, parse and return body
Ok(body) => json(url, body),
// Follow any redirects
Err((true, location)) => match send(location.as_str()).await {
// If success, parse and return body
Ok(body) => json(url, body),
// Follow any redirects again
Err((true, location)) => err(url, location),
// Return errors if request fails
Err((_, msg)) => err(url, msg),
},
// Return errors if request fails
Err((_, msg)) => err(url, msg),
}
// Send request using ureq
// match ureq::get(&url).call() {
// // If response is success
// Ok(response) => {
// // Parse the response from Reddit as JSON
// match from_str(&response.into_string().unwrap()) {
// Ok(json) => Ok(json),
// Err(_) => {
// #[cfg(debug_assertions)]
// dbg!(format!("{} - Failed to parse page JSON data", url));
// Err("Failed to parse page JSON data".to_string())
// }
// }
// }
// // If response is error
// Err(ureq::Error::Status(_, _)) => {
// #[cfg(debug_assertions)]
// dbg!(format!("{} - Page not found", url));
// Err("Page not found".to_string())
// }
// // If failed to send request
// Err(e) => {
// dbg!(format!("{} - {}", url, e));
// Err("Couldn't send request to Reddit, this instance may be being rate-limited. Try another.".to_string())
// }
// }
}