Merge pull request 'catch exception during http request' (#1392) from…

… mexon/friendica-addons:mat/mailstream-exception into develop Reviewed-on: https://git.friendi.ca/friendica/friendica-addons/pulls/1392
friendica · May 28, 2023 · 54f4a05 · 54f4a05
2 parents 2ce14fb + 9832fa6
commit 54f4a05
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
@@ -214,7 +214,12 @@ function mailstream_do_images(array &$item, array &$attachments)
 		}
 
 		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
-		$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+		try {
+			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
+		} catch (InvalidArgumentException $e) {
+			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
+			continue;
+		}
 		$attachments[$url] = [
 			'data' => $curlResult->getBody(),
 			'guid' => hash('crc32', $url),