From 380dab7e95267a2dcda1d2e80cd4c7a0c2b365a7 Mon Sep 17 00:00:00 2001
From: Matthew Exon <git.mexon@spamgourmet.com>
Date: Mon, 6 Jan 2025 17:04:48 +0100
Subject: [PATCH] Retriever: use new HTTP client API

---
 retriever/retriever.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/retriever/retriever.php b/retriever/retriever.php
index 31db037ea..bf06815c8 100644
--- a/retriever/retriever.php
+++ b/retriever/retriever.php
@@ -16,6 +16,8 @@ use Friendica\Core\System;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\BBCode;
 use Friendica\Model\Photo;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Object\Image;
 use Friendica\Util\Network;
 use Friendica\Database\DBA;
@@ -291,13 +293,12 @@ function retrieve_resource(array $resource) {
 
 	try {
 		Logger::debug('retrieve_resource: ' . ($resource['num-tries'] + 1) . ' attempt at resource ' . $resource['id'] . ' ' . $resource['url']);
-		$redirects = 0;
 		$cookiejar = '';
 		if (array_key_exists('storecookies', $rule_data) && $rule_data['storecookies']) {
 			$cookiejar = tempnam(System::getTempPath(), 'cookiejar-retriever-');
 			file_put_contents($cookiejar, $rule_data['cookiedata']);
 		}
-		$fetch_result = DI::httpClient()->fetchFull($resource['url'], $redirects, 0, $cookiejar);
+		$fetch_result = DI::httpClient()->get($resource['url'], HttpClientAccept::DEFAULT, [HttpClientOptions::COOKIEJAR => $cookiejar]);
 		if (array_key_exists('storecookies', $rule_data) && $rule_data['storecookies']) {
 			$retriever_rule['data']['cookiedata'] = file_get_contents($cookiejar);
 			DBA::update('retriever_rule', ['data' => json_encode($retriever_rule['data'])], ['id' => intval($retriever_rule["id"])], $retriever_rule);