pepepper/tissue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Actorの取得失敗をちゃんと無視するように

Browse Source
This commit is contained in:
unarist 2019-02-11 01:43:29 +09:00
parent 1ba4999a83
commit 3584625b47
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/MetadataResolver/ActivityPubResolver.php
View File

@ -3,6 +3,8 @@
namespace App\MetadataResolver; namespace App\MetadataResolver;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use GuzzleHttp\Exception\TransferException;
use Illuminate\Support\Facades\Log;
class ActivityPubResolver implements Resolver, Parser class ActivityPubResolver implements Resolver, Parser
{ {
@ -46,18 +48,24 @@ class ActivityPubResolver implements Resolver, Parser
private function getTitleFromActor(string $url): string private function getTitleFromActor(string $url): string
{ {
$res = $this->activityClient->get($url); try {
if ($res->getStatusCode() !== 200) { $res = $this->activityClient->get($url);
if ($res->getStatusCode() !== 200) {
Log::info(self::class . ': Actorの取得に失敗 URL=' . $url);
return '';
}
$actor = json_decode($res->getBody(), true);
$title = $actor['name'] ?? '';
if (isset($actor['preferredUsername'])) {
$title .= ' (@' . $actor['preferredUsername'] . '@' . parse_url($actor['id'], PHP_URL_HOST) . ')';
}
return $title;
} catch (TransferException $e) {
Log::info(self::class . ': Actorの取得に失敗 URL=' . $url);
return ''; return '';
} }
$actor = json_decode($res->getBody(), true);
$title = $actor['name'] ?? '';
if (isset($actor['preferredUsername'])) {
$title .= ' (@' . $actor['preferredUsername'] . '@' . parse_url($actor['id'], PHP_URL_HOST) . ')';
}
return $title;
} }
private function html2text(string $html): string private function html2text(string $html): string