Merge master into federation #48

Manually merged
nutomic merged 120 commits from merge-master into federation 2020-06-09 18:07:02 +00:00
1 changed files with 1 additions and 5 deletions
Showing only changes of commit 38381ba287 - Show all commits

View File

@ -222,11 +222,7 @@ fn fetch_iframely_and_pictshare_data(
None => match url {
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();
split_url.insert(split_url.len() - 1, "192");
Some(split_url.join("/"))
}
Ok(res) => Some(res.url),
Err(e) => {
error!("pictshare err: {}", e);
None