|
@@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Http;
|
|
|
use App\Profile;
|
|
|
use App\Util\ActivityPub\Helpers;
|
|
|
use App\Util\ActivityPub\HttpSignature;
|
|
|
+use Illuminate\Http\Client\ConnectionException;
|
|
|
|
|
|
class ActivityPubFetchService
|
|
|
{
|
|
@@ -19,9 +20,18 @@ class ActivityPubFetchService
|
|
|
$headers['Accept'] = 'application/activity+json, application/json';
|
|
|
$headers['User-Agent'] = '(Pixelfed/'.config('pixelfed.version').'; +'.config('app.url').')';
|
|
|
|
|
|
- return Http::withHeaders($headers)
|
|
|
- ->timeout(30)
|
|
|
- ->get($url)
|
|
|
- ->body();
|
|
|
+ try {
|
|
|
+ $res = Http::withHeaders($headers)
|
|
|
+ ->timeout(10)
|
|
|
+ ->get($url);
|
|
|
+ } catch (ConnectionException $e) {
|
|
|
+ return;
|
|
|
+ } catch (Exception $e) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(!$res->ok()) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ return $res->body();
|
|
|
}
|
|
|
}
|