From 1a49026bac7408aaf1b1b8cdde9cd35f7c6b2eed Mon Sep 17 00:00:00 2001 From: vdbhb59 Date: Fri, 21 Mar 2025 11:04:06 +0530 Subject: [PATCH] Synced with main duckduckgo images nsfw fix -- https://git.lolcat.ca/lolcat/4get/commit/49ddd1a216d3d885081f28d57e32dc6abac3f7ff --- scraper/ddg.php | 13 +++++++++---- scraper/yandex.php | 5 ++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/scraper/ddg.php b/scraper/ddg.php index 76dfe0c..bae02e5 100644 --- a/scraper/ddg.php +++ b/scraper/ddg.php @@ -285,6 +285,7 @@ class ddg{ "display" => "NSFW", "option" => [ "yes" => "Yes", + "maybe" => "Maybe", "no" => "No" ] ], @@ -1345,7 +1346,7 @@ class ddg{ $get_filters["iaf"] = $filters; } - $nsfw = $get["nsfw"] == "yes" ? "-2" : "-1"; + $nsfw = $get["nsfw"] == "yes" ? "-1" : "1"; $get_filters["kp"] = $nsfw; try{ @@ -1498,8 +1499,12 @@ class ddg{ "ia" => "videos" ]; - $nsfw = $get["nsfw"] == "yes" ? "-2" : "-1"; - $get_filters["kp"] = $nsfw; + switch($get["nsfw"]){ + + case "yes": $nsfw = "-2"; break; + case "maybe": $nsfw = "-1"; break; + case "no": $nsfw = "1"; break; + } $filters = []; @@ -1964,4 +1969,4 @@ class ddg{ floor($height * $ratio) ]; } -} +} \ No newline at end of file diff --git a/scraper/yandex.php b/scraper/yandex.php index c3728e8..6304c73 100644 --- a/scraper/yandex.php +++ b/scraper/yandex.php @@ -37,7 +37,7 @@ class yandex{ "Accept-Encoding: gzip", "Accept-Language: en-US,en;q=0.5", "DNT: 1", - "Cookie: yp=1716337604.sp.family%3A{$nsfw}#1685406411.szm.1:1920x1080:1920x999", + "Cookie: yp=" . (time() - 4000033) . ".szm.1:1920x1080:876x1000#" . time() . ".sp.family:" . $nsfw, "Referer: https://yandex.com/images/search", "Connection: keep-alive", "Upgrade-Insecure-Requests: 1", @@ -668,7 +668,6 @@ class yandex{ foreach($json["blocks"] as $block){ $html .= $block["html"]; - // get next page if( isset($block["params"]["nextPageUrl"]) && @@ -1167,4 +1166,4 @@ class yandex{ return trim($title); } -} +} \ No newline at end of file