EntropyEngineer/friendica-addons
0
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Catch TransferExceptions for HTTPClient::finalUrl() in case the headers are empty

Browse source
This commit is contained in:
Philipp Holzer 2021-08-29 13:37:07 +02:00
parent 9b5745b75b
commit b3014ebf06
No known key found for this signature in database
GPG key ID: 9A28B7D4FF5667BD
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
statusnet/statusnet.php
View file

@ -58,6 +58,7 @@ use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use GuzzleHttp\Exception\TransferException;
function statusnet_install() function statusnet_install()
{ {
@ -1426,7 +1427,12 @@ function statusnet_convertmsg(App $a, $body)
Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG); Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
try {
$expanded_url = DI::httpClient()->finalUrl($match[1]); $expanded_url = DI::httpClient()->finalUrl($match[1]);
} catch (TransferException $exception) {
Logger::notice('statusnet_convertmsg: Couldn\'t get final URL.', ['url' => $match[2], 'exception' => $exception]);
$expanded_url = $match[2];
}
Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG); Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);