From 810a1dbc5952ef9925ba89ed399b85f7a33811b9 Mon Sep 17 00:00:00 2001 From: eai04191 Date: Thu, 27 Jun 2019 00:34:53 +0900 Subject: [PATCH] =?UTF-8?q?PixivResolver=E3=81=AE=E5=8F=96=E5=BE=97?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E3=82=92regular=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/PixivResolver.php | 2 +- tests/Unit/MetadataResolver/PixivResolverTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/MetadataResolver/PixivResolver.php b/app/MetadataResolver/PixivResolver.php index 64f825c..ff893a0 100644 --- a/app/MetadataResolver/PixivResolver.php +++ b/app/MetadataResolver/PixivResolver.php @@ -64,7 +64,7 @@ class PixivResolver implements Resolver $metadata->title = $json['body']['illustTitle'] ?? ''; $metadata->description = '投稿者: ' . $json['body']['userName'] . PHP_EOL . strip_tags(str_replace('
', PHP_EOL, $json['body']['illustComment'] ?? '')); - $metadata->image = $this->proxize($json['body']['urls']['original'] ?? ''); + $metadata->image = $this->proxize($json['body']['urls']['regular'] ?? ''); // ページ数の指定がある場合は画像URLをそのページにする if ($page != 0) { diff --git a/tests/Unit/MetadataResolver/PixivResolverTest.php b/tests/Unit/MetadataResolver/PixivResolverTest.php index 2ec8465..6b0326b 100644 --- a/tests/Unit/MetadataResolver/PixivResolverTest.php +++ b/tests/Unit/MetadataResolver/PixivResolverTest.php @@ -27,7 +27,7 @@ class PixivResolverTest extends TestCase $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=68188073'); $this->assertEquals('coffee break', $metadata->title); $this->assertEquals('投稿者: 裕' . PHP_EOL, $metadata->description); - $this->assertEquals('https://i.pixiv.cat/img-original/img/2018/04/12/00/01/28/68188073_p0.jpg', $metadata->image); + $this->assertEquals('https://i.pixiv.cat/img-master/img/2018/04/12/00/01/28/68188073_p0_master1200.jpg', $metadata->image); $this->assertEquals(['オリジナル','カフェ','眼鏡','イヤホン','ぱっつん','艶ぼくろ','眼鏡っ娘','オリジナル5000users入り'], $metadata->tags); if ($this->shouldUseMock()) { $this->assertSame('https://www.pixiv.net/ajax/illust/68188073', (string) $this->handler->getLastRequest()->getUri()); @@ -43,7 +43,7 @@ class PixivResolverTest extends TestCase $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=74939802'); $this->assertEquals('T-20S', $metadata->title); $this->assertEquals('投稿者: amssc' . PHP_EOL . 'JUST FOR FUN' . PHP_EOL . '现在可以做到游戏内立绘修改拉！立绘动态皮肤都可以支持，想要资助获得新技术请站内信联系我。', $metadata->description); - $this->assertEquals('https://i.pixiv.cat/img-original/img/2019/05/28/01/16/24/74939802_p0.jpg', $metadata->image); + $this->assertEquals('https://i.pixiv.cat/img-master/img/2019/05/28/01/16/24/74939802_p0_master1200.jpg', $metadata->image); $this->assertEquals(['巨乳','母乳','lastorigin','Last_Origin','T-20S','おっぱい','라스트오리진','노움'], $metadata->tags); if ($this->shouldUseMock()) { $this->assertSame('https://www.pixiv.net/ajax/illust/74939802', (string) $this->handler->getLastRequest()->getUri()); @@ -59,7 +59,7 @@ class PixivResolverTest extends TestCase $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=46713544'); $this->assertEquals('冬の日ラブラブ', $metadata->title); $this->assertEquals('投稿者: Aza' . PHP_EOL . 'ラブラブエッチのらくがき' . PHP_EOL . PHP_EOL . '三万フォロワー感謝します～' . PHP_EOL . PHP_EOL . '最近忙しいので、自分の時間が少ない・・・', $metadata->description); - $this->assertEquals('https://i.pixiv.cat/img-original/img/2014/10/25/00/06/58/46713544_p0.jpg', $metadata->image); + $this->assertEquals('https://i.pixiv.cat/img-master/img/2014/10/25/00/06/58/46713544_p0_master1200.jpg', $metadata->image); $this->assertEquals(['落書き','おっぱい','オリジナル','パイズリ','中出し','だいしゅきホールド','愛のあるセックス','黒髪ロング','オリジナル10000users入り'], $metadata->tags); if ($this->shouldUseMock()) { $this->assertSame('https://www.pixiv.net/ajax/illust/46713544', (string) $this->handler->getLastRequest()->getUri());