multiple patches from upstream

3e2c3fc5d9
49ddd1a216
81ca8eaddc

Signed-off-by: ngn <ngn@ngn.tf>

src/scraper/ddg.php

@@ -202,6 +202,7 @@ class ddg{
 							"display" => "NSFW",
 							"option" => [
 								"yes" => "Yes",
+								"maybe" => "Maybe",
 								"no" => "No"
 							]
 						],
@@ -285,6 +286,7 @@ class ddg{
 							"display" => "NSFW",
 							"option" => [
 								"yes" => "Yes",
+								"maybe" => "Maybe",
 								"no" => "No"
 							]
 						],
@@ -1344,10 +1346,10 @@ class ddg{
 				
 				$get_filters["iaf"] = $filters;
 			}
-			
-			$nsfw = $get["nsfw"] == "yes" ? "-2" : "-1";
+
+			$nsfw = $get["nsfw"] == "yes" ? "-1" : "1";
 			$get_filters["kp"] = $nsfw;
-			
+
 			try{
 				
 				$html = $this->get(
@@ -1497,12 +1499,16 @@ class ddg{
 				"iax" => "videos",
 				"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 = [];
-			
+
 			if($get["date"] != "any"){ $filters[] = "publishedAfter:{$date}"; }
 			if($get["resolution"] != "any"){ $filters[] = "videoDefinition:{$resolution}"; }
 			if($get["duration"] != "any"){ $filters[] = "videoDuration:{$duration}"; }