clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1163 from nupplaphil/bug/http_client 

[statusnet] Catch TransferExceptions for HTTPClient::finalUrl()
This commit is contained in:
Hypolite Petovan 2021-08-29 08:41:00 -04:00 committed by GitHub
parent 9b5745b75b c06fff6921
commit 3d7a4c9326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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);
$expanded_url = DI::httpClient()->finalUrl($match[1]); try {
$expanded_url = DI::httpClient()->finalUrl($match[1]);
} catch (TransferException $exception) {
Logger::notice('statusnet_convertmsg: Couldn\'t get final URL.', ['url' => $match[1], 'exception' => $exception]);
$expanded_url = $match[1];
}
Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG); Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);