LemmyNet
/
lemmy
3
2
Fork 3
Code Pull Requests 1 Releases Wiki Activity

Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
Conversation 3 Commits 120 Files Changed 57 +1 -2
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 243dda543c - Show all commits

3
server/src/lib.rs
View File

@ -185,7 +185,6 @@ pub fn fetch_pictshare(image_url: &str) -> Result<PictshareResponse, failure::Er
utf8_percent_encode(image_url, NON_ALPHANUMERIC)
);
let text = isahc::get(&fetch_url)?.text()?;
println!("--------------{}", text);
let res: PictshareResponse = serde_json::from_str(&text)?;
Ok(res)
}
@ -224,7 +223,7 @@ fn fetch_iframely_and_pictshare_data(
Some(url) => match fetch_pictshare(&url) {
// Try to generate a small thumbnail if iframely is not supported
Ok(res) => {
let mut split_url: Vec<&str> = res.url.split("/").collect();
let mut split_url: Vec<&str> = res.url.split('/').collect();
split_url.insert(split_url.len() - 1, "192");
Some(split_url.join("/"))
}