From d224e6bba44823da29ca018467ffacb4d357eb70 Mon Sep 17 00:00:00 2001 From: shibafu Date: Sun, 15 Apr 2018 22:27:38 +0900 Subject: [PATCH] =?UTF-8?q?gif=E3=81=A8mp4=E3=81=AE=E5=A0=B4=E5=90=88?= =?UTF-8?q?=E3=81=AF=E3=82=B5=E3=83=A0=E3=83=8D=E3=82=A4=E3=83=AB=E3=82=92?= =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=95=E3=81=9B=E3=81=AA=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/MetadataResolver/NijieResolver.php | 2 +- tests/Unit/MetadataResolver/NijieResolverTest.php | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/MetadataResolver/NijieResolver.php b/app/MetadataResolver/NijieResolver.php index 7d3d1d6..9bfef14 100644 --- a/app/MetadataResolver/NijieResolver.php +++ b/app/MetadataResolver/NijieResolver.php @@ -23,7 +23,7 @@ class NijieResolver implements Resolver foreach ($dataNode as $node) { // 改行がそのまま入っていることがあるのでデコード前にエスケープが必要 $imageData = json_decode(preg_replace('/\r?\n/', '\n', $node->nodeValue), true); - if (isset($imageData['thumbnailUrl'])) { + if (isset($imageData['thumbnailUrl']) && !ends_with($imageData['thumbnailUrl'], '.gif') && !ends_with($imageData['thumbnailUrl'], '.mp4')) { $metadata->image = preg_replace('~nijie\\.info/.*/nijie_picture/~', 'nijie.info/nijie_picture/', $imageData['thumbnailUrl']); break; } diff --git a/tests/Unit/MetadataResolver/NijieResolverTest.php b/tests/Unit/MetadataResolver/NijieResolverTest.php index 0344415..5963418 100644 --- a/tests/Unit/MetadataResolver/NijieResolverTest.php +++ b/tests/Unit/MetadataResolver/NijieResolverTest.php @@ -39,8 +39,7 @@ class NijieResolverTest extends TestCase $metadata = $resolver->resolve('https://nijie.info/view.php?id=258078'); $this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title); $this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description); - $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image); - $this->assertNotRegExp('~/diff/main/~', $metadata->image); + $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image); } public function testMp4Movie() @@ -51,8 +50,7 @@ class NijieResolverTest extends TestCase $metadata = $resolver->resolve('https://nijie.info/view.php?id=256283'); $this->assertEquals('てすと | ニジエ運営', $metadata->title); $this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description); - $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image); - $this->assertNotRegExp('~/diff/main/~', $metadata->image); + $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image); } public function testStandardPictureSp() @@ -87,8 +85,7 @@ class NijieResolverTest extends TestCase $metadata = $resolver->resolve('https://sp.nijie.info/view.php?id=258078'); $this->assertEquals('騎乗位ルーミア | しょったれ', $metadata->title); $this->assertEquals("以前pixivに投稿したgifアニメ。\r\n気の利いたタイトルが浮かばなかった。", $metadata->description); - $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image); - $this->assertNotRegExp('~/diff/main/~', $metadata->image); + $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image); } public function testMp4MovieSp() @@ -99,7 +96,6 @@ class NijieResolverTest extends TestCase $metadata = $resolver->resolve('https://sp.nijie.info/view.php?id=256283'); $this->assertEquals('てすと | ニジエ運営', $metadata->title); $this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description); - $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image); - $this->assertNotRegExp('~/diff/main/~', $metadata->image); + $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image); } }