diff options
| author | lolcat <will@lolcat.ca> | 2023-11-07 08:04:56 -0500 |
|---|---|---|
| committer | lolcat <will@lolcat.ca> | 2023-11-07 08:04:56 -0500 |
| commit | 785452873f0ee0a27fc157b482b7551560f0282d (patch) | |
| tree | 4c70e240031ed3868425ca683c83ebfd378a9159 /scraper/marginalia.php | |
| parent | 64b090ee058953aed2246967332c7f0b6623cd8f (diff) | |
fix typo
Diffstat (limited to 'scraper/marginalia.php')
| -rw-r--r-- | scraper/marginalia.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/scraper/marginalia.php b/scraper/marginalia.php index c8ab09f..b790a97 100644 --- a/scraper/marginalia.php +++ b/scraper/marginalia.php @@ -3,7 +3,8 @@ class marginalia{ public function __construct(){ - $this->key = "public"; + include "lib/backend.php"; + $this->backend = new backend("marginalia"); } public function getfilters($page){ @@ -76,10 +77,10 @@ class marginalia{ } } - private function get($url, $get = []){ + private function get($proxy, $url, $get = []){ $headers = [ - "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:107.0) Gecko/20100101 Firefox/110.0", + "User-Agent: " . config::USER_AGENT, "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8", "Accept-Language: en-US,en;q=0.5", "Accept-Encoding: gzip", @@ -109,6 +110,8 @@ class marginalia{ curl_setopt($curlproc, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($curlproc, CURLOPT_CONNECTTIMEOUT, 30); curl_setopt($curlproc, CURLOPT_TIMEOUT, 30); + + $this->backend->assign_proxy($curlproc, $proxy); $data = curl_exec($curlproc); @@ -124,6 +127,11 @@ class marginalia{ public function web($get){ $search = [$get["s"]]; + if(strlen($get["s"]) === 0){ + + throw new Exception("Search term is empty!"); + } + $profile = $get["profile"]; $format = $get["format"]; $file = $get["file"]; @@ -184,7 +192,8 @@ class marginalia{ try{ $json = $this->get( - "https://api.marginalia.nu/{$this->key}/search/" . urlencode($search), + $this->backend->get_ip(), // no nextpage + "https://api.marginalia.nu/" . config::MARGINALIA_API_KEY . "/search/" . urlencode($search), $params ); }catch(Exception $error){ |