mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 18:01:00 +00:00
Code Issues Projects Releases Wiki Activity

Removing 2nd match.

Browse source
This commit is contained in:
Dessalines 2020-05-11 14:01:10 -04:00
parent 2719daffb0
commit f7c947888f
1 changed files with 37 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/src/lib.rs
View file

@ -197,16 +197,16 @@ fn fetch_iframely_and_pictshare_data(
Option<String>, Option<String>,
Option<String>, Option<String>,
) { ) {
match &url {
Some(url) => {
// Fetch iframely data // Fetch iframely data
let (iframely_title, iframely_description, iframely_thumbnail_url, iframely_html) = match &url { let (iframely_title, iframely_description, iframely_thumbnail_url, iframely_html) =
Some(url) => match fetch_iframely(url) { match fetch_iframely(url) {
Ok(res) => (res.title, res.description, res.thumbnail_url, res.html), Ok(res) => (res.title, res.description, res.thumbnail_url, res.html),
Err(e) => { Err(e) => {
error!("iframely err: {}", e); error!("iframely err: {}", e);
(None, None, None, None) (None, None, None, None)
} }
},
None => (None, None, None, None),
}; };
// Fetch pictshare thumbnail // Fetch pictshare thumbnail
@ -218,18 +218,14 @@ fn fetch_iframely_and_pictshare_data(
None None
} }
}, },
None => match url {
Some(url) => match fetch_pictshare(&url) {
// Try to generate a small thumbnail if iframely is not supported // Try to generate a small thumbnail if iframely is not supported
None => match fetch_pictshare(&url) {
Ok(res) => Some(res.url), Ok(res) => Some(res.url),
Err(e) => { Err(e) => {
error!("pictshare err: {}", e); error!("pictshare err: {}", e);
None None
} }
}, },
None => None,
},
}; };
( (
@ -238,6 +234,9 @@ fn fetch_iframely_and_pictshare_data(
iframely_html, iframely_html,
pictshare_thumbnail, pictshare_thumbnail,
) )
}
None => (None, None, None, None),
}
} }
pub fn markdown_to_html(text: &str) -> String { pub fn markdown_to_html(text: &str) -> String {