diff --git a/src/scraper/ddg.php b/src/scraper/ddg.php index 2e8435c..72cb72c 100644 --- a/src/scraper/ddg.php +++ b/src/scraper/ddg.php @@ -1959,23 +1959,15 @@ class ddg{ if($id === null){ - // fallback to getting ID from path - $id = explode("/", $image["path"]); + $id = explode("/th/id/", $image["path"], 2); - for($i=count($id) - 1; $i>0; $i--){ + if(count($id) !== 2){ - if(trim($id[$i]) != ""){ - - $id = $id[$i]; - break; - } + // malformed + return $url; } - } - if(is_array($id)){ - - // fuck off, let proxy.php deal with it - return $url; + $id = $id[1]; } return "https://" . $image["host"] . "/th/id/" . $id; diff --git a/src/scraper/qwant.php b/src/scraper/qwant.php index c14e482..0283c47 100644 --- a/src/scraper/qwant.php +++ b/src/scraper/qwant.php @@ -971,17 +971,15 @@ class qwant{ if($id === null){ - // fallback to getting ID from path - $id = explode("/", $image["path"]); + $id = explode("/th/id/", $image["path"], 2); - for($i=count($id) - 1; $i>0; $i--){ + if(count($id) !== 2){ - if(trim($id[$i]) != ""){ - - $id = $id[$i]; - break; - } + // malformed + return $url; } + + $id = $id[1]; } if(is_array($id)){