beenull/libreddit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix url rewrites

Browse source
This commit is contained in:
spikecodes 2021-02-25 11:01:25 -08:00
parent 686d61801f
commit be2a1d876b
No known key found for this signature in database
GPG key ID: 004CECFF9B463BCB
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -1512,9 +1512,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.62"
version = "1.0.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
checksum = "43535db9747a4ba938c0ce0a98cc631a46ebf943c9e1d604e091df6007620bf6"
dependencies = [
"itoa",
"ryu",

13
src/utils.rs
View file

@ -123,7 +123,7 @@ impl Media {
(
post_type.to_string(),
Self {
url: url.as_str().unwrap_or_default().to_string(),
url: format_url(url.as_str().unwrap_or_default()).to_string(),
width: source["width"].as_i64().unwrap_or_default(),
height: source["height"].as_i64().unwrap_or_default(),
poster: format_url(source["url"].as_str().unwrap_or_default()),
@ -222,6 +222,7 @@ impl Post {
// Determine the type of media along with the media URL
let (post_type, media, gallery) = Media::parse(&data).await;
dbg!(&media.url);
posts.push(Self {
id: val(post, "id"),
@ -539,10 +540,12 @@ pub async fn request(path: String) -> Result<Value, String> {
Err(
json["reason"]
.as_str()
.unwrap_or(json["message"].as_str().unwrap_or_else(|| {
println!("{} - Error parsing reddit error", url);
"Error parsing reddit error"
}))
.unwrap_or_else(|| {
json["message"].as_str().unwrap_or_else(|| {
println!("{} - Error parsing reddit error", url);
"Error parsing reddit error"
})
})
.to_string(),
)
} else {