エラーを前置きにした

Co-authored-by: hina <hina@hinaloe.net>

.circleci/config.yml

@@ -1,9 +1,9 @@
-version: 2.1
+version: 2
 
-executors:
+jobs:
   build:
     docker:
-      - image: circleci/php:7.3-node-browsers
+      - image: circleci/php:7.1-node-browsers
         environment:
           APP_DEBUG: true
           APP_ENV: testing
@@ -17,74 +17,37 @@ executors:
           POSTGRES_DB: tissue
           POSTGRES_USER: tissue
           POSTGRES_PASSWORD: tissue
-
-commands:
-  initialize:
     steps:
       - checkout
+
       - run: sudo apt update
       - run: sudo apt install -y libpq-dev
       - run: sudo docker-php-ext-install zip
       - run: sudo docker-php-ext-install pdo_pgsql
-  restore_composer:
-    steps:
+
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "composer.json" }}
             - v1-dependencies-
-  save_composer:
-    steps:
+      - run: composer install -n --prefer-dist
       - save_cache:
           key: v1-dependencies-{{ checksum "composer.json" }}
           paths:
             - ./vendor
-  restore_npm:
-    steps:
+
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "package.json" }}
             - v1-dependencies-
-  save_npm:
-    steps:
+      - run: yarn install
       - save_cache:
           key: v1-dependencies-{{ checksum "package.json" }}
           paths:
             - ./node_modules
             - ~/.yarn
 
-jobs:
-  build:
-    executor: build
-    steps:
-      - initialize
-
-      - restore_composer
-      - run: composer install -n --prefer-dist
-      - save_composer
-
-      - restore_npm
-      - run: yarn install
-      - save_npm
-
-      - run: yarn run prod
-
-      - persist_to_workspace:
-          root: .
-          paths:
-            - public
-
-  test:
-    executor: build
-    steps:
-      - initialize
-
-      - restore_composer
-      - restore_npm
-
-      - attach_workspace:
-          at: .
-
       - run: php artisan migrate
+      - run: yarn run prod
 
       # Run linter
       - run:
@@ -116,51 +79,3 @@ jobs:
       - run:
           command: bash <(curl -s https://codecov.io/bash) -f /tmp/phpunit/coverage.xml
           when: always
-
-  test_resolver:
-    executor: build
-    environment:
-      TEST_USE_HTTP_MOCK: false
-    steps:
-      - initialize
-
-      - restore_composer
-
-      - attach_workspace:
-          at: .
-
-      - run: php artisan migrate
-
-      # Run unit test
-      - run:
-          command: |
-            mkdir -p /tmp/phpunit
-            ./vendor/bin/phpunit --testsuite MetadataResolver --log-junit /tmp/phpunit/phpunit.xml --coverage-clover=/tmp/phpunit/coverage.xml
-          when: always
-      - store_test_results:
-          path: /tmp/phpunit
-      - store_artifacts:
-          path: /tmp/phpunit/coverage.xml
-
-workflows:
-  version: 2.1
-  test:
-    jobs:
-      - build
-      - test:
-          requires:
-            - build
-  scheduled_resolver_test:
-    triggers:
-      - schedule:
-          cron: "4 0 * * 1"
-          filters:
-            branches:
-              only:
-                - develop
-    jobs:
-      - build
-      - test_resolver:
-          requires:
-            - build
-

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:10-jessie as node
 
-FROM php:7.3-apache
+FROM php:7.1-apache
 
 ENV APACHE_DOCUMENT_ROOT /var/www/html/public
 
@@ -10,7 +10,6 @@ RUN apt-get update \
     && pecl install xdebug \
     && curl -sS https://getcomposer.org/installer | php \
     && mv composer.phar /usr/local/bin/composer \
-    && composer global require hirak/prestissimo \
     && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
     && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \
     && a2enmod rewrite

README.md

@@ -12,7 +12,7 @@ a.k.a. shikorism.net
 
 ## 実行環境
 
-- PHP 7.3
+- PHP 7.1
 - PostgreSQL 9.6
 
 ## 開発環境の構築
@@ -36,6 +36,7 @@ docker-compose up -d
 4. Composer と yarn を使い必要なライブラリをインストールします。
 
 ```
+docker-compose exec web composer global require hirak/prestissimo
 docker-compose exec web composer install
 docker-compose exec web yarn install
 ```

app/Console/Commands/UpdateFixture.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class UpdateFixture extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'test:fixture:update {resolver : Some Resolver Name }';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update specific fixtures';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $resolver_base_path = __DIR__ . '/../../../tests/Unit/MetadataResolver/';
+        $test_file_path = $resolver_base_path . $this->argument('resolver') . 'ResolverTest.php';
+
+        if (!file_exists($test_file_path)) {
+            throw new \RuntimeException($this->argument('resolver') . 'ResolverTest.php is not found.');
+        }
+
+        $this->info($this->argument('resolver') . 'ResolverTest.php is found.');
+
+        $test_file = file_get_contents($test_file_path);
+        $test_file_without_comment = '';
+        // コメントを削除する
+        $tokens = token_get_all($test_file);
+        foreach ($tokens as $token) {
+            if (is_string($token)) {
+                $test_file_without_comment .= $token;
+            } else {
+                list($id, $text) = $token;
+                if (token_name($id) !== 'T_COMMENT') {
+                    $test_file_without_comment .= $text;
+                }
+            }
+        }
+        preg_match_all('~file_get_contents\(__DIR__ . \'/(.+)\'\);~', $test_file_without_comment, $fixtures);
+        preg_match_all('~\$this->assertSame\(\'(.+)\', \(string\) \$this->handler->getLastRequest\(\)->getUri\(\)\);~m', $test_file_without_comment, $urls);
+        $update_list = array_combine($fixtures[1], $urls[1]);
+
+        $progress = $this->output->createProgressBar(count($update_list));
+        $progress->setFormat('Updating %path% from %url%' . PHP_EOL . '%current%/%max% [%bar%] %percent:3s%%');
+
+        foreach ($update_list as $path => $url) {
+            sleep(1);
+            $progress->setMessage($path, 'path');
+            $progress->setMessage($url, 'url');
+            file_put_contents($resolver_base_path . $path, file_get_contents($url));
+            $progress->advance();
+        }
+
+        $progress->finish();
+        $this->output->newLine();
+        $this->info('Update Complete!');
+    }
+}

app/Ejaculation.php

@@ -15,7 +15,7 @@ class Ejaculation extends Model
     protected $fillable = [
         'user_id', 'ejaculated_date',
         'note', 'geo_latitude', 'geo_longitude', 'link',
-        'is_private', 'is_too_sensitive'
+        'is_private'
     ];
 
     protected $dates = [
@@ -56,7 +56,6 @@ class Ejaculation extends Model
                     },
                     'likes.user' => function ($query) {
                         $query->where('is_protected', false)
-                            ->where('private_likes', false)
                             ->orWhere('id', Auth::id());
                     }
                 ])
@@ -73,25 +72,11 @@ class Ejaculation extends Model
                         $query->latest()->take(10);
                     },
                     'likes.user' => function ($query) {
-                        $query->where('is_protected', false)
-                            ->where('private_likes', false);
+                        $query->where('is_protected', false);
                     }
                 ])
                 ->withCount('likes')
                 ->addSelect(DB::raw('0 as is_liked'));
         }
     }
-
-    /**
-     * このチェックインと同じ情報を流用してチェックインするためのURLを生成
-     * @return string
-     */
-    public function makeCheckinURL(): string
-    {
-        return route('checkin', [
-            'link' => $this->link,
-            'tags' => $this->textTags(),
-            'is_too_sensitive' => $this->is_too_sensitive,
-        ]);
-    }
 }

app/Http/Controllers/EjaculationController.php

@@ -21,8 +21,7 @@ class EjaculationController extends Controller
             'link' => $request->input('link', ''),
             'tags' => $request->input('tags', ''),
             'note' => $request->input('note', ''),
-            'is_private' => $request->input('is_private', 0) == 1,
-            'is_too_sensitive' => $request->input('is_too_sensitive', 0) == 1
+            'is_private' => $request->input('is_private', 0) == 1
         ];
 
         return view('ejaculation.checkin')->with('defaults', $defaults);
@@ -57,18 +56,13 @@ class EjaculationController extends Controller
             'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
             'note' => $inputs['note'] ?? '',
             'link' => $inputs['link'] ?? '',
-            'is_private' => $request->has('is_private') ?? false,
-            'is_too_sensitive' => $request->has('is_too_sensitive') ?? false
+            'is_private' => $request->has('is_private') ?? false
         ]);
 
         $tagIds = [];
         if (!empty($inputs['tags'])) {
             $tags = explode(' ', $inputs['tags']);
             foreach ($tags as $tag) {
-                if ($tag === '') {
-                    continue;
-                }
-
                 $tag = Tag::firstOrCreate(['name' => $tag]);
                 $tagIds[] = $tag->id;
             }
@@ -110,8 +104,6 @@ class EjaculationController extends Controller
     {
         $ejaculation = Ejaculation::findOrFail($id);
 
-        $this->authorize('edit', $ejaculation);
-
         return view('ejaculation.edit')->with(compact('ejaculation'));
     }
 
@@ -119,8 +111,6 @@ class EjaculationController extends Controller
     {
         $ejaculation = Ejaculation::findOrFail($id);
 
-        $this->authorize('edit', $ejaculation);
-
         $inputs = $request->all();
 
         $validator = Validator::make($inputs, [
@@ -147,18 +137,13 @@ class EjaculationController extends Controller
             'ejaculated_date' => Carbon::createFromFormat('Y/m/d H:i', $inputs['date'] . ' ' . $inputs['time']),
             'note' => $inputs['note'] ?? '',
             'link' => $inputs['link'] ?? '',
-            'is_private' => $request->has('is_private') ?? false,
-            'is_too_sensitive' => $request->has('is_too_sensitive') ?? false
+            'is_private' => $request->has('is_private') ?? false
         ])->save();
 
         $tagIds = [];
         if (!empty($inputs['tags'])) {
             $tags = explode(' ', $inputs['tags']);
             foreach ($tags as $tag) {
-                if ($tag === '') {
-                    continue;
-                }
-
                 $tag = Tag::firstOrCreate(['name' => $tag]);
                 $tagIds[] = $tag->id;
             }
@@ -175,9 +160,6 @@ class EjaculationController extends Controller
     public function destroy($id)
     {
         $ejaculation = Ejaculation::findOrFail($id);
-
-        $this->authorize('edit', $ejaculation);
-
         $user = User::findOrFail($ejaculation->user_id);
         $ejaculation->tags()->detach();
         $ejaculation->delete();

app/Http/Controllers/SettingController.php

@@ -5,7 +5,6 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Validation\Rule;
 
 class SettingController extends Controller
 {
@@ -19,18 +18,10 @@ class SettingController extends Controller
         $inputs = $request->all();
         $validator = Validator::make($inputs, [
             'display_name' => 'required|string|max:20',
-            'email' => [
-                'required',
-                'string',
-                'email',
-                'max:255',
-                Rule::unique('users')->ignore(Auth::user()->email, 'email')
-            ],
             'bio' => 'nullable|string|max:160',
             'url' => 'nullable|url|max:2000'
         ], [], [
             'display_name' => '名前',
-            'email' => 'メールアドレス',
             'bio' => '自己紹介',
             'url' => 'URL'
         ]);
@@ -41,7 +32,6 @@ class SettingController extends Controller
 
         $user = Auth::user();
         $user->display_name = $inputs['display_name'];
-        $user->email = $inputs['email'];
         $user->bio = $inputs['bio'] ?? '';
         $user->url = $inputs['url'] ?? '';
         $user->save();

app/Http/Controllers/TagController.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Tag;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-
-class TagController extends Controller
-{
-    public function index()
-    {
-        $tags = Tag::select(DB::raw(
-            <<<'SQL'
-tags.name,
-count(*) AS "checkins_count"
-SQL
-        ))
-            ->join('ejaculation_tag', 'tags.id', '=', 'ejaculation_tag.tag_id')
-            ->join('ejaculations', 'ejaculations.id', '=', 'ejaculation_tag.ejaculation_id')
-            ->join('users', 'users.id', '=', 'ejaculations.user_id')
-            ->where('ejaculations.is_private', false)
-            ->where(function ($query) {
-                $query->where('users.is_protected', false);
-                if (Auth::check()) {
-                    $query->orWhere('users.id', Auth::id());
-                }
-            })
-            ->groupBy('tags.name')
-            ->orderByDesc('checkins_count')
-            ->orderBy('tags.name')
-            ->paginate(100);
-
-        return view('tag.index', compact('tags'));
-    }
-}

app/Http/Controllers/UserController.php

@@ -30,7 +30,6 @@ id,
 ejaculated_date,
 note,
 is_private,
-is_too_sensitive,
 link,
 to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date,
 to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span
@@ -110,6 +109,13 @@ SQL
             }
         }
 
+        // 月間グラフ用の配列初期化
+        $month = Carbon::now()->firstOfMonth()->subMonth(11); // 直近12ヶ月
+        for ($i = 0; $i < 12; $i++) {
+            $monthlySum[$month->format('Y/m')] = 0;
+            $month->addMonth();
+        }
+
         foreach ($groupByDay as $data) {
             $date = Carbon::createFromFormat('Y/m/d', $data->date);
             $yearAndMonth = $date->format('Y/m');
@@ -117,18 +123,21 @@ SQL
             $dailySum[$date->timestamp] = $data->count;
             $yearlySum[$date->year] += $data->count;
             $dowSum[$date->dayOfWeek] += $data->count;
-            $monthlySum[$yearAndMonth] = ($monthlySum[$yearAndMonth] ?? 0) + $data->count;
+            if (isset($monthlySum[$yearAndMonth])) {
+                $monthlySum[$yearAndMonth] += $data->count;
+            }
         }
 
         foreach ($groupByHour as $data) {
             $hour = (int)$data->hour;
             $hourlySum[$hour] += $data->count;
         }
-
+        
         $graphData = [
             'dailySum' => $dailySum,
             'dowSum' => $dowSum,
-            'monthlySum' => $monthlySum,
+            'monthlyKey' => array_keys($monthlySum),
+            'monthlySum' => array_values($monthlySum),
             'yearlyKey' => array_keys($yearlySum),
             'yearlySum' => array_values($yearlySum),
             'hourlyKey' => array_keys($hourlySum),
@@ -152,7 +161,6 @@ id,
 ejaculated_date,
 note,
 is_private,
-is_too_sensitive,
 link,
 to_char(lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC), 'YYYY/MM/DD HH24:MI') AS before_date,
 to_char(ejaculated_date - (lead(ejaculated_date, 1, NULL) OVER (ORDER BY ejaculated_date DESC)), 'FMDDD日 FMHH24時間 FMMI分') AS ejaculated_span

app/MetadataResolver/CienResolver.php

@@ -25,15 +25,19 @@ class CienResolver extends MetadataResolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse((string) $res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        // 画像URLから有効期限の起点を拾う
-        parse_str(parse_url($metadata->image, PHP_URL_QUERY), $params);
-        if (empty($params['px-time'])) {
-            throw new \RuntimeException('Parameter "px-time" not found. Image=' . $metadata->image . ' Source=' . $url);
+            // 画像URLから有効期限の起点を拾う
+            parse_str(parse_url($metadata->image, PHP_URL_QUERY), $params);
+            if (empty($params['px-time'])) {
+                throw new \RuntimeException('Parameter "px-time" not found. Image=' . $metadata->image . ' Source=' . $url);
+            }
+            $metadata->expires_at = Carbon::createFromTimestamp($params['px-time'])->addHour(1);
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-        $metadata->expires_at = Carbon::createFromTimestamp($params['px-time'])->addHour(1);
-
-        return $metadata;
     }
 }

app/MetadataResolver/DLsiteResolver.php

@@ -52,22 +52,6 @@ class DLsiteResolver implements Resolver
 
     public function resolve(string $url): Metadata
     {
-        //アフィリエイトの場合は普通のURLに変換
-        // ID型
-        if (preg_match('~/dlaf/=(/.+/.+)?/link/~', $url)) {
-            preg_match('~www\.dlsite\.com/(?P<genre>.+)/dlaf/=(/.+/.+)?/link/work/aid/(?P<AffiliateId>.+)/id/(?P<titleId>..\d+)(\.html)?~', $url, $matches);
-            $url = "https://www.dlsite.com/{$matches['genre']}/work/=/product_id/{$matches['titleId']}.html";
-        }
-        // URL型
-        if (strpos($url, '/dlaf/=/aid/') !== false) {
-            preg_match('~www\.dlsite\.com/.+/dlaf/=/aid/.+/url/(?P<url>.+)~', $url, $matches);
-            $affiliateUrl = urldecode($matches['url']);
-            if (preg_match('~www\.dlsite\.com/.+/(work|announce)/=/product_id/..\d+(\.html)?~', $affiliateUrl, $matches)) {
-                $url = $affiliateUrl;
-            } else {
-                throw new \RuntimeException("アフィリエイト先のリンクがDLsiteのタイトルではありません: $affiliateUrl");
-            }
-        }
 
         //スマホページの場合はPCページに正規化
         if (strpos($url, '-touch') !== false) {
@@ -75,55 +59,57 @@ class DLsiteResolver implements Resolver
         }
 
         $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
-        $xpath = new \DOMXPath($dom);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
 
-        // OGPタイトルから[]に囲まれているmakerを取得する
-        // 複数の作者がいる場合スペース区切りになるためexplodeしている
-        // スペースを含むmakerの場合名前の一部しか取れないが動作には問題ない
-        preg_match('~ \[([^\[\]]*)\] (予告作品 )?\| DLsite(がるまに)?$~', $metadata->title, $match);
-        $makers = explode(' ', $match[1]);
+            // OGPタイトルから[]に囲まれているmakerを取得する
+            // 複数の作者がいる場合スペース区切りになるためexplodeしている
+            // スペースを含むmakerの場合名前の一部しか取れないが動作には問題ない
+            preg_match('~ \[([^\[\]]*)\] (予告作品 )?\| DLsite(がるまに)?$~', $metadata->title, $match);
+            $makers = explode(' ', $match[1]);
 
-        //フォローボタン(.btn_follow)はテキストを含んでしまうことがあるので要素を削除しておく
-        $followButtonNode = $xpath->query('//*[@class="btn_follow"]')->item(0);
-        $followButtonNode->parentNode->removeChild($followButtonNode);
+            //フォローボタン(.btn_follow)はテキストを含んでしまうことがあるので要素を削除しておく
+            $followButtonNode = $xpath->query('//*[@class="btn_follow"]')->item(0);
+            $followButtonNode->parentNode->removeChild($followButtonNode);
 
-        // maker, makerHeadを探す
+            // maker, makerHeadを探す
 
-        // makers
-        // #work_makerから「makerを含むテキスト」を持つ要素を持つtdを探す
-        // 作者名単体の場合もあるし、"作者A / 作者B"のようになることもある
-        $makersNode = $xpath->query('//*[@id="work_maker"]//*[contains(text(), "' . $makers[0] . '")]/ancestor::td')->item(0);
-        // nbspをspaceに置換
-        $makers = trim(str_replace("\xc2\xa0", ' ', $makersNode->textContent));
+            // makers
+            // #work_makerから「makerを含むテキスト」を持つ要素を持つtdを探す
+            // 作者名単体の場合もあるし、"作者A / 作者B"のようになることもある
+            $makersNode = $xpath->query('//*[@id="work_maker"]//*[contains(text(), "' . $makers[0] . '")]/ancestor::td')->item(0);
+            $makers = trim($makersNode->textContent);
 
-        // makersHaed
-        // $makerNode(td)に対するthを探す
-        // "著者", "サークル名", "ブランド名"など
-        $makersHeadNode = $xpath->query('preceding-sibling::th', $makersNode)->item(0);
-        $makersHead = trim($makersHeadNode->textContent);
+            // makersHaed
+            // $makerNode(td)に対するthを探す
+            // "著者", "サークル名", "ブランド名"など
+            $makersHeadNode = $xpath->query('preceding-sibling::th', $makersNode)->item(0);
+            $makersHead = trim($makersHeadNode->textContent);
 
-        // 余分な文を消す
+            // 余分な文を消す
 
-        // OGPタイトルから作者名とサイト名を消す
-        $metadata->title = trim(preg_replace('~ \[[^\[\]]*\] (予告作品 )?\| DLsite(がるまに)?$~', '', $metadata->title));
+            // OGPタイトルから作者名とサイト名を消す
+            $metadata->title = trim(preg_replace('~ \[[^\[\]]*\] (予告作品 )?\| DLsite(がるまに)?$~', '', $metadata->title));
 
-        // OGP説明文から定型文を消す
-        if (strpos($url, 'dlsite.com/eng/') || strpos($url, 'dlsite.com/ecchi-eng/')) {
-            $metadata->description = preg_replace('~DLsite.+ is a download shop for .+With a huge selection of products, we\'re sure you\'ll find whatever tickles your fancy\. DLsite is one of the greatest indie contents download shops in Japan\.$~', '', $metadata->description);
+            // OGP説明文から定型文を消す
+            if (strpos($url, 'dlsite.com/eng/') || strpos($url, 'dlsite.com/ecchi-eng/')) {
+                $metadata->description = trim(preg_replace('~DLsite.+ is a download shop for .+With a huge selection of products, we\'re sure you\'ll find whatever tickles your fancy\. DLsite is one of the greatest indie contents download shops in Japan\.$~', '', $metadata->description));
+            } else {
+                $metadata->description = trim(preg_replace('~「DLsite.+」は.+のダウンロードショップ。お気に入りの作品をすぐダウンロードできてすぐ楽しめる！毎日更新しているのであなたが探している作品にきっと出会えます。国内最大級の二次元総合ダウンロードショップ「DLsite」！$~', '', $metadata->description));
+            }
+
+            // 整形
+            $metadata->description = $makersHead . ': ' . $makers . PHP_EOL . $metadata->description;
+            $metadata->image = str_replace('img_sam.jpg', 'img_main.jpg', $metadata->image);
+            $metadata->tags = $this->extractTags($res->getBody());
+
+            return $metadata;
         } else {
-            $metadata->description = preg_replace('~「DLsite.+」は.+のダウンロードショップ。お気に入りの作品をすぐダウンロードできてすぐ楽しめる！毎日更新しているのであなたが探している作品にきっと出会えます。国内最大級の二次元総合ダウンロードショップ「DLsite」！$~', '', $metadata->description);
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-        $metadata->description = trim(strip_tags($metadata->description));
-
-        // 整形
-        $metadata->description = $makersHead . ': ' . $makers . PHP_EOL . $metadata->description;
-        $metadata->image = str_replace('img_sam.jpg', 'img_main.jpg', $metadata->image);
-        $metadata->tags = $this->extractTags($res->getBody());
-
-        return $metadata;
     }
 }

app/MetadataResolver/DeviantArtResolver.php

@@ -23,17 +23,35 @@ class DeviantArtResolver implements Resolver
 
     public function resolve(string $url): Metadata
     {
-        $res = $this->client->get('https://backend.deviantart.com/oembed?url=' . $url);
-        $data = json_decode($res->getBody()->getContents(), true);
-        $metadata = new Metadata();
+        $res = $this->client->get($url);
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $metadata->title = $data['title'] ?? '';
-        $metadata->description = 'By ' . $data['author_name'];
-        $metadata->image  = $data['url'];
-        if (isset($data['tags'])) {
-            $metadata->tags = explode(', ', $data['tags']);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
+
+            $node = $xpath->query('//*[@id="pimp-preload"]/following-sibling::div//img')->item(0);
+            $srcset = $node->getAttribute('srcset');
+            $srcset_array = explode('w,', $srcset);
+            $src = end($srcset_array);
+            $src = preg_replace('~ \d+w$~', '', $src);
+
+            if (preg_match('~\.wixmp\.com$~', parse_url($src)['host'])) {
+                // アスペクト比を保ったまま、縦か横が最大700pxになるように変換する。
+                // Ref: https://support.wixmp.com/en/article/image-service-3835799
+                if (strpos($src, '/v1/fill/')) {
+                    $src = preg_replace('~/v1/fill/w_\d+,h_\d+,q_\d+,strp~', '/v1/fit/w_700,h_700,q_70,strp', $src);
+                } else {
+                    $src = $src . '/v1/fit/w_700,h_700,q_70,strp/image.jpg';
+                }
+            }
+
+            $metadata->image = $src;
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        return $metadata;
     }
 }

app/MetadataResolver/FC2ContentsResolver.php

@@ -24,17 +24,21 @@ class FC2ContentsResolver implements Resolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
-        $xpath = new \DOMXPath($dom);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
 
-        $thumbnailNode = $xpath->query('//*[@class="main_thum_img"]/a')->item(0);
-        if ($thumbnailNode) {
-            $metadata->image = preg_replace('~^http:~', 'https:', $thumbnailNode->getAttribute('href'));
+            $thumbnailNode = $xpath->query('//*[@class="main_thum_img"]/a')->item(0);
+            if ($thumbnailNode) {
+                $metadata->image = preg_replace('~^http:~', 'https:', $thumbnailNode->getAttribute('href'));
+            }
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        return $metadata;
     }
 }

app/MetadataResolver/FantiaResolver.php

@@ -3,6 +3,7 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Log;
 
 class FantiaResolver implements Resolver
 {
@@ -10,31 +11,46 @@ class FantiaResolver implements Resolver
      * @var Client
      */
     private $client;
+    /**
+     * @var OGPResolver
+     */
+    private $ogpResolver;
 
-    public function __construct(Client $client)
+    public function __construct(Client $client, OGPResolver $ogpResolver)
     {
         $this->client = $client;
+        $this->ogpResolver = $ogpResolver;
     }
 
     public function resolve(string $url): Metadata
     {
-        preg_match("~posts/(\d+)~", $url, $match);
-        $postId = $match[1];
+        preg_match("~\d+~", $url, $match);
+        $postId = $match[0];
 
-        $res = $this->client->get("https://fantia.jp/api/v1/posts/{$postId}");
-        $data = json_decode(str_replace('\r\n', '\n', (string) $res->getBody()), true);
-        $post = $data['post'];
+        $res = $this->client->get($url);
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $tags = array_map(function ($tag) {
-            return $tag['name'];
-        }, $post['tags']);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
 
-        $metadata = new Metadata();
-        $metadata->title = $post['title'] ?? '';
-        $metadata->description = 'サークル: ' . $post['fanclub']['fanclub_name_with_creator_name'] . PHP_EOL . $post['comment'];
-        $metadata->image = str_replace('micro', 'main', $post['thumb_micro']) ?? '';
-        $metadata->tags = array_merge($tags, [$post['fanclub']['creator_name']]);
+            $node = $xpath->query("//meta[@property='twitter:image']")->item(0);
+            $ogpUrl = $node->getAttribute('content');
 
-        return $metadata;
+            // 投稿に画像がない場合（ogp.jpgでない場合）のみ大きい画像に変換する
+            if ($ogpUrl != 'http://fantia.jp/images/ogp.jpg') {
+                preg_match("~https://fantia\.s3\.amazonaws\.com/uploads/post/file/{$postId}/ogp_(.*?)\.(jpg|png)~", $ogpUrl, $match);
+                $uuid = $match[1];
+                $extension = $match[2];
+
+                // 大きい画像に変換
+                $metadata->image = "https://c.fantia.jp/uploads/post/file/{$postId}/main_{$uuid}.{$extension}";
+            }
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 }

app/MetadataResolver/FanzaResolver.php

@@ -3,7 +3,6 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
 
 class FanzaResolver implements Resolver
 {
@@ -22,84 +21,17 @@ class FanzaResolver implements Resolver
         $this->ogpResolver = $ogpResolver;
     }
 
-    /**
-     * arrayの各要素をtrim・スペースの_置換をした後、重複した値を削除してキーを詰め直す
-     *
-     * @param array $array
-     *
-     * @return array 処理されたarray
-     */
-    public function array_finish(array $array): array
-    {
-        $array = array_map('trim', $array);
-        $array = array_map((function ($value) {
-            return str_replace(' ', '_', $value);
-        }), $array);
-        $array = array_unique($array);
-        $array = array_values($array);
-
-        return $array;
-    }
-
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $html = (string) $res->getBody();
-        $crawler = new Crawler($html);
-
-        // 動画
-        if (preg_match('~www\.dmm\.co\.jp/digital/(videoa|videoc|anime)/-/detail~', $url)) {
-            $metadata = new Metadata();
-            $metadata->title = trim($crawler->filter('#title')->text(''));
-            $metadata->description = trim($crawler->filter('.box-rank+table+div+div')->text(''));
-            $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $crawler->filter('meta[property="og:image"]')->attr('content'));
-            $metadata->tags = $this->array_finish($crawler->filter('.box-rank+table a:not([href="#review"])')->extract(['_text']));
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
+            $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $metadata->image);
+            $metadata->description = str_replace('<>', '', $metadata->description);
 
             return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        // 同人
-        if (mb_strpos($url, 'www.dmm.co.jp/dc/doujin/-/detail/') !== false) {
-            $genre = $this->array_finish($crawler->filter('.m-productInformation a:not([href="#update-top"])')->extract(['_text']));
-            $genre = array_filter($genre, (function ($text) {
-                return !preg_match('~％OFF対象$~', $text);
-            }));
-
-            $metadata = new Metadata();
-            $metadata->title = $crawler->filter('meta[property="og:title"]')->attr('content');
-            $metadata->description = trim($crawler->filter('.summary__txt')->text(''));
-            $metadata->image = $crawler->filter('meta[property="og:image"]')->attr('content');
-            $metadata->tags = array_merge($genre, [$crawler->filter('.circleName__txt')->text('')]);
-
-            return $metadata;
-        }
-
-        // 電子書籍
-        if (mb_strpos($url, 'book.dmm.co.jp/detail/') !== false) {
-            $metadata = new Metadata();
-            $metadata->title = trim($crawler->filter('#title')->text(''));
-            $metadata->description = trim($crawler->filter('.m-boxDetailProduct__info__story')->text(''));
-            $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $crawler->filter('meta[property="og:image"]')->attr('content'));
-            $metadata->tags = $this->array_finish($crawler->filter('.m-boxDetailProductInfoMainList__description__list__item, .m-boxDetailProductInfo__list__description__item a')->extract(['_text']));
-
-            return $metadata;
-        }
-
-        // PCゲーム
-        if (mb_strpos($url, 'dlsoft.dmm.co.jp/detail/') !== false) {
-            $metadata = new Metadata();
-            $metadata->title = trim($crawler->filter('#title')->text(''));
-            $metadata->description = trim($crawler->filter('.area-detail-read .text-overflow')->text(''));
-            $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $crawler->filter('meta[property="og:image"]')->attr('content'));
-            $metadata->tags = $this->array_finish($crawler->filter('.area-bskt table a:not([href="#review"])')->extract(['_text']));
-
-            return $metadata;
-        }
-
-        // 上で特に対応しなかったURL 画像の置換くらいはしておく
-        $metadata = $this->ogpResolver->parse($html);
-        $metadata->image = preg_replace("~(pr|ps)\.jpg$~", 'pl.jpg', $metadata->image);
-
-        return $metadata;
     }
 }

app/MetadataResolver/IwaraResolver.php

@@ -3,7 +3,6 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
 
 class IwaraResolver implements Resolver
 {
@@ -20,41 +19,51 @@ class IwaraResolver implements Resolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $metadata = new Metadata();
-        $html = (string) $res->getBody();
-        $crawler = new Crawler($html);
 
-        $infoElements = $crawler->filter('#video-player + div, .field-name-field-video-url + div, .field-name-field-images + div');
-        $title = $infoElements->filter('h1.title')->text();
-        $author = $infoElements->filter('.username')->text();
-        $description = $infoElements->filter('.field-type-text-with-summary')->text('');
-        $tags =  $infoElements->filter('a[href^="/videos"], a[href^="/images"]')->extract('_text');
-        // 役に立たないタグを削除する
-        $tags = array_values(array_diff($tags, ['Uncategorized', 'Other']));
-        array_push($tags, $author);
+        if ($res->getStatusCode() === 200) {
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
 
-        $metadata->title = $title;
-        $metadata->description = '投稿者: ' . $author . PHP_EOL . $description;
-        $metadata->tags = $tags;
+            $metadata = new Metadata();
 
-        // iwara video
-        if ($crawler->filter('#video-player')->count()) {
-            $metadata->image = 'https:' . $crawler->filter('#video-player')->attr('poster');
-        }
-
-        // youtube
-        if ($crawler->filter('iframe[src^="//www.youtube.com"]')->count()) {
-            if (preg_match('~youtube\.com/embed/(\S+)\?~', $crawler->filter('iframe[src^="//www.youtube.com"]')->attr('src'), $matches) === 1) {
-                $youtubeId = $matches[1];
-                $metadata->image = 'https://img.youtube.com/vi/' . $youtubeId . '/maxresdefault.jpg';
+            // find title
+            foreach ($xpath->query('//title') as $node) {
+                $content = $node->textContent;
+                if (!empty($content)) {
+                    $metadata->title = $content;
+                    break;
+                }
             }
-        }
 
-        // images
-        if ($crawler->filter('.field-name-field-images')->count()) {
-            $metadata->image = 'https:' . $crawler->filter('.field-name-field-images a')->first()->attr('href');
-        }
+            // find thumbnail
+            foreach ($xpath->query('//*[@id="video-player"]') as $node) {
+                $poster = $node->getAttribute('poster');
+                if (!empty($poster)) {
+                    if (strpos($poster, '//') === 0) {
+                        $poster = 'https:' . $poster;
+                    }
+                    $metadata->image = $poster;
+                    break;
+                }
+            }
+            if (empty($metadata->image)) {
+                // YouTube embedded?
+                foreach ($xpath->query('//div[@class="embedded-video"]//iframe') as $node) {
+                    $src = $node->getAttribute('src');
+                    if (preg_match('~youtube\.com/embed/(\S+)\?~', $src, $matches) !== -1) {
+                        $youtubeId = $matches[1];
+                        $iwaraThumbUrl = 'https://i.iwara.tv/sites/default/files/styles/thumbnail/public/video_embed_field_thumbnails/youtube/' . $youtubeId . '.jpg';
 
-        return $metadata;
+                        $metadata->image = $iwaraThumbUrl;
+                        break;
+                    }
+                }
+            }
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 }

app/MetadataResolver/Kb10uyShortStoryServerResolver.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\MetadataResolver;
-
-use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
-
-class Kb10uyShortStoryServerResolver implements Resolver
-{
-    protected const EXCLUDED_TAGS = ['R-15', 'R-18'];
-
-    /**
-     * @var Client
-     */
-    private $client;
-
-    public function __construct(Client $client)
-    {
-        $this->client = $client;
-    }
-
-    public function resolve(string $url): Metadata
-    {
-        $res = $this->client->get($url);
-        $html = (string) $res->getBody();
-        $crawler = new Crawler($html);
-        $infoElement = $crawler->filter('div.post-info');
-
-        $metadata = new Metadata();
-        $metadata->title = $infoElement->filter('h1')->text();
-        $metadata->description = trim($infoElement->filter('p.summary')->text());
-        $metadata->tags = array_values(array_diff($infoElement->filter('ul.tags > li.tag > a')->extract('_text'), self::EXCLUDED_TAGS));
-
-        return $metadata;
-    }
-}

app/MetadataResolver/KomifloResolver.php

@@ -24,28 +24,33 @@ class KomifloResolver implements Resolver
         $id = $matches[1];
 
         $res = $this->client->get('https://api.komiflo.com/content/id/' . $id);
-        $json = json_decode($res->getBody()->getContents(), true);
-        $metadata = new Metadata();
+        if ($res->getStatusCode() === 200) {
+            $json = json_decode($res->getBody()->getContents(), true);
+            $metadata = new Metadata();
 
-        $metadata->title = $json['content']['data']['title'] ?? '';
-        $metadata->description = ($json['content']['attributes']['artists']['children'][0]['data']['name'] ?? '?') .
-            ' - ' . ($json['content']['parents'][0]['data']['title'] ?? '?');
-        $metadata->image = 'https://t.komiflo.com/564_mobile_large_3x/' . $json['content']['named_imgs']['cover']['filename'];
+            $metadata->title = $json['content']['data']['title'] ?? '';
+            $metadata->description = ($json['content']['attributes']['artists']['children'][0]['data']['name'] ?? '?') .
+                ' - ' .
+                ($json['content']['parents'][0]['data']['title'] ?? '?');
+            $metadata->image = 'https://t.komiflo.com/564_mobile_large_3x/' . $json['content']['named_imgs']['cover']['filename'];
 
-        // 作者情報
-        if (!empty($json['content']['attributes']['artists']['children'])) {
-            foreach ($json['content']['attributes']['artists']['children'] as $artist) {
-                $metadata->tags[] = preg_replace('/\s/', '_', $artist['data']['name']);
+            // 作者情報
+            if (!empty($json['content']['attributes']['artists']['children'])) {
+                foreach ($json['content']['attributes']['artists']['children'] as $artist) {
+                    $metadata->tags[] = preg_replace('/\s/', '_', $artist['data']['name']);
+                }
             }
-        }
 
-        // タグ
-        if (!empty($json['content']['attributes']['tags']['children'])) {
-            foreach ($json['content']['attributes']['tags']['children'] as $tag) {
-                $metadata->tags[] = preg_replace('/\s/', '_', $tag['data']['name']);
+            // タグ
+            if (!empty($json['content']['attributes']['tags']['children'])) {
+                foreach ($json['content']['attributes']['tags']['children'] as $tag) {
+                    $metadata->tags[] = preg_replace('/\s/', '_', $tag['data']['name']);
+                }
             }
-        }
 
-        return $metadata;
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 }

app/MetadataResolver/MelonbooksResolver.php

@@ -27,42 +27,46 @@ class MelonbooksResolver implements Resolver
         $cookieJar = CookieJar::fromArray(['AUTH_ADULT' => '1'], 'www.melonbooks.co.jp');
 
         $res = $this->client->get($url, ['cookies' => $cookieJar]);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
-        $xpath = new \DOMXPath($dom);
-        $descriptionNodelist = $xpath->query('//div[@id="description"]//p');
-        $specialDescriptionNodelist = $xpath->query('//div[@id="special_description"]//p');
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
+            $descriptionNodelist = $xpath->query('//div[@id="description"]//p');
+            $specialDescriptionNodelist = $xpath->query('//div[@id="special_description"]//p');
 
-        // censoredフラグの除去
-        if (mb_strpos($metadata->image, '&c=1') !== false) {
-            $metadata->image = preg_replace('/&c=1/u', '', $metadata->image);
-        }
-
-        // 抽出
-        preg_match('~^(.+)（(.+)）の通販・購入はメロンブックス$~', $metadata->title, $match);
-        $title = $match[1];
-        $maker = $match[2];
-
-        // 整形
-        $description = 'サークル: ' . $maker . "\n";
-
-        if ($specialDescriptionNodelist->length !== 0) {
-            $description .= trim(str_replace('<br>', "\n", $specialDescriptionNodelist->item(0)->nodeValue)) . "\n";
-            if ($specialDescriptionNodelist->length === 2) {
-                $description .= "\n";
-                $description .= trim(str_replace('<br>', "\n", $specialDescriptionNodelist->item(1)->nodeValue)) . "\n";
+            // censoredフラグの除去
+            if (mb_strpos($metadata->image, '&c=1') !== false) {
+                $metadata->image = preg_replace('/&c=1/u', '', $metadata->image);
             }
+
+            // 抽出
+            preg_match('~^(.+)（(.+)）の通販・購入はメロンブックス$~', $metadata->title, $match);
+            $title = $match[1];
+            $maker = $match[2];
+
+            // 整形
+            $description = 'サークル: ' . $maker . "\n";
+
+            if ($specialDescriptionNodelist->length !== 0) {
+                $description .= trim(str_replace('<br>', "\n", $specialDescriptionNodelist->item(0)->nodeValue)) . "\n";
+                if ($specialDescriptionNodelist->length === 2) {
+                    $description .= "\n";
+                    $description .= trim(str_replace('<br>', "\n", $specialDescriptionNodelist->item(1)->nodeValue)) . "\n";
+                }
+            }
+
+            if ($descriptionNodelist->length !== 0) {
+                $description .= trim(str_replace('<br>', "\n", $descriptionNodelist->item(0)->nodeValue));
+            }
+
+            $metadata->title = $title;
+            $metadata->description = trim($description);
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        if ($descriptionNodelist->length !== 0) {
-            $description .= trim(str_replace('<br>', "\n", $descriptionNodelist->item(0)->nodeValue));
-        }
-
-        $metadata->title = $title;
-        $metadata->description = trim($description);
-
-        return $metadata;
     }
 }

app/MetadataResolver/MetadataResolver.php

@@ -14,13 +14,10 @@ class MetadataResolver implements Resolver
         '~komiflo\.com(/#!)?/comics/(\\d+)~' => KomifloResolver::class,
         '~www\.melonbooks\.co\.jp/detail/detail\.php~' => MelonbooksResolver::class,
         '~ec\.toranoana\.(jp|shop)/(tora|joshi)(_[rd]+)?/(ec|digi)/item/~' => ToranoanaResolver::class,
-        '~iwara\.tv/(videos|images)/.*~' => IwaraResolver::class,
+        '~iwara\.tv/videos/.*~' => IwaraResolver::class,
         '~www\.dlsite\.com/.*/(work|announce)/=/product_id/..\d+(\.html)?~' => DLsiteResolver::class,
-        '~www\.dlsite\.com/.*/dlaf/=(/.+/.+)?/link/work/aid/.+(/id)?/..\d+(\.html)?~' => DLsiteResolver::class,
-        '~www\.dlsite\.com/.*/dlaf/=/aid/.+/url/.+~' => DLsiteResolver::class,
         '~dlsite\.jp/...tw/..\d+~' => DLsiteResolver::class,
         '~www\.pixiv\.net/member_illust\.php\?illust_id=\d+~' => PixivResolver::class,
-        '~www\.pixiv\.net/artworks/\d+~' => PixivResolver::class,
         '~www\.pixiv\.net/user/\d+/series/\d+~' => PixivResolver::class,
         '~fantia\.jp/posts/\d+~' => FantiaResolver::class,
         '~dmm\.co\.jp/~' => FanzaResolver::class,
@@ -31,8 +28,6 @@ class MetadataResolver implements Resolver
         '~www\.plurk\.com\/p\/.*~' => PlurkResolver::class,
         '~(adult\.)?contents\.fc2\.com\/article_search\.php\?id=\d+~' => FC2ContentsResolver::class,
         '~store\.steampowered\.com/app/\d+~' => SteamResolver::class,
-        '~www\.xtube\.com/video-watch/.*-\d+$~'=> XtubeResolver::class,
-        '~ss\.kb10uy\.org/posts/\d+$~' => Kb10uyShortStoryServerResolver::class,
     ];
 
     public $mimeTypes = [

app/MetadataResolver/NarouResolver.php

@@ -27,30 +27,34 @@ class NarouResolver implements Resolver
         $cookieJar = CookieJar::fromArray(['over18' => 'yes'], '.syosetu.com');
 
         $res = $this->client->get($url, ['cookies' => $cookieJar]);
-        $metadata = $this->ogpResolver->parse($res->getBody());
-        $metadata->description = '';
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
+            $metadata->description = '';
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'ASCII,JIS,UTF-8,eucJP-win,SJIS-win'));
-        $xpath = new \DOMXPath($dom);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'ASCII,JIS,UTF-8,eucJP-win,SJIS-win'));
+            $xpath = new \DOMXPath($dom);
 
-        $description = [];
+            $description = [];
 
-        // 作者名
-        $writerNodes = $xpath->query('//*[contains(@class, "novel_writername")]');
-        if ($writerNodes->length !== 0 && !empty($writerNodes->item(0)->textContent)) {
-            $description[] = trim($writerNodes->item(0)->textContent);
+            // 作者名
+            $writerNodes = $xpath->query('//*[contains(@class, "novel_writername")]');
+            if ($writerNodes->length !== 0 && !empty($writerNodes->item(0)->textContent)) {
+                $description[] = trim($writerNodes->item(0)->textContent);
+            }
+
+            // あらすじ
+            $exNodes = $xpath->query('//*[@id="novel_ex"]');
+            if ($exNodes->length !== 0 && !empty($exNodes->item(0)->textContent)) {
+                $summary = trim($exNodes->item(0)->textContent);
+                $description[] = mb_strimwidth($summary, 0, 101, '…'); // 100 + '…'(1)
+            }
+
+            $metadata->description = implode(' / ', $description);
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        // あらすじ
-        $exNodes = $xpath->query('//*[@id="novel_ex"]');
-        if ($exNodes->length !== 0 && !empty($exNodes->item(0)->textContent)) {
-            $summary = trim($exNodes->item(0)->textContent);
-            $description[] = mb_strimwidth($summary, 0, 101, '…'); // 100 + '…'(1)
-        }
-
-        $metadata->description = implode(' / ', $description);
-
-        return $metadata;
     }
 }

app/MetadataResolver/NicoSeigaResolver.php

@@ -3,7 +3,6 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
 
 class NicoSeigaResolver implements Resolver
 {
@@ -25,18 +24,16 @@ class NicoSeigaResolver implements Resolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $html = (string)$res->getBody();
-        $metadata = $this->ogpResolver->parse($html);
-        $crawler = new Crawler($html);
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        // タグ
-        $excludeTags = ['R-15'];
-        $metadata->tags = array_values(array_diff($crawler->filter('.tag')->extract(['_text']), $excludeTags));
+            // ページURLからサムネイルURLに変換
+            preg_match('~http://(?:(?:sp\\.)?seiga\\.nicovideo\\.jp/seiga(?:/#!)?|nico\\.ms)/im(\\d+)~', $url, $matches);
+            $metadata->image = "http://lohas.nicoseiga.jp/thumb/${matches[1]}l?";
 
-        // ページURLからサムネイルURLに変換
-        preg_match('~https?://(?:(?:sp\\.)?seiga\\.nicovideo\\.jp/seiga(?:/#!)?|nico\\.ms)/im(\\d+)~', $url, $matches);
-        $metadata->image = "https://lohas.nicoseiga.jp/thumb/${matches[1]}l?";
-
-        return $metadata;
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 }

app/MetadataResolver/NijieResolver.php

@@ -3,7 +3,6 @@
 namespace App\MetadataResolver;
 
 use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
 
 class NijieResolver implements Resolver
 {
@@ -31,33 +30,27 @@ class NijieResolver implements Resolver
             $url = preg_replace('~view_popup\.php~', 'view.php', $url);
         }
 
-        $res =  $this->client->get($url);
-        $html = (string) $res->getBody();
-        $metadata = $this->ogpResolver->parse($html);
-        $crawler = new Crawler($html);
+        $client = $this->client;
+        $res = $client->get($url);
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $json = $crawler->filter('script[type="application/ld+json"]')->first()->text();
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
+            $dataNode = $xpath->query('//script[substring(@type, string-length(@type) - 3, 4) = "json"]');
+            foreach ($dataNode as $node) {
+                // 改行がそのまま入っていることがあるのでデコード前にエスケープが必要
+                $imageData = json_decode(preg_replace('/\r?\n/', '\n', $node->nodeValue), true);
+                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;
+                }
+            }
 
-        // 改行がそのまま入っていることがあるのでデコード前にエスケープが必要
-        $data = json_decode(preg_replace('/\r?\n/', '\n', $json), true);
-
-        // DomCrawler内でjson内の日本語がHTMLエンティティに変換されるので、全要素に対してhtml_entity_decode
-        array_walk_recursive($data, function (&$v) {
-            $v = html_entity_decode($v);
-        });
-
-        $metadata->title = $data['name'];
-        $metadata->description = '投稿者: ' . $data['author']['name'] . PHP_EOL . $data['description'];
-        if (
-            isset($data['thumbnailUrl']) &&
-            !ends_with($data['thumbnailUrl'], '.gif') &&
-            !ends_with($data['thumbnailUrl'], '.mp4')
-        ) {
-            // サムネイルからメイン画像に
-            $metadata->image = str_replace('__rs_l160x160/', '', $data['thumbnailUrl']);
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-        $metadata->tags = $crawler->filter('#view-tag span.tag_name')->extract('_text');
-
-        return $metadata;
     }
 }

app/MetadataResolver/OGPResolver.php

@@ -18,7 +18,12 @@ class OGPResolver implements Resolver, Parser
 
     public function resolve(string $url): Metadata
     {
-        return $this->parse($this->client->get($url)->getBody());
+        $res = $this->client->get($url);
+        if ($res->getStatusCode() === 200) {
+            return $this->parse($res->getBody());
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 
     public function parse(string $html): Metadata

app/MetadataResolver/PatreonResolver.php

@@ -25,14 +25,18 @@ class PatreonResolver implements Resolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        parse_str(parse_url($metadata->image, PHP_URL_QUERY), $query);
-        if (isset($query['token-time'])) {
-            $expires_at_unixtime = $query['token-time'];
-            $metadata->expires_at = Carbon::createFromTimestamp($expires_at_unixtime);
+            parse_str(parse_url($metadata->image, PHP_URL_QUERY), $query);
+            if (isset($query['token-time'])) {
+                $expires_at_unixtime = $query['token-time'];
+                $metadata->expires_at = Carbon::createFromTimestamp($expires_at_unixtime);
+            }
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        return $metadata;
     }
 }

app/MetadataResolver/PixivResolver.php

@@ -38,48 +38,52 @@ class PixivResolver implements Resolver
     {
         if (preg_match('~www\.pixiv\.net/user/\d+/series/\d+~', $url, $matches)) {
             $res = $this->client->get($url);
-            $metadata = $this->ogpResolver->parse($res->getBody());
-            $metadata->image = $this->proxize($metadata->image);
+            if ($res->getStatusCode() === 200) {
+                $metadata = $this->ogpResolver->parse($res->getBody());
+                $metadata->image = $this->proxize($metadata->image);
 
-            return $metadata;
+                return $metadata;
+            } else {
+                throw new \RuntimeException("{$res->getStatusCode()}: $url");
+            }
         }
 
+        parse_str(parse_url($url, PHP_URL_QUERY), $params);
+        $illustId = $params['illust_id'];
         $page = 0;
-        if (preg_match('~www\.pixiv\.net/artworks/(\d+)~', $url, $matches)) {
-            $illustId = $matches[1];
-        } else {
-            parse_str(parse_url($url, PHP_URL_QUERY), $params);
-            $illustId = $params['illust_id'];
 
-            // 漫画ページ（ページ数はmanga_bigならあるかも）
-            if ($params['mode'] === 'manga_big' || $params['mode'] === 'manga') {
-                $page = $params['page'] ?? 0;
-            }
+        // 漫画ページ（ページ数はmanga_bigならあるかも）
+        if ($params['mode'] === 'manga_big' || $params['mode'] === 'manga') {
+            $page = $params['page'] ?? 0;
         }
 
         $res = $this->client->get('https://www.pixiv.net/ajax/illust/' . $illustId);
-        $json = json_decode($res->getBody()->getContents(), true);
-        $metadata = new Metadata();
+        if ($res->getStatusCode() === 200) {
+            $json = json_decode($res->getBody()->getContents(), true);
+            $metadata = new Metadata();
 
-        $metadata->title = $json['body']['illustTitle'] ?? '';
-        $metadata->description = '投稿者: ' . $json['body']['userName'] . PHP_EOL . strip_tags(str_replace('<br />', PHP_EOL, $json['body']['illustComment'] ?? ''));
-        $metadata->image = $this->proxize($json['body']['urls']['regular'] ?? '');
+            $metadata->title = $json['body']['illustTitle'] ?? '';
+            $metadata->description = '投稿者: ' . $json['body']['userName'] . PHP_EOL . strip_tags(str_replace('<br />', PHP_EOL, $json['body']['illustComment'] ?? ''));
+            $metadata->image = $this->proxize($json['body']['urls']['regular'] ?? '');
 
-        // ページ数の指定がある場合は画像URLをそのページにする
-        if ($page != 0) {
-            $metadata->image = str_replace('_p0', '_p' . $page, $metadata->image);
-        }
+            // ページ数の指定がある場合は画像URLをそのページにする
+            if ($page != 0) {
+                $metadata->image = str_replace('_p0', '_p'.$page, $metadata->image);
+            }
 
-        // タグ
-        if (!empty($json['body']['tags']['tags'])) {
-            foreach ($json['body']['tags']['tags'] as $tag) {
-                // 一部の固定キーワードは無視
-                if (array_search($tag['tag'], ['R-18', 'イラスト', 'pixiv', 'ピクシブ'], true) === false) {
-                    $metadata->tags[] = preg_replace('/\s/', '_', $tag['tag']);
+            // タグ
+            if (!empty($json['body']['tags']['tags'])) {
+                foreach ($json['body']['tags']['tags'] as $tag) {
+                    // 一部の固定キーワードは無視
+                    if (array_search($tag['tag'], ['R-18', 'イラスト', 'pixiv', 'ピクシブ'], true) === false) {
+                        $metadata->tags[] = preg_replace('/\s/', '_', $tag['tag']);
+                    }
                 }
             }
-        }
 
-        return $metadata;
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
+        }
     }
 }

app/MetadataResolver/PlurkResolver.php

@@ -24,17 +24,21 @@ class PlurkResolver implements Resolver
     public function resolve(string $url): Metadata
     {
         $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        if ($res->getStatusCode() === 200) {
+            $metadata = $this->ogpResolver->parse($res->getBody());
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
-        $xpath = new \DOMXPath($dom);
-        $imageNode = $xpath->query('//div[@class="text_holder"]/a[1]')->item(0);
+            $dom = new \DOMDocument();
+            @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
+            $xpath = new \DOMXPath($dom);
+            $imageNode = $xpath->query('//div[@class="text_holder"]/a[1]')->item(0);
 
-        if ($imageNode) {
-            $metadata->image = $imageNode->getAttribute('href');
+            if ($imageNode) {
+                $metadata->image = $imageNode->getAttribute('href');
+            }
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        return $metadata;
     }
 }

app/MetadataResolver/SteamResolver.php

@@ -24,17 +24,21 @@ class SteamResolver implements Resolver
         $appid = $matches[1];
 
         $res = $this->client->get('https://store.steampowered.com/api/appdetails/?l=japanese&appids=' . $appid);
-        $json = json_decode($res->getBody()->getContents(), true);
-        if ($json[$appid]['success'] === false) {
-            throw new \RuntimeException("API response [$appid][success] is false: $url");
+        if ($res->getStatusCode() === 200) {
+            $json = json_decode($res->getBody()->getContents(), true);
+            if ($json[$appid]['success'] === false) {
+                throw new \RuntimeException("API response [$appid][success] is false: $url");
+            }
+            $data = $json[$appid]['data'];
+            $metadata = new Metadata();
+
+            $metadata->title = $data['name'] ?? '';
+            $metadata->description = strip_tags(str_replace('<br />', PHP_EOL, html_entity_decode($data['short_description'] ?? '')));
+            $metadata->image = $data['header_image'] ?? '';
+
+            return $metadata;
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-        $data = $json[$appid]['data'];
-        $metadata = new Metadata();
-
-        $metadata->title = $data['name'] ?? '';
-        $metadata->description = strip_tags(str_replace('<br />', PHP_EOL, html_entity_decode($data['short_description'] ?? '')));
-        $metadata->image = $data['header_image'] ?? '';
-
-        return $metadata;
     }
 }

app/MetadataResolver/ToranoanaResolver.php

@@ -24,17 +24,13 @@ class ToranoanaResolver implements Resolver
 
     public function resolve(string $url): Metadata
     {
-        $res = $this->client->get($url);
-        $metadata = $this->ogpResolver->parse($res->getBody());
+        $cookieJar = CookieJar::fromArray(['adflg' => '0'], 'ec.toranoana.jp');
 
-        $dom = new \DOMDocument();
-        @$dom->loadHTML(mb_convert_encoding($res->getBody(), 'HTML-ENTITIES', 'UTF-8'));
-        $xpath = new \DOMXPath($dom);
-        $imgNode = $xpath->query('//*[@id="preview"]//img')->item(0);
-        if ($imgNode !== null) {
-            $metadata->image = $imgNode->getAttribute('src');
+        $res = $this->client->get($url, ['cookies' => $cookieJar]);
+        if ($res->getStatusCode() === 200) {
+            return $this->ogpResolver->parse($res->getBody());
+        } else {
+            throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }
-
-        return $metadata;
     }
 }

app/MetadataResolver/XtubeResolver.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\MetadataResolver;
-
-use GuzzleHttp\Client;
-use Symfony\Component\DomCrawler\Crawler;
-
-class XtubeResolver implements Resolver
-{
-    /**
-     * @var Client
-     */
-    private $client;
-    /**
-     * @var OGPResolver
-     */
-    private $ogpResolver;
-
-    public function __construct(Client $client, OGPResolver $ogpResolver)
-    {
-        $this->client = $client;
-        $this->ogpResolver = $ogpResolver;
-    }
-
-    public function resolve(string $url): Metadata
-    {
-        if (preg_match('~www\.xtube\.com/video-watch/.*-(\d+)$~', $url) !== 1) {
-            throw new \RuntimeException("Unmatched URL Pattern: $url");
-        }
-
-        $res = $this->client->get($url);
-        $html = (string) $res->getBody();
-        $metadata = $this->ogpResolver->parse($html);
-        $crawler = new Crawler($html);
-
-        $metadata->title = trim($crawler->filter('.underPlayerRateForm h1')->text(''));
-        $metadata->description =  trim($crawler->filter('.fullDescription ')->text(''));
-        $metadata->image = str_replace('m=eSuQ8f', 'm=eaAaaEFb', $metadata->image);
-        $metadata->image = str_replace('240X180', 'original', $metadata->image);
-        $metadata->tags = array_map('trim', $crawler->filter('.tagsCategories a')->extract('_text'));
-
-        return $metadata;
-    }
-}

app/Policies/EjaculationPolicy.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace App\Policies;
-
-use App\Ejaculation;
-use App\User;
-use Illuminate\Auth\Access\HandlesAuthorization;
-
-class EjaculationPolicy
-{
-    use HandlesAuthorization;
-
-    /**
-     * Create a new policy instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    public function edit(User $user, Ejaculation $ejaculation): bool
-    {
-        return $user->id === $ejaculation->user_id;
-    }
-}

app/Providers/AuthServiceProvider.php

@@ -2,8 +2,6 @@
 
 namespace App\Providers;
 
-use App\Ejaculation;
-use App\Policies\EjaculationPolicy;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Gate;
 
@@ -16,7 +14,6 @@ class AuthServiceProvider extends ServiceProvider
      */
     protected $policies = [
         'App\Model' => 'App\Policies\ModelPolicy',
-        Ejaculation::class => EjaculationPolicy::class,
     ];
 
     /**

composer.json

@@ -13,9 +13,7 @@
         "laravel/framework": "5.5.*",
         "laravel/tinker": "~1.0",
         "misd/linkify": "^1.1",
-        "staudenmeir/eloquent-eager-limit": "^1.0",
-        "symfony/css-selector": "^4.3",
-        "symfony/dom-crawler": "^4.3"
+        "staudenmeir/eloquent-eager-limit": "^1.0"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.1",

database/migrations/2019_09_07_164200_add_is_too_sensitive_to_ejaculations.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class AddIsTooSensitiveToEjaculations extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::table('ejaculations', function (Blueprint $table) {
-            $table->boolean('is_too_sensitive')->default(false);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::table('ejaculations', function (Blueprint $table) {
-            $table->dropColumn('is_too_sensitive');
-        });
-    }
-}

package.json

@@ -16,8 +16,6 @@
     "cal-heatmap": "^3.3.10",
     "chart.js": "^2.7.1",
     "cross-env": "^5.2.0",
-    "date-fns": "^1.30.1",
-    "grapheme-splitter": "^1.0.4",
     "husky": "^1.3.1",
     "jquery": "^3.2.1",
     "js-cookie": "^2.2.0",

phpunit.xml

@@ -16,10 +16,6 @@
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
-
-        <testsuite name="MetadataResolver">
-            <directory suffix="Test.php">./tests/Unit/MetadataResolver</directory>
-        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">

resources/assets/js/app.js

@@ -85,9 +85,6 @@ $(() => {
                     if (xhr.status === 409) {
                         callback(JSON.parse(xhr.responseText));
                         return;
-                    } else if (xhr.status === 401) {
-                        alert('いいねするためにはログインしてください。');
-                        return;
                     }
 
                     console.error(xhr);
@@ -95,10 +92,4 @@ $(() => {
                 });
         }
     });
-
-    $(document).on('click', '.card-spoiler-overlay', function (event) {
-        const $this = $(this);
-        $this.siblings(".card-link").removeClass("card-spoiler");
-        $this.remove();
-    });
-});
+});

resources/assets/js/checkin.ts

@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import TagInput from "./components/TagInput.vue";
 import MetadataPreview from './components/MetadataPreview.vue';
-import GraphemeSplitter from "grapheme-splitter";
 
 export const bus = new Vue({name: "EventBus"});
 
@@ -17,7 +16,6 @@ new Vue({
     data: {
         metadata: null,
         metadataLoadState: MetadataLoadState.Inactive,
-        noteLength: 0
     },
     components: {
         TagInput,
@@ -30,16 +28,6 @@ new Vue({
             this.fetchMetadata(linkInput.value);
         }
     },
-    watch: {
-        noteLength: (length: number) => {
-            const counter = document.querySelector<HTMLElement>(
-                "#note-character-counter"
-            );
-            if (counter) {
-                counter.innerText = `残り ${500 - length} 文字`;
-            }
-        }
-    },
     methods: {
         // オカズリンクの変更時
         onChangeLink(event: Event) {
@@ -55,14 +43,6 @@ new Vue({
                 this.fetchMetadata(url);
             }
         },
-        onChangeNote(event: Event) {
-            if (event.target instanceof HTMLTextAreaElement) {
-                const splitter = new GraphemeSplitter();
-                this.noteLength = splitter.splitGraphemes(
-                    event.target.value
-                ).length;
-            }
-        },
         // メタデータの取得
         fetchMetadata(url: string) {
             this.metadataLoadState = MetadataLoadState.Loading;

resources/assets/js/components/MetadataPreview.vue

@@ -11,7 +11,7 @@
                 </div>
                 <div v-else-if="state === MetadataLoadState.Success" class="row no-gutters">
                     <div v-if="hasImage" class="col-4 justify-content-center align-items-center">
-                        <img :src="metadata.image" alt="Thumbnail" class="w-100 bg-secondary">
+                        <img :src="metadata.image" alt="Thumbnail" class="card-img-top-to-left bg-secondary">
                     </div>
                     <div :class="descClasses">
                         <div class="card-body">
@@ -20,8 +20,8 @@
                                 <p class="card-text mb-2" style="font-size: small;">タグ候補<br><span class="text-secondary">(クリックするとタグ入力欄にコピーできます)</span></p>
                                 <ul class="list-inline d-inline">
                                     <li v-for="tag in suggestions"
-                                        :class="tagClasses(tag)"
-                                        @click="addTag(tag.name)"><span class="oi oi-tag"></span> {{ tag.name }}</li>
+                                        class="list-inline-item badge badge-primary metadata-tag-item"
+                                        @click="addTag(tag)"><span class="oi oi-tag"></span> {{ tag }}</li>
                                 </ul>
                             </template>
                         </div>
@@ -54,11 +54,6 @@
         }[],
     };
 
-    type Suggestion = {
-        name: string,
-        used: boolean,
-    }
-
     @Component
     export default class MetadataPreview extends Vue {
         @Prop() readonly state!: MetadataLoadState;
@@ -67,38 +62,16 @@
         // for use in v-if
         private readonly MetadataLoadState = MetadataLoadState;
 
-        tags: string[] = [];
-
-        created() {
-            bus.$on("change-tag", (tags: string[]) => this.tags = tags);
-            bus.$emit("resend-tag");
-        }
-
         addTag(tag: string) {
             bus.$emit("add-tag", tag);
         }
 
-        tagClasses(s: Suggestion) {
-            return {
-                "list-inline-item": true,
-                "badge": true,
-                "badge-primary": !s.used,
-                "badge-secondary": s.used,
-                "metadata-tag-item": true,
-            };
-        }
-
-        get suggestions(): Suggestion[] {
+        get suggestions() {
             if (this.metadata === null) {
                 return [];
             }
 
-            return this.metadata.tags.map(t => {
-                return {
-                    name: t.name,
-                    used: this.tags.indexOf(t.name) !== -1
-                };
-            });
+            return this.metadata.tags.map(t => t.name);
         }
 
         get hasImage() {
@@ -117,7 +90,10 @@
 <style lang="scss" scoped>
     .link-card-mini {
         $height: 150px;
-        overflow: hidden;
+
+        .row > div {
+            overflow: hidden;
+        }
 
         .row > div:first-child {
             display: flex;

resources/assets/js/components/TagInput.vue

@@ -16,7 +16,7 @@
 </template>
 
 <script lang="ts">
-    import {Vue, Component, Prop, Watch} from "vue-property-decorator";
+    import {Vue, Component, Prop} from "vue-property-decorator";
     import {bus} from "../checkin";
 
     @Component
@@ -31,7 +31,6 @@
 
         created() {
             bus.$on("add-tag", (tag: string) => this.tags.indexOf(tag) === -1 && this.tags.push(tag));
-            bus.$on("resend-tag", () => bus.$emit("change-tag", this.tags));
         }
 
         onKeyDown(event: KeyboardEvent) {
@@ -46,14 +45,6 @@
                         }
                         event.preventDefault();
                         break;
-                    case 'Unidentified':
-                        // 実際にテキストボックスに入力されている文字を見に行く (フォールバック処理)
-                        if (event.srcElement && (event.srcElement as HTMLInputElement).value.slice(-1) == ' ') {
-                            this.tags.push(this.buffer);
-                            this.buffer = "";
-                            event.preventDefault();
-                        }
-                        break;
                 }
             } else if (event.key === "Enter") {
                 // 誤爆防止
@@ -65,11 +56,6 @@
             this.tags.splice(index, 1);
         }
 
-        @Watch("tags")
-        onTagsChanged() {
-            bus.$emit("change-tag", this.tags);
-        }
-
         get containerClass(): object {
             return {
                 "form-control": true,

resources/assets/js/user/stats.js

@@ -1,12 +1,9 @@
 import CalHeatMap from 'cal-heatmap';
 import Chart from 'chart.js';
-import {addMonths, format, startOfMonth, subMonths} from 'date-fns';
-
-const graphData = JSON.parse(document.getElementById('graph-data').textContent);
 
 function createLineGraph(id, labels, data) {
     const context = document.getElementById(id).getContext('2d');
-    return new Chart(context, {
+    new Chart(context, {
         type: 'line',
         data: {
             labels: labels,
@@ -65,22 +62,7 @@ function createBarGraph(id, labels, data) {
     });
 }
 
-/**
- * @param {Date} from
- */
-function createMonthlyGraphData(from) {
-    const keys = [];
-    const values = [];
-
-    for (let i = 0; i < 12; i++) {
-        const current = addMonths(from, i);
-        const yearAndMonth = format(current, 'YYYY/MM');
-        keys.push(yearAndMonth);
-        values.push(graphData.monthlySum[yearAndMonth] || 0);
-    }
-
-    return {keys, values};
-}
+const graphData = JSON.parse(document.getElementById('graph-data').textContent);
 
 new CalHeatMap().init({
     itemSelector: '#cal-heatmap',
@@ -94,40 +76,7 @@ new CalHeatMap().init({
     legend: [1, 2, 3, 4]
 });
 
-// 直近1年の月間グラフのデータを準備
-const monthlyTermFrom = subMonths(startOfMonth(new Date()), 11);
-const {keys: monthlyKey, values: monthlySum} = createMonthlyGraphData(monthlyTermFrom);
-
-const monthlyGraph = createLineGraph('monthly-graph', monthlyKey, monthlySum);
+createLineGraph('monthly-graph', graphData.monthlyKey, graphData.monthlySum);
 createLineGraph('yearly-graph', graphData.yearlyKey, graphData.yearlySum);
 createBarGraph('hourly-graph', graphData.hourlyKey, graphData.hourlySum);
-createBarGraph('dow-graph', ['日', '月', '火', '水', '木', '金', '土'], graphData.dowSum);
-
-// 月間グラフの期間セレクターを準備
-const monthlyTermSelector = document.getElementById('monthly-term');
-for (let year = monthlyTermFrom.getFullYear(); year <= new Date().getFullYear(); year++) {
-    const opt = document.createElement('option');
-    opt.setAttribute('value', year);
-    opt.textContent = `${year}年`;
-    monthlyTermSelector.insertBefore(opt, monthlyTermSelector.firstChild);
-}
-if (monthlyTermSelector.children.length) {
-    monthlyTermSelector.selectedIndex = 0;
-}
-
-monthlyTermSelector.addEventListener('change', function (e) {
-    let monthlyTermFrom;
-    if (e.target.selectedIndex === 0) {
-        // 今年のデータを表示する時は、直近12ヶ月を表示
-        monthlyTermFrom = subMonths(startOfMonth(new Date()), 11);
-    } else {
-        // 過去のデータを表示する時は、選択年の1〜12月を表示
-        monthlyTermFrom = new Date(e.target.value, 0, 1);
-    }
-
-    const {keys, values} = createMonthlyGraphData(monthlyTermFrom);
-
-    monthlyGraph.data.labels = keys;
-    monthlyGraph.data.datasets[0].data = values;
-    monthlyGraph.update();
-});
+createBarGraph('dow-graph', ['日', '月', '火', '水', '木', '金', '土'], graphData.dowSum);

resources/assets/sass/_bootstrap-custom.scss

@@ -0,0 +1,19 @@
+.card-img-left {
+    width: 100%;
+    @include border-left-radius($card-inner-border-radius);
+}
+
+.card-img-right {
+    width: 100%;
+    @include border-right-radius($card-inner-border-radius);
+}
+
+.card-img-top-to-left {
+    width: 100%;
+    @include media-breakpoint-down(md) {
+        @include border-top-radius($card-inner-border-radius);
+    }
+    @include media-breakpoint-up(lg) {
+        @include border-left-radius($card-inner-border-radius);
+    }
+}

resources/assets/sass/app.scss

@@ -3,6 +3,7 @@ $primary: #e53fb1;
 
 // Bootstrap
 @import "~bootstrap/scss/bootstrap";
+@import "bootstrap-custom";
 
 // Open Iconic
 @import "~open-iconic/font/css/open-iconic-bootstrap";
@@ -13,6 +14,3 @@ $primary: #e53fb1;
 // Components
 @import "components/ejaculation";
 @import "components/link-card";
-
-// Tag
-@import "tag/index";

resources/assets/sass/components/_link-card.scss

@@ -1,6 +1,4 @@
 .link-card {
-  overflow: hidden;
-
   .row > div {
     max-height: 400px;
     overflow: hidden;
@@ -30,27 +28,4 @@
   .card-text {
     white-space: pre-line;
   }
-
-  .card-spoiler-overlay {
-    position: absolute;
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    cursor: pointer;
-
-    .warning-text {
-      padding: 10px;
-      user-select: none;
-      background-color: rgba(240, 240, 240, 0.8);
-      border-radius: 5px;
-    }
-  }
-
-  .card-spoiler {
-    z-index: 1;
-    filter: blur(15px) grayscale(100%);
-  }
 }

resources/assets/sass/tag/_index.scss

@@ -1,22 +0,0 @@
-.tags {
-  & > .btn-tag {
-    width: 100%;
-
-    .tag-name {
-      display: inline-block;
-      max-width: 80%;
-      overflow: hidden;
-      line-height: 40px;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      vertical-align: middle;
-    }
-
-    .checkins-count {
-      display: inline-block;
-      line-height: 40px;
-      white-space: nowrap;
-      vertical-align: middle;
-    }
-  }
-}

resources/assets/sass/tissue.css

@@ -76,5 +76,4 @@
 
 #navbarAccountDropdownSp {
     max-width: calc(100vw - 5em);
-}
-
+}

resources/views/auth/register.blade.php

@@ -24,7 +24,6 @@
                 <div class="form-group">
                     <label for="name"><span class="oi oi-person"></span> ユーザー名</label>
                     <input id="name" name="name" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" type="text" value="{{ old('name') }}" required>
-                    <small class="form-text text-muted">半角英数字と一部記号が使用できます。一度決めたら変更できません。</small>
 
                     @if ($errors->has('name'))
                         <div class="invalid-feedback">{{ $errors->first('name') }}</div>
@@ -82,4 +81,4 @@
         </div>
     </div>
 </div>
-@endsection
+@endsection

resources/views/components/ejaculation.blade.php

@@ -19,7 +19,7 @@
 <!-- okazu link -->
 @if (!empty($ejaculation->link))
     <div class="row mx-0">
-        @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
+        @component('components.link-card', ['link' => $ejaculation->link])
         @endcomponent
         <p class="d-flex align-items-baseline mb-2 col-12 px-0">
             <span class="oi oi-link-intact mr-1"></span><a class="overflow-hidden" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">{{ $ejaculation->link }}</a>
@@ -49,8 +49,8 @@
 <div class="ejaculation-actions">
     <button type="button" class="btn btn-link text-secondary"
             data-toggle="tooltip" data-placement="bottom"
-            title="同じオカズでチェックイン" data-href="{{ $ejaculation->makeCheckinURL() }}"><span class="oi oi-reload"></span></button>
+            title="同じオカズでチェックイン" data-href="{{ route('checkin', ['link' => $ejaculation->link, 'tags' => $ejaculation->textTags()]) }}"><span class="oi oi-reload"></span></button>
     <button type="button" class="btn btn-link text-secondary like-button"
             data-toggle="tooltip" data-placement="bottom" data-trigger="hover"
             title="いいね" data-id="{{ $ejaculation->id }}" data-liked="{{ (bool)$ejaculation->is_liked }}"><span class="oi oi-heart {{ $ejaculation->is_liked ? 'text-danger' : '' }}"></span><span class="like-count">{{ $ejaculation->likes_count ? $ejaculation->likes_count : '' }}</span></button>
-</div>
+</div>

resources/views/components/link-card.blade.php

@@ -1,13 +1,8 @@
 <div class="card link-card mb-2 px-0 col-12 d-none" style="font-size: small;">
-    @if ($is_too_sensitive)
-        <div class="card-spoiler-overlay">
-            <span class="warning-text">クリックまたはタップで表示</span>
-        </div>
-    @endif
-    <a class="text-dark card-link {{ $is_too_sensitive ? 'card-spoiler' : '' }}" href="{{ $link }}" target="_blank" rel="noopener">
+    <a class="text-dark card-link" href="{{ $link }}" target="_blank" rel="noopener">
         <div class="row no-gutters">
             <div class="col-12 col-md-6 justify-content-center align-items-center">
-                <img src="" alt="Thumbnail" class="w-100 bg-secondary">
+                <img src="" alt="Thumbnail" class="card-img-top-to-left bg-secondary">
             </div>
             <div class="col-12 col-md-6">
                 <div class="card-body">

resources/views/ejaculation/checkin.blade.php

@@ -67,8 +67,8 @@
                 <div class="form-row">
                     <div class="form-group col-sm-12">
                         <label for="note"><span class="oi oi-comment-square"></span> ノート</label>
-                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4" v-on:input="onChangeNote">{{ old('note') ?? $defaults['note'] }}</textarea>
-                        <small id="note-character-counter" class="form-text text-muted">
+                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4">{{ old('note') ?? $defaults['note'] }}</textarea>
+                        <small class="form-text text-muted">
                             最大 500 文字
                         </small>
                         @if ($errors->has('note'))
@@ -85,12 +85,6 @@
                             <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
                             </label>
                         </div>
-                        <div class="custom-control custom-checkbox mb-3">
-                            <input id="isTooSensitive" name="is_too_sensitive" type="checkbox" class="custom-control-input" {{ old('is_too_sensitive') || $defaults['is_too_sensitive'] ? 'checked' : '' }}>
-                            <label class="custom-control-label" for="isTooSensitive">
-                            <span class="oi oi-warning"></span> チェックイン対象のオカズをより過激なオカズとして設定する
-                            </label>
-                        </div>
                     </div>
                 </div>
 

resources/views/ejaculation/edit.blade.php

@@ -68,8 +68,8 @@
                 <div class="form-row">
                     <div class="form-group col-sm-12">
                         <label for="note"><span class="oi oi-comment-square"></span> ノート</label>
-                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4" v-on:input="onChangeNote">{{ old('note') ?? $ejaculation->note }}</textarea>
-                        <small id="note-character-counter" class="form-text text-muted">
+                        <textarea id="note" name="note" class="form-control {{ $errors->has('note') ? ' is-invalid' : '' }}" rows="4">{{ old('note') ?? $ejaculation->note }}</textarea>
+                        <small class="form-text text-muted">
                             最大 500 文字
                         </small>
                         @if ($errors->has('note'))
@@ -86,12 +86,6 @@
                             <span class="oi oi-lock-locked"></span> このチェックインを非公開にする
                             </label>
                         </div>
-                        <div class="custom-control custom-checkbox mb-3">
-                            <input id="isTooSensitive" name="is_too_sensitive" type="checkbox" class="custom-control-input" {{ (is_bool(old('is_too_sensitive')) ? old('is_too_sensitive') : $ejaculation->is_too_sensitive) ? 'checked' : '' }}>
-                            <label class="custom-control-label" for="isTooSensitive">
-                            <span class="oi oi-warning"></span> チェックイン対象のオカズをより過激なオカズとして設定する
-                            </label>
-                        </div>
                     </div>
                 </div>
 

resources/views/ejaculation/show.blade.php

@@ -47,7 +47,7 @@
                         <!-- okazu link -->
                         @if (!empty($ejaculation->link))
                             <div class="row mx-0">
-                                @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
+                                @component('components.link-card', ['link' => $ejaculation->link])
                                 @endcomponent
                                 <p class="d-flex align-items-baseline mb-2 col-12 px-0">
                                     <span class="oi oi-link-intact mr-1"></span><a class="overflow-hidden" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">{{ $ejaculation->link }}</a>
@@ -75,7 +75,7 @@
                         @endif
                         <!-- actions -->
                         <div class="ejaculation-actions">
-                            <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン" data-href="{{ $ejaculation->makeCheckinURL() }}"><span class="oi oi-reload"></span></button>
+                            <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン" data-href="{{ route('checkin', ['link' => $ejaculation->link, 'tags' => $ejaculation->textTags()]) }}"><span class="oi oi-reload"></span></button>
                             <button type="button" class="btn btn-link text-secondary like-button" data-toggle="tooltip" data-placement="bottom" data-trigger="hover" title="いいね" data-id="{{ $ejaculation->id }}" data-liked="{{ (bool)$ejaculation->is_liked }}"><span class="oi oi-heart {{ $ejaculation->is_liked ? 'text-danger' : '' }}"></span><span class="like-count">{{ $ejaculation->likes_count ? $ejaculation->likes_count : '' }}</span></button>
                             @if ($user->isMe())
                                 <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="修正" data-href="{{ route('checkin.edit', ['id' => $ejaculation->id]) }}"><span class="oi oi-pencil"></span></button>

resources/views/layouts/base.blade.php

@@ -54,9 +54,6 @@
                         <a href="{{ route('user.likes', ['name' => Auth::user()->name]) }}" class="dropdown-item">いいね</a>
                         <div class="dropdown-divider"></div>
                         <a href="{{ route('setting') }}" class="dropdown-item">設定</a>
-                        @can ('admin')
-                            <a href="{{ route('admin.dashboard') }}" class="dropdown-item">管理</a>
-                        @endcan
                         <a href="{{ route('logout') }}" class="dropdown-item" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">ログアウト</a>
                     </div>
                 </div>
@@ -82,9 +79,6 @@
                         <li class="nav-item {{ stripos(Route::currentRouteName(), 'user.okazu') === 0 ? 'active' : ''}}">
                             <a class="nav-link" href="{{ route('user.okazu', ['name' => Auth::user()->name]) }}">オカズ</a>
                         </li>
-                        <li class="nav-item {{ stripos(Route::currentRouteName(), 'tag') === 0 ? 'active' : ''}}">
-                            <a class="nav-link" href="{{ route('tag') }}">タグ一覧</a>
-                        </li>
                         {{--<li class="nav-item">
                             <a class="nav-link" href="{{ route('ranking') }}">ランキング</a>
                         </li>--}}
@@ -143,13 +137,6 @@
                             <a class="btn btn-{{ stripos(Route::currentRouteName(), 'user.okazu') === 0 ? 'primary' : 'outline-secondary'}}" href="{{ route('user.okazu', ['name' => Auth::user()->name]) }}" role="button">オカズ</a>
                         </div>
                     </div>
-                    <div class="row mt-2">
-                        <div class="col">
-                            <a class="btn btn-{{ stripos(Route::currentRouteName(), 'tag') === 0 ? 'primary' : 'outline-secondary'}}" href="{{ route('tag') }}" role="button">タグ一覧</a>
-                        </div>
-                        <div class="col">
-                        </div>
-                    </div>
                     {{-- <div class="row mt-2">
                         <div class="col">
                             <a class="btn btn-outline-secondary" href="{{ route('ranking') }}">ランキング</a>

resources/views/setting/profile.blade.php

@@ -29,15 +29,12 @@
                 </div>
                 <input id="name" name="name" type="text" class="form-control" value="{{ Auth::user()->name }}" disabled>
             </div>
-            <small class="form-text text-muted">変更することはできません。</small>
+            <small class="form-text text-muted">現在は変更できません。</small>
         </div>
         <div class="from-group mt-3">
-            <label for="email">メールアドレス</label>
-            <input id="email" name="email" type="email" class="form-control {{ $errors->has('email') ? ' is-invalid' : '' }}" value="{{ old('email') ?? Auth::user()->email }}">
-
-            @if ($errors->has('email'))
-                <div class="invalid-feedback">{{ $errors->first('email') }}</div>
-            @endif
+            <label for="name">メールアドレス</label>
+            <input id="name" name="name" type="text" class="form-control" value="{{ Auth::user()->email }}" disabled>
+            <small class="form-text text-muted">現在は変更できません。</small>
         </div>
         <div class="form-group mt-3">
             <label for="bio">自己紹介</label>

resources/views/tag/index.blade.php

@@ -1,20 +0,0 @@
-@extends('layouts.base')
-
-@section('title', 'タグ一覧')
-
-@section('content')
-    <div class="container pb-1">
-        <h2 class="mb-3">タグ一覧</h2>
-        <p class="text-secondary">公開チェックインに付けられているタグを、チェックイン数の多い順で表示しています。</p>
-        <div class="container-fluid">
-            <div class="row mx-1">
-                @foreach($tags as $tag)
-                    <div class="col-12 col-lg-6 col-xl-3 py-3 text-break tags">
-                        <a href="{{ route('search', ['q' => $tag->name]) }}" class="btn btn-outline-primary btn-tag" title="{{ $tag->name }}"><span class="tag-name">{{ $tag->name }}</span> <span class="checkins-count">({{ $tag->checkins_count }})</span></a>
-                    </div>
-                @endforeach
-            </div>
-            {{ $tags->links(null, ['className' => 'mt-4 justify-content-center']) }}
-        </div>
-    </div>
-@endsection

resources/views/user/profile.blade.php

@@ -53,7 +53,7 @@
                 <!-- okazu link -->
                 @if (!empty($ejaculation->link))
                     <div class="row mx-0">
-                        @component('components.link-card', ['link' => $ejaculation->link, 'is_too_sensitive' => $ejaculation->is_too_sensitive])
+                        @component('components.link-card', ['link' => $ejaculation->link])
                         @endcomponent
                         <p class="d-flex align-items-baseline mb-2 col-12 px-0">
                             <span class="oi oi-link-intact mr-1"></span><a class="overflow-hidden" href="{{ $ejaculation->link }}" target="_blank" rel="noopener">{{ $ejaculation->link }}</a>
@@ -81,7 +81,7 @@
                 @endif
                 <!-- actions -->
                 <div class="ejaculation-actions">
-                    <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン" data-href="{{ $ejaculation->makeCheckinURL() }}"><span class="oi oi-reload"></span></button>
+                    <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="同じオカズでチェックイン" data-href="{{ route('checkin', ['link' => $ejaculation->link, 'tags' => $ejaculation->textTags()]) }}"><span class="oi oi-reload"></span></button>
                     <button type="button" class="btn btn-link text-secondary like-button" data-toggle="tooltip" data-placement="bottom" data-trigger="hover" title="いいね" data-id="{{ $ejaculation->id }}" data-liked="{{ (bool)$ejaculation->is_liked }}"><span class="oi oi-heart {{ $ejaculation->is_liked ? 'text-danger' : '' }}"></span><span class="like-count">{{ $ejaculation->likes_count ? $ejaculation->likes_count : '' }}</span></button>
                     @if ($user->isMe())
                         <button type="button" class="btn btn-link text-secondary" data-toggle="tooltip" data-placement="bottom" title="修正" data-href="{{ route('checkin.edit', ['id' => $ejaculation->id]) }}"><span class="oi oi-pencil"></span></button>

resources/views/user/stats.blade.php

@@ -15,14 +15,7 @@
     <h5 class="my-4">Shikontribution graph</h5>
     <div id="cal-heatmap" class="tis-contribution-graph"></div>
     <hr class="my-4">
-    <div class="row my-4">
-        <div class="col-12 col-lg-6 d-flex align-items-center">
-            <h5 class="my-0">月間チェックイン回数</h5>
-        </div>
-        <div class="col-12 col-lg-6 mt-2 mt-lg-0">
-            <select id="monthly-term" class="form-control"></select>
-        </div>
-    </div>
+    <h5 class="my-4">月間チェックイン回数</h5>
     <canvas id="monthly-graph" class="w-100"></canvas>
     <hr class="my-4">
     <h5 class="my-4">年間チェックイン回数</h5>

routes/web.php

@@ -46,8 +46,6 @@ Route::redirect('/search', '/search/checkin', 301);
 Route::get('/search/checkin', 'SearchController@index')->name('search');
 Route::get('/search/related-tag', 'SearchController@relatedTag')->name('search.related-tag');
 
-Route::get('/tag', 'TagController@index')->name('tag');
-
 Route::middleware('can:admin')
     ->namespace('Admin')
     ->prefix('admin')

tests/MyAsserts.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace Tests;
-
-trait MyAsserts
-{
-    /**
-     * assertArraySubset()がdeprecatedって本当ですか？ 配列の中に所定の値が全て含まれていることを検証します。
-     * @param array $expected
-     * @param array $actual
-     * @param string $message
-     */
-    public function assertArrayContains(array $expected, array $actual, string $message = '')
-    {
-        $this->assertSame($expected, array_intersect($actual, $expected), $message);
-    }
-}

tests/Unit/MetadataResolver/CienResolverTest.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\CienResolver;
-use Tests\TestCase;
-
-class CienResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function test()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Cien/test.html');
-
-        $this->createResolver(CienResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ci-en.dlsite.com/creator/2462/article/87502');
-        $this->assertSame('進捗とボツ立ち絵', $metadata->title);
-        $this->assertSame('ドット製２D ACTを製作しています。' . PHP_EOL . '恐ろしい存在に襲われる絶望感や、被虐的な官能がテーマです。', $metadata->description);
-        $this->assertStringStartsWith('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?px-time=', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://media.ci-en.jp/private/attachment/creator/00002462/a7afd3b02a6d1caa6afe6a3bf5550fb6a42aefba686f17a0a2f63c97fd6867ab/image-800.jpg?px-time=1568231879&px-hash=70c57e9a73d5afb4ac5363d1f37a851af8e0cb1f', $metadata->image);
-            $this->assertSame(1568235479, $metadata->expires_at->timestamp);
-            $this->assertSame('https://ci-en.dlsite.com/creator/2462/article/87502', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testWithNoTimestamp()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Cien/testWithNoTimestamp.html');
-        $this->createResolver(CienResolver::class, $responseText);
-
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('Parameter "px-time" not found. Image=https://ci-en.dlsite.com/assets/img/common/logo_Ci-en_R18.svg Source=https://ci-en.dlsite.com/');
-
-        $this->resolver->resolve('https://ci-en.dlsite.com/');
-    }
-}

tests/Unit/MetadataResolver/CreateMockedResolver.php

@@ -5,7 +5,6 @@ namespace Tests\Unit\MetadataResolver;
 use App\MetadataResolver\Resolver;
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
-use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use Monolog\Handler\AbstractHandler;
 
@@ -42,7 +41,7 @@ trait CreateMockedResolver
 
         $mockResponse = new Response($status, $headers, $responseText);
         $this->handler = new MockHandler([$mockResponse]);
-        $client = new Client(['handler' => HandlerStack::create($this->handler)]);
+        $client = new Client(['handler' => $this->handler]);
         $this->resolver = app()->make($resolverClass, ['client' => $client]);
 
         return $this->resolver;

tests/Unit/MetadataResolver/DLsiteResolverTest.php

@@ -44,7 +44,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('ことのはアムリラート', $metadata->title);
         $this->assertEquals('メーカー名: SukeraSparo' . PHP_EOL . '異世界へと迷い込んだ凜に救いの手を差し伸べるルカ――。これは、ふたりが手探りの意思疎通（ことのは）で織りなす、もどかしくも純粋な……女の子同士の物語。', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/professional/VJ012000/VJ011276_img_main.jpg', $metadata->image);
-        $this->assertEquals(['日常/生活', '純愛', '百合', '少女'], $metadata->tags);
+        $this->assertEquals(['少女', '日常/生活', '純愛', '百合'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/soft/work/=/product_id/VJ011276.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -60,7 +60,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('快楽ヒストリエ', $metadata->title);
         $this->assertEquals('著者: 火鳥' . PHP_EOL . '天地創造と原初の人類を描いた「創世編」をはじめ、英雄たちの偉業を大真面目に考証した正真正銘の学術コミック全15編。', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ139000/BJ138581_img_main.jpg', $metadata->image);
-        $this->assertEquals(['おっぱい', '青年コミック', 'ギャグ', 'コメディ', '歴史/時代物', 'ロリ', 'ショタ', '妹', '男性/おやじ', '女王様/お姫様', '王子様/王子系', '戦士', 'セーラー服', '着物/和服', '褐色/日焼け', '爺'], $metadata->tags);
+        $this->assertEquals(['おっぱい', 'ロリ', 'ショタ', '妹', '男性/おやじ', '女王様/お姫様', '王子様/王子系', '戦士', 'セーラー服', '着物/和服', '青年コミック', 'ギャグ', 'コメディ', '歴史/時代物', '褐色/日焼け', '爺'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/comic/work/=/product_id/BJ138581.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -76,7 +76,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('催眠術で新婚人妻マナカさんとエッチしよう', $metadata->title);
         $this->assertEquals('サークル名: デルタブレード' . PHP_EOL . '催眠術で新婚人妻マナカさんの愛する夫にすり替わって子作りラブラブエッチをするCG集です。', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ206000/RJ205445_img_main.jpg', $metadata->image);
-        $this->assertEquals(['断面図', '中出し', '妊娠/孕ませ', '催眠', '口内射精', '人妻'], $metadata->tags);
+        $this->assertEquals(['断面図', '人妻', '中出し', '妊娠/孕ませ', '催眠', '口内射精'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/maniax/work/=/product_id/RJ205445.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -92,7 +92,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('euphoria （HDリマスター） Best Price版', $metadata->title);
         $this->assertEquals('ブランド名: CLOCK UP' . PHP_EOL . 'インモラルハードコアADV「euphoria」が高解像度（1024×768）版、「euphoria HDリマスター」となって登場！', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/professional/VJ009000/VJ008455_img_main.jpg', $metadata->image);
-        $this->assertEquals(['アブノーマル', 'アヘ顔', '退廃/背徳/インモラル', '拘束', '強制/無理矢理', 'スカトロ', '幼なじみ', '女教師', '拷問', '血液/流血', '狂気'], $metadata->tags);
+        $this->assertEquals(['アブノーマル', '幼なじみ', '女教師', '退廃/背徳/インモラル', '拘束', '強制/無理矢理', 'スカトロ', 'アヘ顔', '拷問', '血液/流血', '狂気'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/pro/work/=/product_id/VJ008455.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -106,9 +106,9 @@ class DLsiteResolverTest extends TestCase
 
         $metadata = $this->resolver->resolve('https://www.dlsite.com/books/work/=/product_id/BJ191317.html');
         $this->assertEquals('永遠娘 vol.6', $metadata->title);
-        $this->assertEquals('著者: あまがえる / 玉之けだま / びんせん / 甘露アメ / 源五郎 / すみやお / 宇宙烏賊 / 毒茸人 / あやね / ガロウド / ハードボイルドよし子 / 夜歌 / 黒青郎君' . PHP_EOL . '君の命はどんな味なのだろうな?', $metadata->description);
+        $this->assertEquals('著者: あまがえる / 玉之けだま / びんせん / 甘露アメ / 源五郎 / すみやお / 宇宙烏賊 / 毒茸人 / あやね / ガロウド / ハードボイルドよし子 / 夜歌 / 黒青郎君' . PHP_EOL . '君の命はどんな味なのだろうな?', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ192000/BJ191317_img_main.jpg', $metadata->image);
-        $this->assertEquals(['アヘ顔', 'ファンタジー', 'ぶっかけ', '中出し', '近親相姦', '口内射精', 'ツンデレ', 'ロリ', '妖怪', '人外娘/モンスター娘', 'セーラー服', 'メイド', 'ストッキング'], $metadata->tags);
+        $this->assertEquals(['ツンデレ', 'ロリ', '妖怪', '人外娘/モンスター娘', 'セーラー服', 'メイド', 'ストッキング', 'ファンタジー', 'ぶっかけ', '中出し', '近親相姦', 'アヘ顔', '口内射精'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/books/work/=/product_id/BJ191317.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -124,7 +124,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('体イク教師', $metadata->title);
         $this->assertEquals('サークル名: Dusk' . PHP_EOL . '思い込みの激しい体育教師に執着されるお話', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ218000/RJ217995_img_main.jpg', $metadata->image);
-        $this->assertEquals(['中出し', '陵辱', '変態', '強制/無理矢理', 'レイプ', '教師'], $metadata->tags);
+        $this->assertEquals(['教師', '中出し', '陵辱', '変態', '強制/無理矢理', 'レイプ'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/girls/work/=/product_id/RJ217995.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -140,7 +140,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('×××レクチャー', $metadata->title);
         $this->assertEquals('著者: 江口尋' . PHP_EOL . '昔、告白してくれた地味な同級生・瀬尾は超人気セクシー男優になっていて!?', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ171000/BJ170641_img_main.jpg', $metadata->image);
-        $this->assertEquals(['ラブコメ', 'ラブラブ/あまあま', 'ティーンズラブ', '調教', 'メガネ', '芸能人/アイドル/モデル', '俺様', '褐色/日焼け'], $metadata->tags);
+        $this->assertEquals(['メガネ', '芸能人/アイドル/モデル', '俺様', 'ラブコメ', 'ラブラブ/あまあま', 'ティーンズラブ', '調教', '褐色/日焼け'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/girls-pro/work/=/product_id/BJ170641.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -156,7 +156,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('秘密に堕つ', $metadata->title);
         $this->assertEquals('サークル名: ナゲットぶん投げ屋さん' . PHP_EOL . 'とある村に越してきた新婚夫婦。村の集会所で行われた歓迎会で犯される花婿。村の男達に犯され続けた花婿にある変化が…?', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ245000/RJ244977_img_main.jpg', $metadata->image);
-        $this->assertEquals(['中出し', '強制/無理矢理', 'レイプ', 'モブ姦', '既婚者'], $metadata->tags);
+        $this->assertEquals(['既婚者', '中出し', '強制/無理矢理', 'レイプ', 'モブ姦'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/bl/work/=/product_id/RJ244977.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -172,7 +172,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]', $metadata->title);
         $this->assertEquals('Circle: Triangle!' . PHP_EOL . 'You go with a girl of your first love and enjoy going to haunted places and her massage, ear cleaning, sleep sharing etc. (CV: Yui Asami)', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ229000/RJ228866_img_main.jpg', $metadata->image);
-        $this->assertEquals(['Healing', 'Binaural', 'ASMR', 'Ear Cleaning', 'Lovey Dovey/Sweet Love', 'Childhood Friend'], $metadata->tags);
+        $this->assertEquals(['Healing', 'Binaural', 'ASMR', 'Childhood Friend', 'Ear Cleaning', 'Romance'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/eng/work/=/product_id/RE228866.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -188,7 +188,7 @@ class DLsiteResolverTest extends TestCase
         $this->assertEquals('NEKOPARA vol.1', $metadata->title);
         $this->assertEquals('Circle: NEKO WORKs' . PHP_EOL . 'Chocolat and Vanilla star in a rich adult eroge series with E-mote system and animated H scenes', $metadata->description);
         $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ145000/RJ144678_img_main.jpg', $metadata->image);
-        $this->assertEquals(['Moe', 'Love Comedy/Romcom', 'Master and Servant', 'Nekomimi (Cat Ears)'], $metadata->tags);
+        $this->assertEquals(['Moe', 'Master and Servant', 'Funny Love Story', 'Nekomimi (Cat Ears)'], $metadata->tags);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://www.dlsite.com/ecchi-eng/work/=/product_id/RE144678.html', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -196,8 +196,7 @@ class DLsiteResolverTest extends TestCase
 
     public function testSPLink()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
-        // SP版（touch）のURLのテストだがリゾルバ側でURLから-touchを削除してPC版を取得するので、PC版の内容を使用する
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testSPLink.html');
 
         $this->createResolver(DLsiteResolver::class, $responseText);
 
@@ -213,7 +212,7 @@ class DLsiteResolverTest extends TestCase
 
     public function testShortLink()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testShortLink.html');
 
         $this->createResolver(DLsiteResolver::class, $responseText);
 
@@ -226,94 +225,4 @@ class DLsiteResolverTest extends TestCase
             $this->assertSame('https://dlsite.jp/howtw/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
         }
     }
-
-    public function testOldAffiliateLink()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
-
-        $this->createResolver(DLsiteResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.dlsite.com/home/dlaf/=/link/work/aid/eai04191/id/RJ221761.html');
-        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
-        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
-        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testSnsAffiliateLink()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
-
-        $this->createResolver(DLsiteResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.dlsite.com/home/dlaf/=/t/s/link/work/aid/eai04191/id/RJ221761.html');
-        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
-        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
-        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testAffiliateLink()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
-
-        $this->createResolver(DLsiteResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.dlsite.com/home/dlaf/=/t/t/link/work/aid/eai04191/id/RJ221761.html');
-        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
-        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
-        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testAffiliateUrl()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHome.html');
-
-        $this->createResolver(DLsiteResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('http://www.dlsite.com/home/dlaf/=/aid/eai04191/url/https%3A%2F%2Fwww.dlsite.com%2Fhome%2Fwork%2F=%2Fproduct_id%2FRJ221761.html');
-        $this->assertEquals('ひつじ、数えてあげるっ', $metadata->title);
-        $this->assertEquals('サークル名: Butterfly Dream' . PHP_EOL . '眠れないあなたに彼女が羊を数えてくれる音声です。', $metadata->description);
-        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/doujin/RJ222000/RJ221761_img_main.jpg', $metadata->image);
-        $this->assertEquals(['癒し', 'バイノーラル/ダミヘ', '日常/生活', 'ほのぼの', '恋人同士'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.dlsite.com/home/work/=/product_id/RJ221761.html', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testAffiliateBadUrl()
-    {
-        $this->createResolver(DLsiteResolver::class, '');
-
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('アフィリエイト先のリンクがDLsiteのタイトルではありません: https://www.dlsite.com/home/');
-
-        $this->resolver->resolve('http://www.dlsite.com/home/dlaf/=/aid/eai04191/url/https%3A%2F%2Fwww.dlsite.com%2Fhome%2F');
-    }
-
-    public function testHTMLdescription()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DLsite/testHTMLdescription.html');
-
-        $this->createResolver(DLsiteResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.dlsite.com/books/work/=/product_id/BJ123822.html');
-        $this->assertEquals('獣○彼女カタログ', $metadata->title);
-        $this->assertEquals('著者: チキコ / MUJIN編集部' . PHP_EOL . '【DLsite.com独占販売】 エロ漫画界騒然、1冊まるごと獣○オンリー単行本! 人間チ×ポは出てきませんっ!!', $metadata->description);
-        $this->assertEquals('https://img.dlsite.jp/modpub/images2/work/books/BJ124000/BJ123822_img_main.jpg', $metadata->image);
-        $this->assertEquals(['断面図', '中出し', 'フェラチオ', '複数プレイ/乱交', '異種姦', '制服', '水着', 'メイド', '巫女', '軍服', '巨乳/爆乳', '処女', '褐色/日焼け'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.dlsite.com/books/work/=/product_id/BJ123822.html', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
 }

tests/Unit/MetadataResolver/DeviantArtResolverTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\DeviantArtResolver;
-use Tests\TestCase;
-
-class DeviantArtResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function testMature()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/DeviantArt/mature.json');
-
-        $this->createResolver(DeviantArtResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.deviantart.com/gatanii69/art/R-15-mabel-and-will-update-686016962');
-        $this->assertSame('R-15 mabel and will update', $metadata->title);
-        $this->assertSame('By gatanii69', $metadata->description);
-        $this->assertStringStartsWith('https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/6854f36d-8010-4cd0-9d62-0cf9b7829764/dbcfq2q-d78c9f6e-dced-4e5c-a345-2a1bfd5d7620.jpg', $metadata->image);
-        $this->assertSame(['nsfw', 'reversefalls', 'gravityfalls', 'gravityfallsfanart', 'mabelpines', 'billcipher', 'reversemabel', 'willcipher', 'reversebill', 'reversebillcipher', 'mawill'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://backend.deviantart.com/oembed?url=https://www.deviantart.com/gatanii69/art/R-15-mabel-and-will-update-686016962', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/FantiaResolverTest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\FantiaResolver;
-use Tests\TestCase;
-
-class FantiaResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function test()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Fantia/test.json');
-
-        $this->createResolver(FantiaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://fantia.jp/posts/206561');
-        $this->assertSame('召喚士アルドラ', $metadata->title);
-        $this->assertSame('サークル: サークルぬるま湯 (ナナナナ)' . PHP_EOL . 'コミッション' . PHP_EOL . 'クイーンズブレイドリベリオンの召喚士アルドラです。', $metadata->description);
-        $this->assertSame('https://c.fantia.jp/uploads/post/file/206561/main_dbcc59e5-4090-4650-b969-8855a721c6a5.jpg', $metadata->image);
-        $this->assertSame(['ふたなり', '超乳', '超根', 'クイーンズブレイド', 'ナナナナ'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://fantia.jp/api/v1/posts/206561', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/FanzaResolverTest.php

@@ -1,101 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\FanzaResolver;
-use Tests\TestCase;
-
-class FanzaResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    /**
-     * @dataProvider provider
-     */
-    public function test($filename, $url, $title, $description, $image, $tags)
-    {
-        $responseText = file_get_contents(__DIR__ . "/../../fixture/Fanza/{$filename}");
-
-        $this->createResolver(FanzaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve($url);
-        $this->assertSame($title, $metadata->title);
-        $this->assertSame($description, $metadata->description);
-        $this->assertSame($image, $metadata->image);
-        $this->assertSame($tags, $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame($url, (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function provider()
-    {
-        return [
-            '動画 digital/videoa' => [
-                'digital_videoa.html',
-                'https://www.dmm.co.jp/digital/videoa/-/detail/=/cid=ssni00558/',
-                '巨乳姉妹2人とただひたすらセックスに明け暮れた両親不在の3日間',
-                '「お姉ちゃんもヤりなよ。すごい気持ちいいよ、セックス」ボクには父親が再婚してできた義理の妹たちがいる。名前はみはるとしおん。ある週末、父と母が外出して家を空けると、僕と妹たちの関係が大きく変わった。姉のみはるの前で妹のしおんと肉体関係を持つとそのままみはるともSEX。そして僕たちは両親がいない3日間、ただただSEXを楽しんだんだ。※ 配信方法によって収録内容が異なる場合があります。',
-                'https://pics.dmm.co.jp/digital/video/ssni00558/ssni00558pl.jpg',
-                ['夕美しおん', '羽咲みはる', '朝霧浄', 'エスワン_ナンバーワンスタイル', 'S1_NO.1_STYLE', 'ハイビジョン', '独占配信', '制服', 'ドラマ', '巨乳', '美少女', 'ギリモザ', '姉・妹']
-            ],
-            '素人動画 digital/videoc' => [
-                'digital_videoc.html',
-                'https://www.dmm.co.jp/digital/videoc/-/detail/=/cid=sweet015/',
-                'ねる',
-                '鉄板オナ素材的ハイシコリティ！もうサンプルは見ていただけましたか！？そうなんです！非の打ち所まるで無し！恋するキラッキラの瞳！愛嬌抜群の純真笑顔！Gカップ巨乳にむっちむちの恵体！モザイク越しにも伝わってしまう雑誌グラビア級の美少女ルックス！このスペックなのに自分に自信が持てない系のウブっ子！触れただけで濡れだす敏感ボディ！ねっとりDキスから嬉しそうに大量唾液をゴク飲みする程度には恋愛洗脳済み！溢れ出るガマン汁を丁寧に舐めとるラブいフェラ！ビックビク痙攣しながら困り顔で何度も何度も連続イキ絶頂！※ 配信方法によって収録内容が異なる場合があります。' . PHP_EOL . '特集：' . PHP_EOL . PHP_EOL . 'FANZAオリジナル『素人ホイホイZ/素人ホイホイsweet！』',
-                'https://pics.dmm.co.jp/digital/amateur/sweet015/sweet015jp.jpg',
-                ['素人ホイホイsweet！', '独占配信', '巨乳', '制服', '清楚', '美少女', '女子校生', 'ハイビジョン']
-            ],
-            'アニメ digital/anime' => [
-                'digital_anime.html',
-                'https://www.dmm.co.jp/digital/anime/-/detail/=/cid=h_1379jdxa57513/',
-                '性活週間 THE ANIMATION 第1巻',
-                'めちゃシコ美少女マスター・みちきんぐの初単行本が' . PHP_EOL . '『ヌーディストビーチに修学旅行で？』『リアルエロゲシチュエーション』など' . PHP_EOL . '大ヒットシリーズを手掛けたアダルトアニメ界の新進気鋭クリエイター' . PHP_EOL . '「小原和大」によって待望のOVA化！' . PHP_EOL . '私と姉体験してみない？' . PHP_EOL . '（c）2019 みちきんぐ/GOT/ピンクパイナップル※ 配信方法によって収録内容が異なる場合があります。',
-                'https://pics.dmm.co.jp/digital/video/h_1379jdxa57513/h_1379jdxa57513pl.jpg',
-                ['性活週間_THE_ANIMATION', 'ピンクパイナップル', 'Pink_Pineapple', 'ハイビジョン', '中出し', 'フェラ', '巨乳', '姉・妹']
-            ],
-            '同人' => [
-                'doujin.html',
-                'https://www.dmm.co.jp/dc/doujin/-/detail/=/cid=d_115139/',
-                '美少女拉致って性教育',
-                'ハ○エースでおさげ髪美少女を拉致って、凌辱する内容です。' . PHP_EOL . '汚っさん×美少女モノ。' . PHP_EOL . '表紙込み総ページ数28p（内本文27p）' . PHP_EOL . '表紙大きさ1200×1719' . PHP_EOL . '本文大きさ1200×1694',
-                'https://doujin-assets.dmm.co.jp/digital/comic/d_115139/d_115139pr.jpg',
-                ['美少女拉致って性教育', 'オリジナル', '制服', '男性向け', 'ミニ系', '少女', '屋外', '中出し', '成人向け', 'みくろぺえじ'],
-            ],
-            '電子書籍' => [
-                'book.html',
-                'https://book.dmm.co.jp/detail/b104atint00313/',
-                '少女×少女×少女',
-                '少女達が乱舞する…！' . PHP_EOL . '天上家。俺が捨てたあの家…祭子から「母が亡くなった」と電話を受けて、俺は妹達を救うために帰って行くが…。そこで待っていたのは、運命に逆らえず妹達との果てしなき乱交の宴だった…。' . PHP_EOL . '透明感溢れる魅力的なキャラクター、緻密に描きこまれた世界、そしてそのスタイルからは想像できないハードかつ長大なエロ描写！赤月みゅうとのセカンド単行本。',
-                'https://ebook-assets.dmm.co.jp/digital/e-book/b104atint00313/b104atint00313pl.jpg',
-                ['赤月みゅうと', 'MUJIN編集部', '少女×少女×少女', 'MUJIN_COMICS', 'ティーアイネット', 'アダルトコミック単行本', '単行本', '美少女', '中出し', '3P・4P', 'ハーレム']
-            ],
-            'PCゲーム' => [
-                'dlsoft.html',
-                'https://dlsoft.dmm.co.jp/detail/views_0630/',
-                '姫と穢欲のサクリファイス',
-                'ソリデ国――国家間戦争に勝利し発展した大国は、一人の男によって襲撃される。国王に強い恨みを抱き、復讐のために行動を起こした主人公・カルドは使役している‘‘悪魔’’の力を借りて城を掌握。国政や国民には興味を示さず、国王への復讐として悪魔達の能力を使って王女・フィアナへの調教を開始する。',
-                'https://pics.dmm.co.jp/digital/pcgame/views_0630/views_0630pl.jpg',
-                ['B-銀河', '遊丸', '瑠奈璃亜', 'はっとりまさき', '蒼瀬', '木下じゃっく', '御導はるか', '薄迷', '犬童飛沫', '星天誠', '紅ぴえろ', 'エスクード', 'お姫様', '辱め', 'デモ・体験版あり', 'ファンタジー']
-            ],
-            '未対応' => [
-                'nosupport.html',
-                'http://www.dmm.co.jp/ppm/video/-/detail/=/cid=h_275tdsu00032/',
-                '素人のお姉さん！！「チ○ポを洗う」お仕事してみませんか？ 2',
-                'パーツモデルの募集と思い面接に訪れた素人娘達に、初めての『チ●ポ』を洗うお仕事してもらいました！『エッチとかじゃなくて…洗うだけなら…』自らに言い聞かせる様に出演承諾した彼女...',
-                'http://pics.dmm.co.jp/digital/video/h_275tdsu00032/h_275tdsu00032pl.jpg',
-                []
-            ]
-        ];
-    }
-}

tests/Unit/MetadataResolver/IwaraResolverTest.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\IwaraResolver;
-use Tests\TestCase;
-
-class IwaraResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function testVideo()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Iwara/video.html');
-
-        $this->createResolver(IwaraResolver::class, $responseText);
-
-        $url = 'https://ecchi.iwara.tv/videos/wqlwatgmvhqg40kg';
-        $metadata = $this->resolver->resolve($url);
-        $this->assertEquals('Cakeface【鈴谷、プリンツ】', $metadata->title);
-        $this->assertEquals('投稿者: kuro@vov' . PHP_EOL . 'Thank you for watching!いつもありがとうございます' . PHP_EOL . 'こっそり微修正…' . PHP_EOL . 'Model：鈴谷&プリンツ　つみだんご様　罪袋：BCD様' . PHP_EOL . '（いずれも改変）クレジット漏れゴメンナサイ。。。' . PHP_EOL, $metadata->description);
-        $this->assertEquals(['KanColle', 'kuro@vov'], $metadata->tags);
-        $this->assertEquals('https://i.iwara.tv/sites/default/files/videos/thumbnails/238591/thumbnail-238591_0004.jpg', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame($url, (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testYouTube()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Iwara/youtube.html');
-
-        $this->createResolver(IwaraResolver::class, $responseText);
-
-        $url = 'https://iwara.tv/videos/z4dn6fag4iko08o0';
-        $metadata = $this->resolver->resolve($url);
-        $this->assertEquals('むちむち天龍ちゃんで君色に染まる', $metadata->title);
-        $this->assertEquals('投稿者: kochira' . PHP_EOL . 'Ray-cast test. Still trying to figure out how Ray-cast works so I\'m sorry if anything looks off.' . PHP_EOL . 'Unauthorized reproduction prohibited (無断転載は禁止です／未經授權禁止複製)' . PHP_EOL, $metadata->description);
-        $this->assertEquals(['KanColle', 'kochira'], $metadata->tags);
-        $this->assertEquals('https://img.youtube.com/vi/pvA5Db082yo/maxresdefault.jpg', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame($url, (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testImages()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Iwara/images.html');
-
-        $this->createResolver(IwaraResolver::class, $responseText);
-
-        $url = 'https://iwara.tv/images/%E9%8F%A1%E9%9F%B3%E3%82%8A%E3%82%9318%E6%AD%B3';
-        $metadata = $this->resolver->resolve($url);
-        $this->assertEquals('鏡音りん18歳', $metadata->title);
-        $this->assertEquals('投稿者: Tonjiru Lion' . PHP_EOL . '今回はあんまエロくないです。' . PHP_EOL, $metadata->description);
-        $this->assertEquals(['Vocaloid', 'Tonjiru Lion'], $metadata->tags);
-        $this->assertEquals('https://i.iwara.tv/sites/default/files/photos/jing_yin_rin18sui_a.png', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame($url, (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/Kb10uyShortStoryServerResolverTest.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\Kb10uyShortStoryServerResolver;
-use Tests\TestCase;
-
-class Kb10uyShortStoryServerResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function testNormalPost()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Kb10uyShortStoryServer/tomone.html');
-
-        $this->createResolver(Kb10uyShortStoryServerResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ss.kb10uy.org/posts/14');
-        $this->assertSame('朋音「は、はぁ？おむつ？」', $metadata->title);
-        $this->assertSame('自炊したおかずってやつです。とりあえずこのSSの中ではkb10uyの彼女は朋音ってことにしといてください。そうじゃないと出す男が決定できないので。', $metadata->description);
-        $this->assertSame(['妄想', 'kb10uy', '岩永朋音', 'おむつ'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ss.kb10uy.org/posts/14', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/NicoSeigaResolverTest.php

@@ -1,53 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\NicoSeigaResolver;
-use Tests\MyAsserts;
-use Tests\TestCase;
-
-class NicoSeigaResolverTest extends TestCase
-{
-    use CreateMockedResolver, MyAsserts;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function testSeiga()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/NicoSeiga/seiga.html');
-
-        $this->createResolver(NicoSeigaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://seiga.nicovideo.jp/seiga/im9623750');
-        $this->assertSame('シャミ子 / まとけち さんのイラスト', $metadata->title);
-        $this->assertSame('シャミ子が悪いんだよ・・・', $metadata->description);
-        $this->assertSame('https://lohas.nicoseiga.jp/thumb/9623750l?', $metadata->image);
-        $this->assertArrayContains(['アニメ', 'まちカドまぞく', 'シャミ子', 'シャドウミストレス優子', '吉田優子', '危機管理フォーム'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://seiga.nicovideo.jp/seiga/im9623750', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testShunga()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/NicoSeiga/shunga.html');
-
-        $this->createResolver(NicoSeigaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://seiga.nicovideo.jp/seiga/im9232798');
-        $this->assertSame('ベッドのゆかりさん / せゆーら/Se-U-Ra さんのイラスト', $metadata->title);
-        $this->assertSame('待つ側の方がつよいってスマブラが伝えてきたので', $metadata->description);
-        $this->assertSame('https://lohas.nicoseiga.jp/thumb/9232798l?', $metadata->image);
-        $this->assertArrayContains(['結月ゆかり', 'VOICEROID'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://seiga.nicovideo.jp/seiga/im9232798', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/NijieResolverTest.php

@@ -20,15 +20,15 @@ class NijieResolverTest extends TestCase
 
     public function testStandardPicture()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPictureResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPicture.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
         $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=66384');
-        $this->assertSame('チンポップくんの日常ep.1「チンポップくんと釣り」', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'メールマガジン漫画のバックナンバー第一話です！' . PHP_EOL . '最新話はメールマガジンより配信中です。', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/04/nijie_picture/38_20131130155623.png', $metadata->image);
-        $this->assertSame(['ニジエたん', '釣り', 'チンポップ君の日常', '公式漫画'], $metadata->tags);
+        $this->assertEquals('チンポップくんの日常ep.1「チンポップくんと釣り」 | ニジエ運営', $metadata->title);
+        $this->assertEquals("メールマガジン漫画のバックナンバー第一話です！\r\n最新話はメールマガジンより配信中です。", $metadata->description);
+        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
+        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -36,15 +36,15 @@ class NijieResolverTest extends TestCase
 
     public function testMultiplePicture()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMultiplePictureResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMultiplePicture.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
         $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=202707');
-        $this->assertSame('ニジエ壁紙', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'ニジエのPCとiphone用(4.7inch推奨)の壁紙です。' . PHP_EOL . '保存してご自由にお使いくださいませ。', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/03/nijie_picture/38_20170209185801_0.png', $metadata->image);
-        $this->assertSame(['ニジエたん', '壁紙'], $metadata->tags);
+        $this->assertEquals('ニジエ壁紙 | ニジエ運営', $metadata->title);
+        $this->assertEquals("ニジエのPCとiphone用(4.7inch推奨)の壁紙です。\r\n保存してご自由にお使いくださいませ。", $metadata->description);
+        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
+        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://nijie.info/view.php?id=202707', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -52,15 +52,14 @@ class NijieResolverTest extends TestCase
 
     public function testAnimationGif()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testAnimationGifResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testAnimationGif.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
         $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=9537');
-        $this->assertSame('ニジエがgifに対応したんだってね　奥さん', $metadata->title);
-        $this->assertSame('投稿者: 黒末アプコ' . PHP_EOL . 'アニメgifとか専門外なのでよくわかりませんでした', $metadata->description);
-        $this->assertStringStartsWith('https://nijie.info/pic/logo/nijie_logo_og.png', $metadata->image);
-        $this->assertSame(['おっぱい', '陥没乳首', '眼鏡', 'GIFアニメ', 'ぶるんぶるん', 'アニメgif'], $metadata->tags);
+        $this->assertEquals('ニジエがgifに対応したんだってね　奥さん | 黒末アプコ', $metadata->title);
+        $this->assertEquals('アニメgifとか専門外なのでよくわかりませんでした', $metadata->description);
+        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://nijie.info/view.php?id=9537', (string) $this->handler->getLastRequest()->getUri());
         }
@@ -68,84 +67,79 @@ class NijieResolverTest extends TestCase
 
     public function testMp4Movie()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMp4MovieResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMp4Movie.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
         $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=256283');
-        $this->assertSame('てすと', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'H264動画てすと　あとで消します' . PHP_EOL .  PHP_EOL . '今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません' . PHP_EOL . '動画は勝手にループします', $metadata->description);
-        $this->assertStringStartsWith('https://nijie.info/pic/logo/nijie_logo_og.png', $metadata->image);
-        $this->assertSame([], $metadata->tags);
+        $this->assertEquals('てすと | ニジエ運営', $metadata->title);
+        $this->assertEquals("H264動画てすと　あとで消します\r\n\r\n今の所、H264コーデックのみ、出力時に音声なしにしないと投稿できません\r\n動画は勝手にループします", $metadata->description);
+        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://nijie.info/view.php?id=256283', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 
-    public function testViewPopup()
+    public function testStandardPictureSp()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPictureResponse.html');
-
-        $this->createResolver(NijieResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://nijie.info/view_popup.php?id=66384');
-        $this->assertSame('チンポップくんの日常ep.1「チンポップくんと釣り」', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'メールマガジン漫画のバックナンバー第一話です！' . PHP_EOL . '最新話はメールマガジンより配信中です。', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/04/nijie_picture/38_20131130155623.png', $metadata->image);
-        $this->assertSame(['ニジエたん', '釣り', 'チンポップ君の日常', '公式漫画'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testSp()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPictureResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPictureSp.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
         $metadata = $this->resolver->resolve('https://sp.nijie.info/view.php?id=66384');
-        $this->assertSame('チンポップくんの日常ep.1「チンポップくんと釣り」', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'メールマガジン漫画のバックナンバー第一話です！' . PHP_EOL . '最新話はメールマガジンより配信中です。', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/04/nijie_picture/38_20131130155623.png', $metadata->image);
-        $this->assertSame(['ニジエたん', '釣り', 'チンポップ君の日常', '公式漫画'], $metadata->tags);
+        $this->assertEquals('チンポップくんの日常ep.1「チンポップくんと釣り」 | ニジエ運営', $metadata->title);
+        $this->assertEquals("メールマガジン漫画のバックナンバー第一話です！\r\n最新話はメールマガジンより配信中です。", $metadata->description);
+        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
+        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
         if ($this->shouldUseMock()) {
             $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 
-    public function testSpViewPopup()
+    public function testMultiplePictureSp()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testStandardPictureResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMultiplePictureSp.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
-        $metadata = $this->resolver->resolve('https://sp.nijie.info/view_popup.php?id=66384');
-        $this->assertSame('チンポップくんの日常ep.1「チンポップくんと釣り」', $metadata->title);
-        $this->assertSame('投稿者: ニジエ運営' . PHP_EOL . 'メールマガジン漫画のバックナンバー第一話です！' . PHP_EOL . '最新話はメールマガジンより配信中です。', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/04/nijie_picture/38_20131130155623.png', $metadata->image);
-        $this->assertSame(['ニジエたん', '釣り', 'チンポップ君の日常', '公式漫画'], $metadata->tags);
+        $metadata = $this->resolver->resolve('https://sp.nijie.info/view.php?id=202707');
+        $this->assertEquals('ニジエ壁紙 | ニジエ運営', $metadata->title);
+        $this->assertEquals("ニジエのPCとiphone用(4.7inch推奨)の壁紙です。\r\n保存してご自由にお使いくださいませ。", $metadata->description);
+        $this->assertRegExp('/pic\d+\.nijie\.info/', $metadata->image);
+        $this->assertNotRegExp('~/diff/main/~', $metadata->image);
         if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=66384', (string) $this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=202707', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 
-    public function testHasHtmlInAuthorProfile()
+    public function testAnimationGifSp()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testHasHtmlInAuthorProfileResponse.html');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testAnimationGifSp.html');
 
         $this->createResolver(NijieResolver::class, $responseText);
 
-        $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=285698');
-        $this->assertSame('ＪＫ文化祭コスプレ喫茶', $metadata->title);
-        $this->assertSame('投稿者: ままままま' . PHP_EOL .
-            'https://www.pixiv.net/fanbox/creator/32045169' . PHP_EOL .
-            'ピクシブのファンボックスでこっちに上げてた一次創作のノリでえっちなやつ描いてます' . PHP_EOL .
-            '二次創作のえっちなやつは相変わらずこっち' . PHP_EOL . '健全目なのはついったー', $metadata->description);
-        $this->assertSame('https://pic.nijie.net/02/nijie_picture/540086_20181028112046_0.png', $metadata->image);
-        $this->assertSame(['バニーガール'], $metadata->tags);
+
+        $metadata = $this->resolver->resolve('https://nijie.info/view.php?id=9537');
+        $this->assertEquals('ニジエがgifに対応したんだってね　奥さん | 黒末アプコ', $metadata->title);
+        $this->assertEquals('アニメgifとか専門外なのでよくわかりませんでした', $metadata->description);
+        $this->assertRegExp('~/nijie\.info/pic/logo~', $metadata->image);
         if ($this->shouldUseMock()) {
-            $this->assertSame('https://nijie.info/view.php?id=285698', (string) $this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://nijie.info/view.php?id=9537', (string) $this->handler->getLastRequest()->getUri());
+        }
+    }
+
+    public function testMp4MovieSp()
+    {
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Nijie/testMp4MovieSp.html');
+
+        $this->createResolver(NijieResolver::class, $responseText);
+
+        $metadata = $this->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('~/nijie\.info/pic/logo~', $metadata->image);
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://nijie.info/view.php?id=256283', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 }

tests/Unit/MetadataResolver/OGPResolverTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Unit\MetadataResolver;
 
 use App\MetadataResolver\OGPResolver;
-use GuzzleHttp\Exception\BadResponseException;
+use GuzzleHttp\Exception\ClientException;
 use Tests\TestCase;
 
 class OGPResolverTest extends TestCase
@@ -14,7 +14,7 @@ class OGPResolverTest extends TestCase
     {
         $this->createResolver(OGPResolver::class, '', [], 404);
 
-        $this->expectException(BadResponseException::class);
+        $this->expectException(\RuntimeException::class);
         $this->resolver->resolve('http://example.com/404');
     }
 

tests/Unit/MetadataResolver/PixivResolverTest.php

@@ -20,7 +20,7 @@ class PixivResolverTest extends TestCase
 
     public function testIllust()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/illust.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/testIllust.json');
 
         $this->createResolver(PixivResolver::class, $responseText);
 
@@ -36,23 +36,23 @@ class PixivResolverTest extends TestCase
 
     public function testIllustMultiPages()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/illustMultiPages.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/testIllustMultiPages.json');
 
         $this->createResolver(PixivResolver::class, $responseText);
 
-        $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=75899985');
-        $this->assertEquals('コミッション絵33', $metadata->title);
-        $this->assertEquals('投稿者: ナゼ(NAZE)' . PHP_EOL . 'Leak' . PHP_EOL . PHP_EOL . 'Character:アリッサさん（依頼主のオリキャラ）', $metadata->description);
-        $this->assertEquals('https://i.pixiv.cat/img-master/img/2019/07/25/13/02/59/75899985_p0_master1200.jpg', $metadata->image);
-        $this->assertEquals(['巨乳輪', '超乳', '巨乳首', '母乳'], $metadata->tags);
+        $metadata = $this->resolver->resolve('https://www.pixiv.net/member_illust.php?mode=medium&illust_id=47220843');
+        $this->assertEquals('がぶ飲みミルクティー', $metadata->title);
+        $this->assertEquals('投稿者: きっぷる' . PHP_EOL . '劇中で度々お見かけするお姿がたまらなく愛おしいのです' . PHP_EOL . 'チラリズムでしょうか', $metadata->description);
+        $this->assertEquals('https://i.pixiv.cat/img-master/img/2014/11/23/15/52/00/47220843_p0_master1200.jpg', $metadata->image);
+        $this->assertEquals(['SHIROBAKO', '小笠原綸子', 'ゴスロリ様', '中出し', 'SHIRUPAKO', 'くわえたくしあげ', 'ずらし挿入', 'SHIROBAKO1000users入り', '破れストッキング'], $metadata->tags);
         if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.pixiv.net/ajax/illust/75899985', (string) $this->handler->getLastRequest()->getUri());
+            $this->assertSame('https://www.pixiv.net/ajax/illust/47220843', (string) $this->handler->getLastRequest()->getUri());
         }
     }
 
     public function testManga()
     {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/manga.json');
+        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/testManga.json');
 
         $this->createResolver(PixivResolver::class, $responseText);
 
@@ -65,20 +65,4 @@ class PixivResolverTest extends TestCase
             $this->assertSame('https://www.pixiv.net/ajax/illust/46713544', (string) $this->handler->getLastRequest()->getUri());
         }
     }
-
-    public function testArtworkUrl()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Pixiv/illust.json');
-
-        $this->createResolver(PixivResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.pixiv.net/artworks/68188073');
-        $this->assertEquals('coffee break', $metadata->title);
-        $this->assertEquals('投稿者: 裕' . PHP_EOL, $metadata->description);
-        $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());
-        }
-    }
 }

tests/Unit/MetadataResolver/SteamResolverTest.php

@@ -28,6 +28,9 @@ class SteamResolverTest extends TestCase
         $this->assertEquals('NEKOPARA Vol. 1', $metadata->title);
         $this->assertEquals('水無月嘉祥(みなづき かしょう)は伝統ある老舗和菓子屋である実家を出て、 パティシエとして自身のケーキ屋『ラ・ソレイユ』を一人で開店する。 しかし実家から送った引っ越し荷物の中に、 実家で飼っていた人型ネコのショコラとバニラが紛れ込んでいた。', $metadata->description);
         $this->assertStringStartsWith('https://steamcdn-a.akamaihd.net/steam/apps/333600/header.jpg?t=', $metadata->image);
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://store.steampowered.com/api/appdetails/?l=japanese&appids=333600', (string) $this->handler->getLastRequest()->getUri());
+        }
     }
 
     public function testR18()
@@ -40,6 +43,9 @@ class SteamResolverTest extends TestCase
         $this->assertEquals('Broke Girl  | 負債千金', $metadata->title);
         $this->assertEquals('苦労知らずに育ったお嬢様は一夜にして1000万の借金を背負うことになった。借金を返済するために働かなければならない。しかし世間には悪意が満ちており、男達はお金で彼女を誘うか凌辱することしか考えていない。', $metadata->description);
         $this->assertStringStartsWith('https://steamcdn-a.akamaihd.net/steam/apps/1077580/header.jpg?t=', $metadata->image);
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://store.steampowered.com/api/appdetails/?l=japanese&appids=1077580', (string) $this->handler->getLastRequest()->getUri());
+        }
     }
 
     public function testNotFound()
@@ -51,5 +57,8 @@ class SteamResolverTest extends TestCase
         $this->createResolver(SteamResolver::class, $responseText);
 
         $this->resolver->resolve('https://store.steampowered.com/app/1');
+        if ($this->shouldUseMock()) {
+            $this->assertSame('https://store.steampowered.com/api/appdetails/?l=japanese&appids=1', (string) $this->handler->getLastRequest()->getUri());
+        }
     }
 }

tests/Unit/MetadataResolver/ToranoanaResolverTest.php

@@ -1,140 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\ToranoanaResolver;
-use Tests\TestCase;
-
-class ToranoanaResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function testTora()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testTora.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.shop/tora/ec/item/040030720152');
-        $this->assertEquals('新・古明地喫茶～そしてまた扉は開く～', $metadata->title);
-        $this->assertEquals('サークル【ツキギのとこ】（槻木こうすけ）発行の「新・古明地喫茶～そしてまた扉は開く～」を買うなら、とらのあな全年齢向け通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.shop/tora/ec/item/040030720152', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testToraR()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testToraR.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.jp/tora_r/ec/item/040030720174');
-        $this->assertEquals('お姉ちゃんが妹のぱんつでひとりえっちしてました。', $metadata->title);
-        $this->assertEquals('サークル【没後】（RYO）発行の「お姉ちゃんが妹のぱんつでひとりえっちしてました。」を買うなら、とらのあな成年向け通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.jp/tora_r/ec/item/040030720174', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testToraD()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testToraD.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.shop/tora_d/digi/item/042000013358');
-        $this->assertEquals('虎の穴ラボの薄い本。vol 1.5', $metadata->title);
-        $this->assertEquals('サークル【虎の穴ラボ】（虎の穴ラボエンジニアチーム）発行の「虎の穴ラボの薄い本。vol 1.5」を買うなら、とらのあな全年齢向け電子書籍通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.shop/tora_d/digi/item/042000013358', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testToraRD()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testToraRD.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.jp/tora_rd/digi/item/042000013181');
-        $this->assertEquals('放課後のお花摘み', $metadata->title);
-        $this->assertEquals('サークル【給食泥棒】（村雲）発行の「放課後のお花摘み」を買うなら、とらのあな成年向け電子書籍通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.jp/tora_rd/digi/item/042000013181', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testJoshi()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testJoshi.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.shop/joshi/ec/item/040030702729');
-        $this->assertEquals('円卓のクソ漫画', $metadata->title);
-        $this->assertEquals('サークル【地獄のすなぎもカーニバル】（槌田）発行の「円卓のクソ漫画」を買うなら、とらのあな女子部全年齢向け通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.shop/joshi/ec/item/040030702729', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testJoshiR()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testJoshiR.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.jp/joshi_r/ec/item/040030730126');
-        $this->assertEquals('リバースナイトリバース', $metadata->title);
-        $this->assertEquals('サークル【雨傘サイクル】（チャリリズム）発行の「リバースナイトリバース」を買うなら、とらのあな女子部成年向け通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.jp/joshi_r/ec/item/040030730126', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testJoshiD()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testJoshiD.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.shop/joshi_d/digi/item/042000012192');
-        $this->assertEquals('超幸運ガール審神者GOLDEN', $metadata->title);
-        $this->assertEquals('サークル【Day Of The Dead】（ほんちゅ）発行の「超幸運ガール審神者GOLDEN」を買うなら、とらのあな女子部全年齢向け電子書籍通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.shop/joshi_d/digi/item/042000012192', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testJoshiRD()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Toranoana/testJoshiRD.html');
-
-        $this->createResolver(ToranoanaResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://ec.toranoana.jp/joshi_rd/digi/item/042000013472');
-        $this->assertEquals('UBWの裏側で非公式に遠坂凛をナデナデする本', $metadata->title);
-        $this->assertEquals('サークル【阿仁谷組】（阿仁谷ユイジ）発行の「UBWの裏側で非公式に遠坂凛をナデナデする本」を買うなら、とらのあな女子部成年向け電子書籍通販！', $metadata->description);
-        $this->assertRegExp('~ecdnimg\.toranoana\.jp/ec/img/.*\.jpg~', $metadata->image);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://ec.toranoana.jp/joshi_rd/digi/item/042000013472', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-}

tests/Unit/MetadataResolver/XtubeResolverTest.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Tests\Unit\MetadataResolver;
-
-use App\MetadataResolver\XtubeResolver;
-use Tests\TestCase;
-
-class XtubeResolverTest extends TestCase
-{
-    use CreateMockedResolver;
-
-    public function setUp()
-    {
-        parent::setUp();
-
-        if (!$this->shouldUseMock()) {
-            sleep(1);
-        }
-    }
-
-    public function test()
-    {
-        $responseText = file_get_contents(__DIR__ . '/../../fixture/Xtube/video.html');
-
-        $this->createResolver(XtubeResolver::class, $responseText);
-
-        $metadata = $this->resolver->resolve('https://www.xtube.com/video-watch/homegrown-big-tits-18634762');
-        $this->assertEquals('Homegrown Big Tits', $metadata->title);
-        $this->assertEquals('Dedicated to the fans of the beautiful amateur women with big natural tits.  All user submitted - you can see big boob amateur hotties fucking and sucking as their tits bounce and sway.', $metadata->description);
-        $this->assertRegExp('~https://cdn\d+-s-hw-e5\.xtube\.com/m=eaAaaEFb/videos/201302/07/RF4Nk-S774-/original/1\.jpg~', $metadata->image);
-        $this->assertEquals(['Amateur', 'Blowjob', 'Big Boobs', 'bigtits', 'homeg'], $metadata->tags);
-        if ($this->shouldUseMock()) {
-            $this->assertSame('https://www.xtube.com/video-watch/homegrown-big-tits-18634762', (string) $this->handler->getLastRequest()->getUri());
-        }
-    }
-
-    public function testNotMatch()
-    {
-        $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessage('Unmatched URL Pattern: https://www.xtube.com/gallery/black-celebs-free-7686657');
-
-        $this->createResolver(XtubeResolver::class, '');
-        $this->resolver->resolve('https://www.xtube.com/gallery/black-celebs-free-7686657');
-    }
-}

tests/fixture/Cien/testWithNoTimestamp.html

@@ -1,602 +0,0 @@
-<!DOCTYPE html>
-<html lang="ja">
-
-<head>
-  
-  <meta name="google-site-verification" content="4UtUmaro4aJIR94PZdv-GoliXlDvtUVFL03-9CTh68s" />
-  <meta charset="UTF-8">
-      <meta name="viewport" id="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
-    <meta name="csrf-token" content="1UAeVYZqG3XqR5XwRi0MXYJn3zIf51glrKZKY2gp">
-  <meta name="app-auth-check" content="0">
-
-    <meta property="og:title" content="Ci-en">
-  <meta property="og:type" content="website">
-  <meta property="og:url" content="http://ci-en.dlsite.com">
-  <meta property="og:image" content="https://ci-en.dlsite.com/assets/img/common/logo_Ci-en_R18.svg">
-  <meta property="og:site_name" content="Ci-en">
-  <meta property="og:description" content="好きの気持ちは、カタチで伝えよう。">
-    <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:title" content="Ci-en">
-  <meta name="twitter:description" content="好きの気持ちは、カタチで伝えよう。">
-  <meta name="twitter:image:src" content="https://ci-en.dlsite.com/assets/img/common/logo_Ci-en_R18.svg">
-
-    <meta name="description" content="好きの気持ちは、カタチで伝えよう。">
-  <meta name="keyword" content="Ci-en">
-  <meta name="sentry-public-dsn" content="7319f62f11fe408b932254c5fe87eb64@sentry.io/301968">
-  <meta name="sentry-release" content="fd2635a6350eda85e4dbec5559f0172e7f8086df">
-  <meta name="app-locale" content="ja">
-  <title>好きの気持ちは、カタチで伝えよう。 - Ci-en</title>
-  <link media="all" type="text/css" rel="stylesheet" href="https://ci-en.dlsite.com/assets/css/app.css?1567667013">
-    <link rel="icon" href="/favicon.ico">
-  <link rel="stylesheet" href="https://www.dlsite.com/assets/share/css/universal/universal.css">
-
-  
-  
-  <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-  new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-  j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-  'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-  })(window,document,'script','dataLayer','GTM-NNPHW5Z');</script>
-  
-  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-109913020-1"></script>
-  <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){
-      dataLayer.push(arguments);
-    }
-    gtag('js', new Date());
-
-    gtag('config', 'UA-109913020-1', {
-      'send_page_view': false,
-      'custom_map': {
-        'dimension1':'logined',
-              },
-    });
-    gtag('set', 'linker', {
-      'accept_incoming': true,
-      'domains': ['ci-en.net','ci-en.dlsite.com']
-    });
-    gtag('event', 'page_view', {
-      'logined': '',
-            'has_creator': '0',
-          });
-
-
-
-
-  </script>
-</head>
-
-<body class="global-layout p-topPage ">
-        <!-- グローバルヘッダー -->
-<div class="l-eisysGroupHeader type-cien">
-  <vue-global-header
-    account-settings-url="https://login.dlsite.com/user/self?redirect_uri=https%3A%2F%2Fci-en.dlsite.com%2Flogout&amp;lang=ja"
-    is-adult="1"
-          user-id=""
-      creator-id=""
-      ></vue-global-header>
-</div>
-    <header class="global-layout-item type-header">
-  <div class="header-inner">
-
-    <div class="cien-logo type-r18">
-      <a href="/">Ci-en</a>
-    </div>
-
-    <form method="GET" action="https://ci-en.dlsite.com/search" accept-charset="UTF-8" class="hd-searchBox">
-      <input type="text" class="hd-searchInput" name="keyword" placeholder="クリエイターを検索">
-      <input type="submit" class="hd-searchButton" value="&#xe90f;">
-    </form>
-
-    
-    <div class="nav-drawer type-menu">
-      <input id="nav-inputMenu" type="checkbox" class="nav-unshown">
-      <label id="nav-open" for="nav-inputMenu">
-                  <span></span>
-              </label>
-      <label class="nav-unshown icon-navClose" id="nav-close" for="nav-inputMenu"><span></span></label>
-      <div class="nav-content type-left">
-
-        
-                  <div class="navEntry">
-            <p class="text">DLsiteアカウントをお持ちの方はログインできます。</p>
-            <div class="btnBox">
-              <a href="https://ci-en.dlsite.com/login" class="btn type-basic">ログイン</a>
-              <a href="https://ci-en.dlsite.com/login" class="btn type-important">新規登録</a>
-            </div>
-            <p class="notice">株式会社エイシスが運営しているサービスをDLsiteアカウント一つでご利用いただけます。</p>
-          </div>
-          <ul class="nav-submenuList">
-            <li class="nav-submenuList-item"><a href="https://ci-en.dlsite.com/about/supporter">Ci-enとは？</a></li>
-            <li class="nav-submenuList-item"><a href="https://ci-en.dlsite.com/about/creator">クリエイター登録</a></li>
-            <li class="nav-submenuList-item"><a href="https://ci-en.dlsite.com/about/faq">よくある質問</a></li>
-          </ul>
-
-        
-        
-      </div>
-    </div>
-
-    
-    
-    <div class="globalNav-wrap">
-  <ul class="globalNav is-guest">
-
-    <li class="globalNav-item type-bell">
-
-              <a href="https://ci-en.dlsite.com/mypage/activity">
-          <span class="globalNav-icon">通知</span>
-        </a>
-          </li>
-
-    <li class="globalNav-item type-searchBox">
-      <form method="GET" action="https://ci-en.dlsite.com/search" accept-charset="UTF-8" class="hd-search">
-      <input type="submit" class="hd-searchButton" value="&#xe90f;">
-      <input type="text" class="hd-searchInput" name="keyword" placeholder="クリエイターを検索">
-      </form>
-    </li>
-
-    
-    <li class="globalNav-item type-search ">
-      <a href="https://ci-en.dlsite.com/search/top">
-        <span class="globalNav-icon"></span>
-      </a>
-    </li>
-
-    <li class="globalNav-item type-signup">
-      <a href="https://ci-en.dlsite.com/login">Ci-enをはじめる</a>
-    </li>
-
-    <li class="globalNav-item type-mypage">
-      <a href="https://ci-en.dlsite.com/mypage">
-        <span class="globalNav-icon">マイページ</span>
-      </a>
-    </li>
-
-    
-    <li class="globalNav-item type-help">
-      <a href="https://ci-en.dlsite.com/about/faq">
-        <span class="globalNav-icon">ヘルプ</span>
-      </a>
-    </li>
-
-
-  </ul>
-</div>
-
-  </div>
-
-  
-</header>
-    <section class="global-layout-item type-contentsNav">
-          </section>
-  <section id="detail" class="global-layout-item type-contents">
-    <section class="grid-container inner-layout">
-      <div class="topHeroArea" onload="console.log('loaded');">
-  <h1 class="topCatchcopy">
-    <div class="catchcopy-item type-first"></div>
-    <div class="catchcopy-item type-last"></div>
-  </h1>
-  <div id="top-heroarea-mainimg" class="topHeroArea-mainImg">
-    <div class="mainImg-item item-twinkleStar"></div>
-    <div class="mainImg-item item-twinkleStar1"></div>
-    <div class="mainImg-item item-twinkleStar2"></div>
-    <div class="mainImg-item item-star"></div>
-    <div class="topHeroArea-gradeFilter"></div>
-    <div class="mainImg-item item-wood"></div>
-    <div class="mainImg-item item-donguri"></div>
-    <div class="mainImg-item item-present"></div>
-    <div class="mainImg-item item-letter"></div>
-  </div>
-</div>
-
-<div class="grid-item grid-main">
-
-  <div class="topIntroArea">
-    <h1 class="topIntroArea-heading"></h1>
-    <div class="topIntroArea-textGroup">
-      <p class="text">新しいものを作るのは、簡単なことではありません。<span>思いを形にするには時間と手間、そして資金が必要です。</span></p>
-      <p class="text">Ci-enで好きなクリエイターを支援すれば、<span>その収益を創作活動に活かすことができるようになります。</span></p>
-      <p class="text">クリエイターも支援者も、誰もが創作を楽しめる世界に参加してみませんか？</p>
-    </div>
-    <div class="topIntroArea-btn">
-      <a href="https://login.dlsite.com/register?redirect_uri=https%3A%2F%2Fci-en.dlsite.com&amp;lang=ja" class="btn type-important-confirm">Ci-enをはじめる</a>
-    </div>
-
-  </div>
-
-  <div class="topAboutCienArea">
-    <div class="topAboutCienArea-main"></div>
-    <div class="topAboutCienArea-btn">
-      <a href="https://ci-en.dlsite.com/about/supporter" class="btn type-confirm">もっと知りたい方はこちら</a>
-    </div>
-  </div>
-
-  <div id="follow" class="topLetsFollowArea">
-    <div class="topLetsFollowArea-heading"></div>
-    <div class="topLetsFollowArea-body">
-
-      <div class="topShowcase type-popularCreator">
-        <div class="topShowcase-heading">
-                      <a href="//ci-en.net#follow" class="btn type-topRatingChange">全年齢に切替</a>
-                  </div>
-
-        <div class="topShowcase-body">
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00000208/6742fc1b379a180e4485cdeff9a086d535725683ca882155b400bc65ab13ed3e/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00000208/6f0dac0278bbb547e97b0deddd2aad22043d6b9ce8cde868b99e543d7dc1ec9f/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">ONEONE1</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/208" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00001145/4f39516e4f22c76b45443b5567789419d8d0ea985958cd26adea88cf79c95fd3/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00001145/5c18c657f97e23ea73a700784f55c2e34b1871e532b45e32118ee57a6c2cb677/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">同人サークルＧｙｕ！</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/1145" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00000057/a8c0cf4f84fc374e9ba5891ee2a158a69067eee0d3601a66e1e00489df4df25d/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00000057/72fbd8b3e2124f88de11866d21a23c6e4ff375e62dba50c517f537655ff2e981/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">クリメニア</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/57" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00001321/5e327eb84b4ce6a36be637729b000ba74a9b27f35273f08a30b86e464ee1e25e/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00001321/60557adcbb149f7494c6aed36f3d44373896a971b997af3e4e02a650f70f5cbe/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">Hypnotic Yanh</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=8">音声作品</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/1321" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00000391/f0134aaa1e2174efabc30e024c973024f34064e0f6ab6738477564c34170ae3b/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00000391/c98d97cf4d4af1c6aad452150693a06a63e6f4323e21ad0848e83f910a949b80/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">シロクマの嫁(伊ヶ崎綾香)</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=8">音声作品</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/391" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00001058/14ccafc478078692f53a62c0e2ea722d55dd018945d44c31e55bdcc237ee9944/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00001058/3ac1827236a6fce3d5d7d9142dd4e77e3b732b63db18af81e5c74818572d7b10/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">鉱油/73号坑道</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/1058" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00000190/0ebc04b8de8d6e42f6c5bf020936bff79bdfa29ab71f1ea2eff547f42fd9caa7/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00000190/e5e01272dac25575a00b651adf8d04524d91a87ff534bc4391dbabea404e6a49/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">ぽいずん</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/190" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00002004/b568c5bcc1108db1276c32b550140f5d539a92c589f3bd8fc16163fba56eb50a/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00002004/aab5ff3de14c0361715b4a16cc3cc6961cac72b84762d514e6fc38c40dda81e6/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">あいすシチュー</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/2004" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00001191/b0ca242c5095531d78a95f3bc4e15a5b642b33c808f91af1cf95723dee7a4543/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00001191/950a61d5e3648e8c01c31a9a3ee127c8cb8e5e015379feb45d409f61acf9cf5a/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">みこにそみ</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/1191" class="creatorCard-link"></a>
-            </div>
-                      <div class="mod-creatorCard at-topPage">
-              <div class="creatorCard-header">
-                <img src="https://media.ci-en.jp/public/cover/creator/00000944/8b3b9c5cc1024bf0b532b9a0db168db7600a77ed6fbeaf15eb4c56656659666d/image-990-c.jpg" alt="">
-              </div>
-              <div class="creatorCard-body">
-                <dt class="creatorCard-thumb">
-                  <div class="accountIcon type-cerator size-m">
-                    <img src="https://media.ci-en.jp/public/icon/creator/00000944/9dc7439b9801ac6f0e66e92f8980fb2771cb8ab2f8a05e230c753d0f953ce4e0/image-200-c.jpg" alt="">
-                  </div>
-                </dt>
-                <dd class="creatorCard-name">D-LIS-ディーリス</dd>
-                <dd class="creatorCard-tag">
-                  <ul class="tagList type-creator">
-                    <li class="tagList-item type-creator">
-                      <a class="item-tag type-activityGenre" href="/search?categoryId=9">ゲーム</a>
-                    </li>
-                  </ul>
-                </dd>
-              </div>
-              <a href="https://ci-en.dlsite.com/creator/944" class="creatorCard-link"></a>
-            </div>
-                  </div>
-      </div>
-
-      <div class="topShowcase type-searchByGenre">
-        <div class="topShowcase-heading"></div>
-        <div class="topShowcase-body">
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=9" class="topGenre-link">
-                ゲーム
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=1" class="topGenre-link">
-                イラスト
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=2" class="topGenre-link">
-                漫画
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=8" class="topGenre-link">
-                音声作品
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=3" class="topGenre-link">
-                小説
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=7" class="topGenre-link">
-                声優・歌い手
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=12" class="topGenre-link">
-                映像・アニメ
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=17" class="topGenre-link">
-                その他
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=10" class="topGenre-link">
-                YouTuber・実況
-                
-              </a>
-            </div>
-                      <div class="topGenre-item">
-              <a href="/search?categoryId=14" class="topGenre-link">
-                VR
-                
-              </a>
-            </div>
-                  </div>
-      </div>
-
-    </div>
-  </div>
-
-  <div class="topRegisterCreatorArea">
-    <div class="topRegisterCreatorArea-body">
-      <div class="topRegisterCreatorArea-main">
-
-        <div class="topRegisterCreatorArea-mainImg"></div>
-
-        <div class="topRegisterCreatorArea-btn">
-          <a href="https://ci-en.dlsite.com/about/creator" class="btn type-important-confirm">クリエイター登録について</a>
-        </div>
-
-      </div>
-    </div>
-  </div>
-
-  <div class="topRegisterArea">
-    <div class="topRegisterArea-body">
-      <div class="topRegisterArea-main">
-                  <p class="topRegisterArea-text">DLsiteアカウントをお持ちの方はログインできます。</p>
-          <div class="btnBox">
-            <a href="https://ci-en.dlsite.com/login" class="btn type-confirm">ログイン</a>
-            <a href="https://login.dlsite.com/register?redirect_uri=https%3A%2F%2Fci-en.dlsite.com&amp;lang=ja" class="btn type-important-confirm" target="_blank">新規登録</a>
-          </div>
-          <p class="topRegisterArea-annotation">株式会社エイシスが運営しているサービスをDLsiteアカウント一つでご利用いただけます。</p>
-              </div>
-    </div>
-  </div>
-
-</div>
-          </section>
-  </section>
-    <footer class="global-layout-item type-footer">
-  <div class="gotoTOPContainer">
-    <a href="#" class="ankerlink">ページトップ</a>
-  </div>
-
-  <div class="globalFooter">
-    <div class="footerContainer innerSpaceFooter">
-      <dl class="footerNav itemNum1">
-        <dt class="footerNav-title">Ci-enについて</dt>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/about/supporter" class="footerLink">Ci-enとは？</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/about/creator" class="footerLink">クリエイター登録</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/about/faq" class="footerLink">よくある質問（支援者）</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/about/creator-faq" class="footerLink">よくある質問（クリエイター）</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/inquiry" class="footerLink">お問い合わせ</a></dd>
-        <dd class="footerNav-item"><a href="http://info.ci-en.net" target="_blank" class="footerLink">お知らせブログ</a></dd>
-      </dl>
-
-      <dl class="footerNav itemNum2">
-        <dt class="footerNav-title">運営情報</dt>
-        <dd class="footerNav-item"><a href="http://www.eisys.co.jp/company/company-info.html" target="_blank" class="footerLink">会社概要</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/legal/regulation" class="footerLink">利用規約</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/legal/law" class="footerLink">特定商取引法に基づく表示</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/legal/censorship" class="footerLink">コンプライアンスポリシー</a></dd>
-        <dd class="footerNav-item"><a href="https://ci-en.dlsite.com/legal/privacy" class="footerLink">個人情報の取り扱いについて</a></dd>
-      </dl>
-
-      <div class="l-eisysGroupFooter type-cien is-sponly">
-        <div class="eisysGroupFooterInner">
-          <p class="eisysGroupFooterHeading">関連サービス</p>
-          <ul class="eisysGroupFooterService">
-                          <li class="eisysGroupFooterService-link type-dlsite">
-                <a href="https://www.dlsite.com/maniax-touch/?utm_campaign=cien&amp;utm_medium=text&amp;utm_content=sp_globalfooter"><span>ダウンロードショップ</span>DLsite</a>
-              </li>
-              <li class="eisysGroupFooterService-link type-nijiyome">
-                <a href="https://www.nijiyome.jp/?en=cien&amp;em=text&amp;et=sp_globalfooter"><span>オンラインゲームサイト</span>にじよめ</a>
-              </li>
-                        <li class="eisysGroupFooterService-link type-channel">
-              <a href="https://ch.dlsite.com/?from=sp_globalfooter_cien"><span>二次元コミュニティサイト</span>DLチャンネル</a>
-            </li>
-            <li class="eisysGroupFooterService-link type-chobit">
-              <a href="https://chobit.cc/?from=sp_globalfooter_cien"><span>無料体験版サイト</span>chobit</a>
-            </li>
-            <li class="eisysGroupFooterService-link type-triokini">
-              <a href="https://triokini.com/how_to_use?from=sp_globalfooter_cien"><span>即売会取り置きサイト</span>トリオキニ</a>
-            </li>
-            <li class="eisysGroupFooterService-link type-studio">
-              <a href="https://dlsitestudio.com/?from=sp_globalfooter_cien"><span>音声収録スタジオ</span>DLsiteスタジオ</a>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-
-    <div class="snsArea">
-      <p class="heading">SNS公式アカウント</p>
-      <a href="https://twitter.com/cien_info?lang=ja" class="twitter_link" target="_blink" rel="nofollow noopener"></a>
-    </div>
-    <p class="copyright">&copy; 2018 Ci-en</p>
-  </div>
-</footer>
-    <script src="https://ci-en.dlsite.com/assets/js/vendor.bundle.js?1568167511"></script>
-  <script src="https://ci-en.dlsite.com/assets/js/app.bundle.js?1568167511"></script>
-</body>
-</html>
-

tests/fixture/DLsite/testEcchiEng.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:mixi="http://mixi-platform.com/ns#" xmlns:fb="http://www.facebook.com/2008/fbml" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:mixi="http://mixi-platform.com/ns#" xmlns:fb="http://www.facebook.com/2008/fbml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=1024">
+<meta name="viewport" content="width=991">
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta name="google-site-verification" content="S2Jzwn_Dm4hGoyTfPnxEUSKnbHSuT73N6SZbTanWbEM" />
@@ -42,20 +42,20 @@
 <script>/dlsite_dozen=/.test(document.cookie) || (document.cookie = 'dlsite_dozen=' + Math.floor(Math.random() * 12) + '; path=/; max-age=63072000')</script>
 
 <link rel="stylesheet" href="/css/reset.css?1459221919" type="text/css" id="reset" />
-<link rel="stylesheet" href="/css/default_eng.css?1566881566" type="text/css" id="default" />
+<link rel="stylesheet" href="/css/default_eng.css?1559631936" type="text/css" id="default" />
 <link rel="stylesheet" href="/css/layout_2col_work_eng.css?1552988739" type="text/css" id="layout_2col_work" />
-<link rel="stylesheet" href="/css/common_eng.css?1567473359" type="text/css" id="common" />
-<link rel="stylesheet" href="/css/switch_eng.css?1560415705" type="text/css" id="switch" />
-<link rel="stylesheet" href="/css/suggest.css?1565749496" type="text/css" id="suggest" />
-<link rel="stylesheet" href="/css/header_campaign_banner.css?1567745943" type="text/css" id="header_campaign_banner" />
+<link rel="stylesheet" href="/css/common_eng.css?1559631936" type="text/css" id="common" />
+<link rel="stylesheet" href="/css/switch_eng.css?1551748184" type="text/css" id="switch" />
+<link rel="stylesheet" href="/css/suggest.css?1559631936" type="text/css" id="suggest" />
+<link rel="stylesheet" href="/css/header_campaign_banner.css?1559723711" type="text/css" id="header_campaign_banner" />
 <link rel="stylesheet" href="/assets/share/css/universal/universal.css?" type="text/css" id="universal" />
-<link rel="stylesheet" href="/css/work_template_eng.css?1566876049" type="text/css" id="work_template" />
+<link rel="stylesheet" href="/css/work_template_eng.css?1559631936" type="text/css" id="work_template" />
 <link rel="stylesheet" href="/css/work_slider.css?1559631936" type="text/css" id="work_slider" />
 
 <script type="text/javascript" src="/js/libs/libraries-pack.js?1502345903"></script>
-<script type="text/javascript" src="/js/dlsite_util.js?1561689497"></script>
+<script type="text/javascript" src="/js/dlsite_util.js?1557910552"></script>
 <script type="text/javascript" src="/js/slide_menu.js?1511946236"></script>
-<script type="text/javascript" src="/js/dlsite_suggest.js?1565749496"></script>
+<script type="text/javascript" src="/js/dlsite_suggest.js?1550024738"></script>
 <script type="text/javascript" src="/js/dlsite_trigger.js?1544681008"></script>
 <script type="text/javascript" src="/js/jquery.slideproduct.js?1524728551"></script>
 <script type="text/javascript" src="/js/dlsite_img_filter.js?1544681008"></script>
@@ -91,7 +91,7 @@ $.extend({
     if ($.useAdultcheck) return;
     $.useAdultcheck = true;
     var s = document.createElement('script');
-    s.src = '/js/adultcheck.js?1566881566';
+    s.src = '/js/adultcheck.js?1553837147';
     s.defer = true;
     document.querySelector('head').appendChild(s);
   }
@@ -131,7 +131,7 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
               </div>
               <ul class="eisysGroupHeaderLinkNav">
                 <li>
-                  <a rel="noopener" href="https://login.dlsite.com/user/self?lang=en&redirect_uri=https://www.dlsite.com/ecchi-eng/" target="_blank">Account Management</a>
+                  <a href="https://login.dlsite.com/user/self?lang=en&redirect_uri=https://www.dlsite.com/ecchi-eng/" target="_blank">Account Management</a>
                 </li>
                 <li>
                   <a class="logout" href="https://ssl.dlsite.com/ecchi-eng/logout">Log out</a>
@@ -214,23 +214,20 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
             <a :href="hasUnboughtFavorites ? 'https://www.dlsite.com/ecchi-eng/mypage/wishlist' : 'https://www.dlsite.com/ecchi-eng/mypage/wishlist'"><i>Favorites</i></a><template v-if="hasUnboughtFavorites" v-cloak><a href="https://www.dlsite.com/ecchi-eng/mypage/wishlist/=/discount/1" class="notificationBadge" >On SALE</a></template>
         </li>
         <li class="globalNav-item type-cart"><a href="https://www.dlsite.com/ecchi-eng/cart"><i>Cart</i></a><span v-if="cartActives.length" v-cloak class="cartBadge" v-text="Math.min(cartActives.length, 100)"></span></li>
-        <li class="globalNav-item type-play"><a rel="noopener" href="https://play.dlsite.com/eng/" target="_blank"><i>My Items</i></a></li>
+        <li class="globalNav-item type-play"><a href="https://play.dlsite.com/eng/" target="_blank"><i>My Items</i></a></li>
         <li class="globalNav-item type-mypage"><a href="https://ssl.dlsite.com/ecchi-eng/mypage"><i>My Page</i></a></li>
       </ul>
       <!-- /アイコンメニュー -->
-      <!-- ガイドメニュー -->
-      <div class="header_guide hover_menu">
-        <a href="javascript:void(0)" class="header_guide_btn"><i>Help</i></a>
-        <div class="dropdown_list">
-          <div class="dropdown_list_inner">
-            <ul class="menu_list">
-              <li class="menu_list_item"><a rel="noopener" href="https://www.dlsite.com/ecchi-eng/faq/=/type/user" target="_blank"><i>Help / FAQ</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome"><i>New to DLsite?</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/ecchi-eng/circle/invite"><i>Submit Your Works</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/payment"><i>About Payment Method</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint"><i>About Points</i></a></li>
-            </ul>
-          </div>
+      <!-- ガイドメニュー --> 
+      <div class="globalGuide"><a href="#" class="globalGuide-btn" @click.stop.prevent="toggleMenu()"><i>Help</i></a>
+        <div class="globalGuideLink" :class="{ 'is-active': isActive }">
+          <ul class="globalGuideLink-item">
+            <li class="link"><a href="https://www.dlsite.com/ecchi-eng/faq/=/type/user" target="_blank"><i>Help / FAQ</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/ecchi-eng/welcome"><i>New to DLsite?</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/ecchi-eng/circle/invite"><i>Submit Your Works</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/ecchi-eng/guide/payment"><i>About Payment Method</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint"><i>About Points</i></a></li>
+          </ul>
         </div>
       </div>
       <!-- /ガイドメニュー -->
@@ -263,22 +260,18 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
 
                 <div class="floorNavLink"><div class="floorNavLink-item type-general"><a href="https://www.dlsite.com/eng/">Hide R18 Products</a></div></div>
               </div>
-      <div class="floorSubNav">
-        <div class="floorSubNav-item">
-          <ul class="headerNav">
-                        <li class="headerNav-item">
-              <a v-if="isRankingFilterCondition" v-cloak href="https://www.dlsite.com/ecchi-eng/ranking/week?date=30d">Ranking</a>
-              <a v-else href="https://www.dlsite.com/ecchi-eng/ranking/week">Ranking</a>
-            </li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/translation">English Version</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/campaign/241">Discount</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/new">Releases</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/announce/list/day">Upcoming</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/circle/list">Circle</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/fs">Advanced Search</a></li>
-                      </ul>
-        </div>
-      </div>
+      <ul class="headerNav">
+                <li class="headerNav-item">
+          <a v-if="isRankingFilterCondition" v-cloak href="https://www.dlsite.com/ecchi-eng/ranking/week?date=30d">Ranking</a>
+          <a v-else href="https://www.dlsite.com/ecchi-eng/ranking/week">Ranking</a>
+        </li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/translation">English Version</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/campaign/241">Discount</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/new">Releases</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/announce/list/day">Upcoming</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/circle/list">Circle</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/ecchi-eng/fs">Advanced Search</a></li>
+              </ul>
     </div>
   </div>
 </header>
@@ -302,21 +295,7 @@ if ($.cookie('loginchecked') >= 1) {
 
 <!--data-vue-component="header-banner"-->
 <div data-vue-component="header-banner" data-vue-async="true" data-section_name="campaign_header_banner">
-    <div v-if="loading" class="hd_cp_banner type_1bn">
-    <ul class="cp_bn_list">
-            <li class="cp_bn_item type_15">
-        <a href="https://www.dlsite.com/ecchi-eng/campaign/sale201907">
-          <div class="cp_bn_inner">
-            <div class="cp_bn_reminder">
-              <div class="cp_bn_reminder_content"><i class="cp_bn_reminder_period type_date">~ SEP 17,</i><i class="cp_bn_reminder_period type_time">14:00</i></div>
-            </div>
-            <div class="cp_bn"><img src="/images/campaign/doujin_sale_1907/bn_hd_cp_01_eng.png"></div>
-                        <div class="cp_bn_work blank"></div>
-                      </div>
-        </a>
-      </li>
-          </ul>
-  </div>
+    <div v-if="loading"></div>
     
   <div v-else-if="is_show_frame" :class="style" class="hd_cp_banner" v-cloak>
     <ul class="cp_bn_list">
@@ -392,17 +371,17 @@ if ($.cookie('loginchecked') >= 1) {
 <!-- main_inner -->
 <div id="main_inner">
 <div id="work_header" data-section_name="work_header">
-  <div id="work_left">
-    <table cellspacing="0" id="work_value" data-vue-component="product-evaluate" data-product-id="RE144678">
+  <div id="work_left" data-vue-component="product-evaluate" data-product-id="RE144678">
+    <table cellspacing="0" id="work_value">
       <tr>
         <td class="work_rankin">
           <table cellspacing="0">
             <tr>
-              <td v-if="product.ranks.total" v-cloak class="crown_total" :title="$t('product.evaluate.ranking_total'  , [ product.ranks.total.rank_date, product.ranks.total.rank ])">&nbsp;</td>
-              <td v-if="product.ranks.year"  v-cloak class="crown_year"  :title="$t('product.evaluate.ranking_year'   , [ product.ranks.year.rank_date , product.ranks.year.rank  ])">&nbsp;</td>
-              <td v-if="product.ranks.month" v-cloak class="crown_month" :title="$t('product.evaluate.ranking_monthly', [ product.ranks.month.rank_date, product.ranks.month.rank ])">&nbsp;</td>
-              <td v-if="product.ranks.week"  v-cloak class="crown_week"  :title="$t('product.evaluate.ranking_weekly' , [ product.ranks.week.rank_date , product.ranks.week.rank  ])">&nbsp;</td>
-              <td v-if="product.ranks.day"   v-cloak class="crown_hour"  :title="$t('product.evaluate.ranking_daily'  , [ product.ranks.day.rank_date  , product.ranks.day.rank   ])">&nbsp;</td>
+            <td v-if="product.ranks.total" v-cloak class="crown_total" :title="'Total ranking (' + product.ranks.total.rank_date + ') / ' + product.ranks.total.rank">&nbsp;</td>
+            <td v-if="product.ranks.year" v-cloak class="crown_year" :title="'Year ' + product.ranks.year.rank_date + ' ranking / ' + product.ranks.year.rank">&nbsp;</td>
+            <td v-if="product.ranks.month" v-cloak class="crown_month" :title="'Monthly chart (' + product.ranks.month.rank_date + ') / ' + product.ranks.month.rank">&nbsp;</td>
+            <td v-if="product.ranks.week" v-cloak class="crown_week" :title="'Weekly chart (' + product.ranks.week.rank_date + ') / ' + product.ranks.week.rank">&nbsp;</td>
+            <td v-if="product.ranks.day" v-cloak class="crown_hour" :title="'Daily chart (' + product.ranks.day.rank_date + ') / ' + product.ranks.day.rank">&nbsp;</td>
             </tr>
           </table>
         </td>
@@ -481,26 +460,18 @@ if ($.cookie('loginchecked') >= 1) {
 </div>
 
         </td>
-        <td v-if="product.review_count" v-cloak class="work_review">
-          <a class="_review_count" href="#review_link"><div :title="$t('product.evaluate.with_review')" v-text="product.review_count"></div></a>
-        </td>
-                  <!-- 販売 / DL数 -->
-          <td class="work_dl" v-if="product.dl_count !== undefined && product.dl_count > 0" v-cloak>
-            <div v-html="$t('product.evaluate.purchase_count', [ product.dl_count ])"></div>
-          </td>
-          <!-- お気に入り数 -->
-          <td class="work_dl" v-if="product.wishlist_count !== undefined && product.wishlist_count > 0" v-cloak>
-            <div v-html="$t('product.evaluate.favorite_count', [ product.wishlist_count ])"></div>
-          </td>
+        <td v-if="product.review_count" v-cloak class="work_review"><a class="_review_count" href="#review_link"><div title="レビューあり">({{ product.review_count }})</div></a></td>
+                <td class="work_dl" v-if="product.dl_count !== undefined && product.dl_count > 0" v-cloak><div>Purchased:&nbsp;<span class="_dl_count">{{ product.dl_count }}</span>&nbsp;times</div></td>
+        <td class="work_dl" v-if="product.wishlist_count !== undefined && product.wishlist_count > 0" v-cloak><div>Favorited:&nbsp;<span>{{ product.wishlist_count }}</span></div></td>
               </tr>
     </table>
 
       <div itemprop="aggregateRating" itemscope itemtype="https://schema.org/AggregateRating">
       <meta itemprop="ratingValue" content="4.84" />
-      <meta itemprop="ratingCount" content="517" />
+      <meta itemprop="ratingCount" content="515" />
     </div>
   
-<div data-vue-component="product-slider" data-product-id="RE144678">
+<product-slider product_id="RE144678" inline-template>
 
 <div class="product-slider">
   <!-- Sample image data -->
@@ -554,10 +525,9 @@ if ($.cookie('loginchecked') >= 1) {
   </div>
   <div v-cloak class="work_slider_comp" v-if="items.length > 1">
 
-    <a rel="noopener" href="https://www.dlsite.com/ecchi-eng/popup/=/file/smp1/product_id/RE144678.html" target="_blank">Display in HTML format</a>
+    <a href="https://www.dlsite.com/ecchi-eng/popup/=/file/smp1/product_id/RE144678.html" target="_blank">Display in HTML format</a>
 
-    <!-- 枚数 -->
-    <span v-t="{ path: 'product.slider.totalImages', args: [items.length] }"></span>
+    <span>{{ __('totalImages', {count: items.length}) }}</span>  
   </div>
 
   <!-- Popup viewer -->
@@ -567,7 +537,7 @@ if ($.cookie('loginchecked') >= 1) {
       <div class="slider_popup_rightpane">
         <div class="slider_popup_sidebar">
         <template v-for="(item, index) in items">
-          <div rel="noopener" target="_blank" :class="{active:(index === swiper.realIndex)}" @click="slideTo(index, false)">
+          <div target="_blank" :class="{active:(index === swiper.realIndex)}" @click="slideTo(index, false)">
 
             <img :src="item.thumb.src" alt="NEKOPARA vol.1 [NEKO WORKs]">
 
@@ -592,15 +562,15 @@ if ($.cookie('loginchecked') >= 1) {
         </div>
         <div class="slider_popup_tool">
           <input id="target1" class="checkbox" name="target" type="checkbox" value="1" v-model="alwaysActualSize" @change="toggleActualSize" @click="toggleActualSize">
-          <label for="target1" class="checkbox-label" v-t="'product.slider.alwaysActual'"></label>
-          <span class="slider_popup_description" v-t="'product.slider.tools'"></span>
+          <label for="target1" class="checkbox-label">{{ __('alwaysActual') }}</label>
+          <span class="slider_popup_description">{{ __('tools') }}</span>
         </div>
       </div>
     </div>
   </div>
 
 </div>
-</div>
+</product-slider>
 
 
   </div>
@@ -640,7 +610,7 @@ if ($.cookie('loginchecked') >= 1) {
         <tr>
           <th>Work Format</th>
           <td>
-            <div class="work_genre"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/work_type/ADV/from/icon.work"><span class="icon_ADV" title="Adventure">Adventure</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/SND/from/icon.work"><span class="icon_SND" title="Inc. Voice">Inc. Voice</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/MS2/from/icon.work"><span class="icon_MS2" title="Inc. Music">Inc. Music</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/MV2/from/icon.work"><span class="icon_MV2" title="Inc. Anime">Inc. Anime</span></a></div>
+            <div class="work_genre"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/work_type/ADV/from/icon.work"><span class="icon_ADV" title="Adventure">Adventure</span></a></div>
           </td>
         </tr>
 
@@ -660,12 +630,17 @@ if ($.cookie('loginchecked') >= 1) {
           </td>
         </tr>
 
-                
+        <tr>
+          <th>Option</th>
+          <td>
+            <div class="work_genre"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/SND/from/icon.work"><span class="icon_SND" title="Inc. Voice">Inc. Voice</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/MS2/from/icon.work"><span class="icon_MS2" title="Inc. Music">Inc. Music</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/MV2/from/icon.work"><span class="icon_MV2" title="Inc. Anime">Inc. Anime</span></a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/work_category%5B0%5D/doujin/options/TRI/from/icon.work"><span class="icon_TRI" title="Trial">Trial</span></a></div>
+          </td>
+        </tr>
+
 
         <tr><th>Event</th><td><span class="icon_EVT" title="Comic Market 87"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/ana_flg/all/options/C87/from/icon.work">Comic Market 87</a></span></td></tr>
 
-        <tr><th>Genre</th><td><div class="main_genre"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/051/from/work.genre">Moe</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/455/from/work.genre">Love Comedy/Romcom</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/288/from/work.genre">Master and Servant</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/175/from/work.genre">Nekomimi (Cat Ears)</a>
-</div></td></tr>
+        <tr><th>Genre</th><td><div class="main_genre"><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/051/from/work.genre">Moe</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/288/from/work.genre">Master and Servant</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/455/from/work.genre">Funny Love Story</a><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/175/from/work.genre">Nekomimi (Cat Ears)</a></div></td></tr>
 
         <tr><th>File Size</th><td><div class="main_genre">1.87GB</div></td></tr>
 
@@ -683,7 +658,7 @@ if ($.cookie('loginchecked') >= 1) {
 <li>
   <div id="work_win_only">
     <strong>Necessary Settings</strong>
-    <span>The application may not function unless a <span style="color:#f00">Japanese language pack</span> is set properly in your PC / the <span style="color:#f00">System Locale</span> is set to Japanese. For more details, please refer to [ <a rel="noopener" href="https://www.dlsite.com/ecchi-eng/faq/detail/=/type/user/mid/7/did/296" target="_blank">How can I set my system locale to Japanese?</a> ] on the Frequently Asked Questions page.</span>
+    <span>The application may not function unless a <span style="color:#f00">Japanese language pack</span> is set properly in your PC / the <span style="color:#f00">System Locale</span> is set to Japanese. For more details, please refer to [ <a href="https://www.dlsite.com/ecchi-eng/faq/detail/=/type/user/mid/7/did/296" target="_blank">How can I set my system locale to Japanese?</a> ] on the Frequently Asked Questions page.</span>
   </div>
 </li>
 
@@ -1077,32 +1052,34 @@ jQuery(function($){
 
 <div class="work_article" id="work_review" data-section_name="work_review">
 
-    <table class="reviewer_most_genre" cellspacing="0">
-    <tbody>
-      <tr>
-        <th>
-          <p>Frequent keywords the reviewers selected :</p>
-        </th>
-        <td>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/112/from/work.review_genre">Vanilla Sex（10）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/123/from/work.review_genre">Consensual Sex（5）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/128/from/work.review_genre">Internal Cumshot（4）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/138/from/work.review_genre">Blowjob（4）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/078/from/work.review_genre">Maid（3）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/176/from/work.review_genre">Animal Ears（3）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/175/from/work.review_genre">Nekomimi (Cat Ears)（3）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/004/from/work.review_genre">Romance（3）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/206/from/work.review_genre">Girl（3）</a></span>
-                    <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/013/from/work.review_genre">Heartwarming（3）</a></span>
-                  </td>
-      </tr>
-    </tbody>
-  </table>
-  
-  <div class="review_head">
+  <!-- review_head -->
+  <div class="review_head clearfix">
     <p class="float_l review_count"><span class="fs20">18</span> user reviews</p>
-          <template data-vue-component="product-review-order" data-layout="pc" data-product_id="RE144678"></template>
+        <div class="review_total_box">
+      <table class="reviewer_most_genre" cellspacing="0">
+        <tbody>
+          <tr>
+            <th>
+              <p>Frequent keywords the reviewers selected :</p>
+            </th>
+            <td>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/112/from/work.review_genre">Vanilla Sex（10）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/123/from/work.review_genre">Consensual Sex（5）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/128/from/work.review_genre">Internal Cumshot（4）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/138/from/work.review_genre">Blowjob（4）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/078/from/work.review_genre">Maid（3）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/176/from/work.review_genre">Animal Ears（3）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/175/from/work.review_genre">Nekomimi (Cat Ears)（3）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/004/from/work.review_genre">Romance（3）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/206/from/work.review_genre">Girl（3）</a></span>
+                            <span><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/013/from/work.review_genre">Heartwarming（3）</a></span>
+                          </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
       </div>
+  <!-- /review_head -->
 
   <!-- work_review_list -->
   <table id="work_review_list" cellspacing="0">
@@ -1134,7 +1111,7 @@ jQuery(function($){
                             <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/123/from/review.genre">Consensual Sex</a></li>
                             <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/489/from/review.genre">Cum Swallow</a></li>
                             <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/488/from/review.genre">Oral Cumshot</a></li>
-                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/462/from/review.genre">Heterosexual/Nonke</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/462/from/review.genre">Straight</a></li>
                             <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/463/from/review.genre">Bisexual</a></li>
                           </ul>
           </div>
@@ -1236,14 +1213,10 @@ If you know Sayori and or like cat girls, pick this game up, Even if you don&#03
       <tr>
         <td class="review_title">
                     <div class="review_title_l">
-          <div class="title">Quite a lengthy VN, full of rich color and cute characters.</div>
+          <div class="title">Totally Loved It</div>
           <p>
-            Jan/16/2015&nbsp;&nbsp;By <a href="https://www.dlsite.com/ecchi-eng/reviewlist/=/reviewer/REN0001473">Luck</a>                          <span class="popularity_reviewer bronze">Top Reviewer: Top400</span>
-                                    <span class="purchased">Verified Buyer</span>
+            Jan/09/2018&nbsp;&nbsp;By <a href="https://www.dlsite.com/ecchi-eng/reviewlist/=/reviewer/REN0002754">jlgddb</a>                                    <span class="purchased">Verified Buyer</span>
                       </p>
-          </div>
-                    <div class="review_title_r">
-            <span class="reviewer_recommend">Loved it！</span>
           </div>
                   </td>
       </tr>
@@ -1252,22 +1225,20 @@ If you know Sayori and or like cat girls, pick this game up, Even if you don&#03
                     <div class="reviewer_genre">
             <p>Keywords the reviewer selected :</p>
             <ul class="reviewer_select_genre">
-                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/152/from/review.genre">Tease</a></li>
-                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/112/from/review.genre">Vanilla Sex</a></li>
-                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/116/from/review.genre">Orgy Sex</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/058/from/review.genre">Totally Happy</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/138/from/review.genre">Blowjob</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/140/from/review.genre">Sexual Training</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/123/from/review.genre">Consensual Sex</a></li>
+                            <li><a href="https://www.dlsite.com/ecchi-eng/fsr/=/genre/488/from/review.genre">Oral Cumshot</a></li>
                           </ul>
           </div>
           
           
           <div class="_SW2" >
-            <p class="reviewer_descrip">This is probably one of the most high quality neko-themed VN ever released. Though there really isn&#039;t much depth to Nekopara&#039;s story, the game makes it up with the most adorable cat duo ever made.<br />
-<br />
-The story follows the MC just opening his own bakery shop. Before opening, he stumbled upon two heavy boxes, and in them were Vanilla and Chocola, his sister&#039;s two catgirls.<br />
-<br />
-Without going into too much depth, the story is pretty much a slice-of-life kind of thing. Oh, and the H-scene? Yeah, they&#039;re animated.</p>
+            <p class="reviewer_descrip">I totally enjoyed Nekopara Volume 1. So much so that I purchased the other two volumes as well. The visual novel has a very good set of tools that give you a lot of control over how it displays and works - bounciness, text display speed, text display time, etc., that add a lot to the story. The graphics and artwork are outstanding, and the story line is charming and entertaining. What makes this an outstanding work, though, are the voice actors. Each one brings her character to life through their energy and emotion. Even the &quot;G&quot; rated versions available on Steam, without the X-rated scenes, are very good. But you won&#039;t want to miss those, so either purchase the full X-rated versions on DL Site, or the Steam add-on packs to get the full versions. Of course, if you purchase on Steam you get the trading cards, if you&#039;re into that sort of thing.</p>
             <p class="review_ref">
-              <input value="Helpful" type="button" class="_btn_good_review btn_default" data-review_id="8979" data-product_id="RE144678">
-              <span class="useful">5 users found this helpful.</span>              <span class="review_report">[&nbsp;<a href="https://ssl.dlsite.com/ecchi-eng/contact/review/=/reviewer_id/REN0001473/product_id/RE144678.html">Report Abuse</a>&nbsp;]</span>
+              <input value="Helpful" type="button" class="_btn_good_review btn_default" data-review_id="14366" data-product_id="RE144678">
+              <span class="useful">1 users found this helpful.</span>              <span class="review_report">[&nbsp;<a href="https://ssl.dlsite.com/ecchi-eng/contact/review/=/reviewer_id/REN0002754/product_id/RE144678.html">Report Abuse</a>&nbsp;]</span>
             </p>
             <p class="mini_message _review_message" style="display: none;">&nbsp;</p>
           </div>
@@ -1280,7 +1251,7 @@ Without going into too much depth, the story is pretty much a slice-of-life kind
                     <div class="review_title_l">
           <div class="title">An amazing game</div>
           <p>
-            Dec/10/2017&nbsp;&nbsp;By <a href="https://www.dlsite.com/ecchi-eng/reviewlist/=/reviewer/REN0001802">KTEZ</a>                          <span class="popularity_reviewer gold">Top Reviewer: 10th</span>
+            Dec/10/2017&nbsp;&nbsp;By <a href="https://www.dlsite.com/ecchi-eng/reviewlist/=/reviewer/REN0001802">KTEZ</a>                          <span class="popularity_reviewer gold">Top Reviewer: 9th</span>
                                     <span class="purchased">Verified Buyer</span>
                       </p>
           </div>
@@ -1439,7 +1410,7 @@ jQuery(function($){
         <div v-if="product.is_discount || product.is_pointup || rentaled" class="campaign_info">
           <p v-if="rentaled" class="type_rental"><span>レンタル期間中割引<span class="limit">あと{{ rentaled.limit }}</span><span class="period">{{ rentaled.period }}まで</span></span></p>
           <p v-if="product.is_discount" class="type_sale">
-            <a rel="noopener"    v-if="product.discount_to" :href="product.discount_to" :title="product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF'" target="_blank"><span>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span></a>
+            <a    v-if="product.discount_to" :href="product.discount_to" :title="product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF'" target="_blank"><span>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span></a>
             <span v-else>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span>
           </p>
         </div>
@@ -1505,7 +1476,7 @@ jQuery(function($){
       </template>
       <template v-else>
         <template v-if="is_bought">
-          <p class="work_stream"><a rel="noopener" href="https://play.dlsite.com/eng/?workno=RE144678" class="btn_st" :class="{ disabled: ! product.dlsiteplay_work || product.dl_format == 16 }" title="Open in DLsite Play" target="_blank">Open in DLsite Play</a></p>
+          <p class="work_stream"><a href="https://play.dlsite.com/eng/?workno=RE144678" class="btn_st" :class="{ disabled: ! product.dlsiteplay_work || product.dl_format == 16 }" title="Open in DLsite Play" target="_blank">Open in DLsite Play</a></p>
           <p class="work_cart"><a :href="product.down_url" class="btn_dl" :class="{ disabled: product.dl_format == 17 }">Download</a></p>
         </template>
         <template v-else-if="is_already">
@@ -1561,7 +1532,7 @@ jQuery(function($){
           <div class="work_buy_body">
             <div class="work_buy_label">Price</div>
             <div class="work_buy_content">
-              <span class="price">$20.18&nbsp;/&nbsp;&euro;18.32<i class="work_estimation">(estimation)</i><i class="work_jpy">2,160 JPY</i></span>
+              <span class="price">$19.90&nbsp;/&nbsp;&euro;17.66<i class="work_estimation">(estimation)</i><i class="work_jpy">2,160 JPY</i></span>
             </div>
           </div>
         </div>
@@ -1653,7 +1624,7 @@ jQuery(function($){
     <p v-if="product.is_rental" class="guide_message">レンタルでは購入特典は<br>付与されません。</p>
     
     <ul class="guide_list">
-      <li><a rel="noopener" href="https://www.dlsite.com/ecchi-eng/faq/detail/=/type/user/mid/5/did/297" target="_blank">About Purchase Bonus</a></li>
+      <li><a href="https://www.dlsite.com/ecchi-eng/faq/detail/=/type/user/mid/5/did/297" target="_blank">About Purchase Bonus</a></li>
     </ul>
   </div>
 
@@ -1695,8 +1666,8 @@ jQuery(function($){
       </thead>
       <tbody>
         <tr>
-                    <td v-if="user.os == 'Mac'" v-cloak></td>
-          <td v-else>Vista / 7 / 8</td>
+          <td v-if="user.os == 'Mac'" v-cloak>-</td>
+          <td v-else>WindowsVista / Windows7 / Windows8</td>
         </tr>
       </tbody>
     </table>
@@ -1712,7 +1683,7 @@ jQuery(function($){
         <tbody>
           <tr>
             <td>Windows</td>
-            <td>Vista / 7 / 8</td>
+            <td>WindowsVista / Windows7 / Windows8</td>
           </tr>
                     <tr>
             <td>Mac</td>
@@ -1760,31 +1731,31 @@ jQuery(function($){
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE205281.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ206000/RJ205281_img_sam_mini.jpg" alt="Nekopara vol.2 R18 DLC for Steam [NEKO WORKs]" title="Nekopara vol.2 R18 DLC for Steam [NEKO WORKs]"  class="target_type" /></a></td>
         <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE205281.html">Nekopara vol.2 R18 DLC for Steam</a></span>
-          <span class="work_price">$9.08</span>
+          <span class="work_price">$8.95</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE205284.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ206000/RJ205284_img_sam_mini.jpg" alt="Nekopara vol.1 R18 DLC for Steam [NEKO WORKs]" title="Nekopara vol.1 R18 DLC for Steam [NEKO WORKs]"  class="target_type" /></a></td>
         <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE205284.html">Nekopara vol.1 R18 DLC for Steam</a></span>
-          <span class="work_price">$9.08</span>
+          <span class="work_price">$8.95</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE200500.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ201000/RJ200500_img_sam_mini.jpg" alt="NEKOPARA Vol.3 Aromatiser des filles-chats [NEKO WORKs]" title="NEKOPARA Vol.3 Aromatiser des filles-chats [NEKO WORKs]"  class="target_type" /></a></td>
         <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE200500.html">NEKOPARA Vol.3 Aromatiser des filles-chats</a></span>
-          <span class="work_price">$20.18</span>
+          <span class="work_price">$19.90</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE200911.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ201000/RJ200911_img_sam_mini.jpg" alt="Nekopara vol.3 R18 DLC for Steam [NEKO WORKs]" title="Nekopara vol.3 R18 DLC for Steam [NEKO WORKs]"  class="target_type" /></a></td>
         <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE200911.html">Nekopara vol.3 R18 DLC for Steam</a></span>
-          <span class="work_price">$9.08</span>
+          <span class="work_price">$8.95</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE170327.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ171000/RJ170327_img_sam_mini.jpg" alt="NEKOPARA vol.2 Des soeurs filles-chat tres gentilles [NEKO WORKs]" title="NEKOPARA vol.2 Des soeurs filles-chat tres gentilles [NEKO WORKs]"  class="target_type" /></a></td>
         <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/ecchi-eng/work/=/product_id/RE170327.html">NEKOPARA vol.2 Des soeurs filles-chat tres gentilles</a></span>
-          <span class="work_price">$20.18</span>
+          <span class="work_price">$19.90</span>
         </td>
       </tr>
             </table>
@@ -1841,103 +1812,97 @@ jQuery(function($){
 
 
 
+
+
 <!-- footer -->
 <div id="footer" data-section_name="footer">
     
     <div class="pagetop_block clearfix">
     <p class="pagetop"><a href="#header">Back to Top</a></p>
 </div>
-<div class="footer_floor_nav">
-<ul class="floor_list">
-<li class="floor_list_item"><a href="https://www.dlsite.com/">DLsite Home Page</a></li>
-<li class="floor_list_item"><a href="https://www.dlsite.com/eng/">Doujin</a></li>
-<li class="floor_list_item"><a href="https://www.dlsite.com/ecchi-eng/">Adult Doujin</a></li>
-<li class="floor_list_item sp_switch"><a id="_touch_link" href="https://www.dlsite.com/ecchi-eng-touch/work/=/product_id/RE144678.html" data-platform="touch">For Smartphone</a></li>
+<div class="footer_link_01">
+<ul>
+<li><a href="https://www.dlsite.com/">DLsite Home Page</a></li>
+<li><a href="https://www.dlsite.com/eng/">Doujin</a></li>
+<li><a href="https://www.dlsite.com/ecchi-eng/">Adult Doujin</a></li>
+<li class="sp_switch"><a id="_touch_link" href="https://www.dlsite.com/ecchi-eng-touch/work/=/product_id/RE144678.html" data-platform="touch">DLsite Mobile Site</a></li>
 </ul>
 </div>
 
         <div class="footer_section">
-    <div class="footer_section_inner">
-        <div class="link_list_wrap">
-            <div class="link_list_box col_2">
+    <div class="section_container clearfix">
+        <ul class="link_list">
+            <li class="list_item">
                 <div class="label">About DLsite</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a rel="noopener" href="https://www.eisys.co.jp/company/company-overview.html" target="_blank">About our Company</a></li>
-                    <li class="link_list_item"><a rel="noopener" href="https://eisys.talentcld.com/" target="_blank">Career Information</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/user/regulations">User Agreement</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/law">Legal Statement (ASCT)</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/settlement">Legal Statement (PSA)</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/privacy">Privacy Policy</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/mosaic">Compliance Policy</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/copy">Copyright</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/banners">Link to DLsite</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/sitemap">Site Map</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.eisys.co.jp/company/company-overview.html" target="_blank">About our Company</a></dd>
+                    <dd><a href="https://eisys.talentcld.com/" target="_blank">Career Information</a></dd>
+                                                            <dd><a href="https://twitter.com/DLsiteEnglish" target="_blank" class="twitter">Twitter</a> / <a href="https://www.facebook.com/DLsite-English-159690760755693/" target="_blank" class="facebook">Facebook</a> / <a href="http://dlsite-english.tumblr.com/" target="_blank" class="tumblr">Tumblr</a></dd>
+                                    </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">Payment / Points</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/payment">Payment Methods</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint">About Points</a></li>
-                                        <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint#gp3">How to Buy Points</a></li>
-                                    </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/guide/payment">Payment Methods</a></dd>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint">About Points</a></dd>
+                                        <dd><a href="https://www.dlsite.com/ecchi-eng/mypage/aboutpoint#gp3">How to Buy Points</a></dd>
+                                    </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">Help / Guide</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome">New to DLsite?</a></li>
-                    <li class="link_list_item"><a rel="noopener" href="https://www.dlsite.com/ecchi-eng/faq/=/type/user" target="_blank">Frequently Asked Questions</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/opinion/contribution">Product Request / Feedback</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/welcome">New to DLsite?</a></dd>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/faq/=/type/user" target="_blank">Frequently Asked Questions</a></dd>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/opinion/contribution">Product Request / Feedback</a></dd>
+                    <dd><a href="https://ssl.dlsite.com/ecchi-eng/mypage/setting/mail">Newsletter</a></dd>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/sitemap">Site Map</a></dd>
+                </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">DLsite Services</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/circle/invite">Submit Your Works</a></li>
-                                        <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/guide/affiliate">Affiliate Program</a></li>
-                    <li class="link_list_item"><a href="https://ssl.dlsite.com/ecchi-eng/mypage/setting/mail">Newsletter</a></li>
-                                    </ul>
-            </div>
-        </div>
-    </div>
-    <div class="footer_section_inner sns">
-        <div class="label">Official SNS Accounts</div>
-        <ul class="footer_sns">
-                        <li class="footer_sns_item"><a rel="noopener" href="https://twitter.com/DLsiteEnglish" target="_blank" class="twitter">Twitter</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.facebook.com/DLsite-English-159690760755693/" target="_blank" class="facebook">Facebook</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="http://dlsite-english.tumblr.com/" target="_blank" class="tumblr">Tumblr</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.instagram.com/dlsite_english/" target="_blank" class="instagram">Instagram</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.youtube.com/channel/UCGKtTGBPGmB5d9jg-fIZc8w" target="_blank" class="youtube">Youtube</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://discordapp.com/channels/555918616793710592/" target="_blank" class="discord">Discord</a></li>
+                <dl>
+                    <dd><a href="https://www.dlsite.com/ecchi-eng/circle/invite">Submit Your Works</a></dd>
+                                        <dd><a href="https://www.dlsite.com/ecchi-eng/guide/affiliate">Affiliate Program</a></dd>
+                                    </dl>
+            </li>
                     </ul>
     </div>
-    <div class="footer_section_inner multilingual">
-        <div class="link_list_wrap">
-            <div class="link_list_box">
-                <div class="label">International</div>
-                <ul class="link_list type_horizontal">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/maniax/">日本語</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/">English</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com.tw/maniax/">繁體中文</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+    <div class="section_container type_multilingual clearfix">
+        <ul class="link_list">
+            <li class="list_item">
                 <div class="label">Global Guide</div>
-                <ul class="link_list type_horizontal">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome">English</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/deu">Deutsch</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/fra">Français</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/ita">Italiano</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/esp">Español</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/chi">繁體中文</a></li>
+                <dl>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome">English</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/deu">Deutsch</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/fra">Français</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/ita">Italiano</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/esp">Español</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/ecchi-eng/welcome/chi">繁體中文</a></dd>
                 </dl>
-            </div>
+            </li>
+        </ul>
+        <div class="language_container">
+            <div class="label">Language</div>
+            <select name="language" id="language_select" onchange="location.href=value;">
+                <option value="https://www.dlsite.com/maniax/" >日本語</option>
+                <option value="https://www.dlsite.com/ecchi-eng/" selected>English</option>
+                <option value="https://www.dlsite.com.tw/maniax/">繁體中文</option>
+            </select>
         </div>
     </div>
 </div>
 <div id="copyright">
     <div class="container clearfix">
         <div id="system">Recommended browsers: The latest version of Internet Explorer, Microsoft Edge, Safari, Chrome or Firefox with JavaScript/cookies enabled.</div>
+        <ul id="footer_nav">
+            <li><a href="https://www.dlsite.com/ecchi-eng/user/regulations">User Agreement</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/guide/law">Legal Statement (ASCT)</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/guide/settlement">Legal Statement (PSA)</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/guide/privacy">Privacy Policy</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/mosaic">Compliance Policy</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/guide/copy">Copyright</a></li>
+            <li><a href="https://www.dlsite.com/ecchi-eng/banners">Link to DLsite</a></li>
+        </ul>
         <p>&copy; 1996 DLsite</p>
     </div>
 </div>
@@ -1962,8 +1927,8 @@ jQuery(function($){
 
 <div data-vue-component="cookie-policy" data-async="true"></div>
 
-<script type="text/javascript" src="/vue/js/pc/vendor.js?cdn_cache=1&v=0.1.2&_=1561425273"></script>
-<script type="text/javascript" src="/vue/js/pc/app.js?cdn_cache=1&v=0.1.2&_=1567559800"></script>
+<script type="text/javascript" src="/vue/js/pc/vendor.js?cdn_cache=1&v=0.1.2&_=1536029038"></script>
+<script type="text/javascript" src="/vue/js/pc/app.js?cdn_cache=1&v=0.1.2&_=1559289223"></script>
 
 
 <script type="text/javascript">
@@ -2006,6 +1971,6 @@ div.measure_tag {
 
 
 <!-- /script_footer -->
-<script type="text/javascript">var contents = {"impression":[],"detail":[{"id":"RE144678","name":"NEKOPARA vol.1","category":"ecchieng","brand":"RG23422","price":2000,"regist_date":"2014\/12\/30","image_main":"\/\/img.dlsite.jp\/modpub\/images2\/work\/doujin\/RJ145000\/RJ144678_img_main.jpg","restore_price":null}],"time":0.00011491775512695312};</script>
+<script type="text/javascript">var contents = {"impression":[],"detail":[{"id":"RE144678","name":"NEKOPARA vol.1","category":"ecchieng","brand":"RG23422","price":2000,"regist_date":"2014\/12\/30","image_main":"\/\/img.dlsite.jp\/modpub\/images2\/work\/doujin\/RJ145000\/RJ144678_img_main.jpg","restore_price":null}],"time":0.00010609626770019531};</script>
 </body>
 </html>

tests/fixture/DLsite/testEng.html

@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:mixi="http://mixi-platform.com/ns#" xmlns:fb="http://www.facebook.com/2008/fbml" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:og="http://ogp.me/ns#" xmlns:mixi="http://mixi-platform.com/ns#" xmlns:fb="http://www.facebook.com/2008/fbml">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=1024">
+<meta name="viewport" content="width=991">
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <meta name="google-site-verification" content="S2Jzwn_Dm4hGoyTfPnxEUSKnbHSuT73N6SZbTanWbEM" />
@@ -42,20 +42,20 @@
 <script>/dlsite_dozen=/.test(document.cookie) || (document.cookie = 'dlsite_dozen=' + Math.floor(Math.random() * 12) + '; path=/; max-age=63072000')</script>
 
 <link rel="stylesheet" href="/css/reset.css?1459221919" type="text/css" id="reset" />
-<link rel="stylesheet" href="/css/default_eng.css?1566881566" type="text/css" id="default" />
+<link rel="stylesheet" href="/css/default_eng.css?1559631936" type="text/css" id="default" />
 <link rel="stylesheet" href="/css/layout_2col_work_eng.css?1552988739" type="text/css" id="layout_2col_work" />
-<link rel="stylesheet" href="/css/common_eng.css?1567473359" type="text/css" id="common" />
-<link rel="stylesheet" href="/css/switch_eng.css?1560415705" type="text/css" id="switch" />
-<link rel="stylesheet" href="/css/suggest.css?1565749496" type="text/css" id="suggest" />
-<link rel="stylesheet" href="/css/header_campaign_banner.css?1567745943" type="text/css" id="header_campaign_banner" />
+<link rel="stylesheet" href="/css/common_eng.css?1559631936" type="text/css" id="common" />
+<link rel="stylesheet" href="/css/switch_eng.css?1551748184" type="text/css" id="switch" />
+<link rel="stylesheet" href="/css/suggest.css?1559631936" type="text/css" id="suggest" />
+<link rel="stylesheet" href="/css/header_campaign_banner.css?1559723711" type="text/css" id="header_campaign_banner" />
 <link rel="stylesheet" href="/assets/share/css/universal/universal.css?" type="text/css" id="universal" />
-<link rel="stylesheet" href="/css/work_template_eng.css?1566876049" type="text/css" id="work_template" />
+<link rel="stylesheet" href="/css/work_template_eng.css?1559631936" type="text/css" id="work_template" />
 <link rel="stylesheet" href="/css/work_slider.css?1559631936" type="text/css" id="work_slider" />
 
 <script type="text/javascript" src="/js/libs/libraries-pack.js?1502345903"></script>
-<script type="text/javascript" src="/js/dlsite_util.js?1561689497"></script>
+<script type="text/javascript" src="/js/dlsite_util.js?1557910552"></script>
 <script type="text/javascript" src="/js/slide_menu.js?1511946236"></script>
-<script type="text/javascript" src="/js/dlsite_suggest.js?1565749496"></script>
+<script type="text/javascript" src="/js/dlsite_suggest.js?1550024738"></script>
 <script type="text/javascript" src="/js/dlsite_trigger.js?1544681008"></script>
 <script type="text/javascript" src="/js/jquery.slideproduct.js?1524728551"></script>
 <script type="text/javascript" src="/js/dlsite_img_filter.js?1544681008"></script>
@@ -90,7 +90,7 @@ $.extend({
     if ($.useAdultcheck) return;
     $.useAdultcheck = true;
     var s = document.createElement('script');
-    s.src = '/js/adultcheck.js?1566881566';
+    s.src = '/js/adultcheck.js?1553837147';
     s.defer = true;
     document.querySelector('head').appendChild(s);
   }
@@ -130,7 +130,7 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
               </div>
               <ul class="eisysGroupHeaderLinkNav">
                 <li>
-                  <a rel="noopener" href="https://login.dlsite.com/user/self?lang=en&redirect_uri=https://www.dlsite.com/eng/" target="_blank">Account Management</a>
+                  <a href="https://login.dlsite.com/user/self?lang=en&redirect_uri=https://www.dlsite.com/eng/" target="_blank">Account Management</a>
                 </li>
                 <li>
                   <a class="logout" href="https://ssl.dlsite.com/eng/logout">Log out</a>
@@ -213,23 +213,20 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
             <a :href="hasUnboughtFavorites ? 'https://www.dlsite.com/eng/mypage/wishlist' : 'https://www.dlsite.com/eng/mypage/wishlist'"><i>Favorites</i></a><template v-if="hasUnboughtFavorites" v-cloak><a href="https://www.dlsite.com/eng/mypage/wishlist/=/discount/1" class="notificationBadge" >On SALE</a></template>
         </li>
         <li class="globalNav-item type-cart"><a href="https://www.dlsite.com/eng/cart"><i>Cart</i></a><span v-if="cartActives.length" v-cloak class="cartBadge" v-text="Math.min(cartActives.length, 100)"></span></li>
-        <li class="globalNav-item type-play"><a rel="noopener" href="https://play.dlsite.com/eng/" target="_blank"><i>My Items</i></a></li>
+        <li class="globalNav-item type-play"><a href="https://play.dlsite.com/eng/" target="_blank"><i>My Items</i></a></li>
         <li class="globalNav-item type-mypage"><a href="https://ssl.dlsite.com/eng/mypage"><i>My Page</i></a></li>
       </ul>
       <!-- /アイコンメニュー -->
-      <!-- ガイドメニュー -->
-      <div class="header_guide hover_menu">
-        <a href="javascript:void(0)" class="header_guide_btn"><i>Help</i></a>
-        <div class="dropdown_list">
-          <div class="dropdown_list_inner">
-            <ul class="menu_list">
-              <li class="menu_list_item"><a rel="noopener" href="https://www.dlsite.com/eng/faq/=/type/user" target="_blank"><i>Help / FAQ</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/eng/welcome"><i>New to DLsite?</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/eng/circle/invite"><i>Submit Your Works</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/eng/guide/payment"><i>About Payment Method</i></a></li>
-              <li class="menu_list_item"><a href="https://www.dlsite.com/eng/mypage/aboutpoint"><i>About Points</i></a></li>
-            </ul>
-          </div>
+      <!-- ガイドメニュー --> 
+      <div class="globalGuide"><a href="#" class="globalGuide-btn" @click.stop.prevent="toggleMenu()"><i>Help</i></a>
+        <div class="globalGuideLink" :class="{ 'is-active': isActive }">
+          <ul class="globalGuideLink-item">
+            <li class="link"><a href="https://www.dlsite.com/eng/faq/=/type/user" target="_blank"><i>Help / FAQ</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/eng/welcome"><i>New to DLsite?</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/eng/circle/invite"><i>Submit Your Works</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/eng/guide/payment"><i>About Payment Method</i></a></li>
+            <li class="link"><a href="https://www.dlsite.com/eng/mypage/aboutpoint"><i>About Points</i></a></li>
+          </ul>
         </div>
       </div>
       <!-- /ガイドメニュー -->
@@ -255,22 +252,18 @@ if ((dlsite.isAdult() && dlsite.getId() !== 'circle' && !(dlsite.isFemale() && d
 
                 <div class="floorNavLink"><div class="floorNavLink-item type-adult"><a href="https://www.dlsite.com/ecchi-eng/">View R18 Products</a></div></div>
               </div>
-      <div class="floorSubNav">
-        <div class="floorSubNav-item">
-          <ul class="headerNav">
-                        <li class="headerNav-item">
-              <a v-if="isRankingFilterCondition" v-cloak href="https://www.dlsite.com/eng/ranking/month?date=30d">Ranking</a>
-              <a v-else href="https://www.dlsite.com/eng/ranking/month">Ranking</a>
-            </li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fsr/=/options/ENG">English Version</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fsr/=/campaign/241">Discount</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/new">Releases</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/announce/list/day">Upcoming</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/circle/list">Circle</a></li>
-            <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fs">Advanced Search</a></li>
-                      </ul>
-        </div>
-      </div>
+      <ul class="headerNav">
+                <li class="headerNav-item">
+          <a v-if="isRankingFilterCondition" v-cloak href="https://www.dlsite.com/eng/ranking/month?date=30d">Ranking</a>
+          <a v-else href="https://www.dlsite.com/eng/ranking/month">Ranking</a>
+        </li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fsr/=/options/ENG">English Version</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fsr/=/campaign/241">Discount</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/new">Releases</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/announce/list/day">Upcoming</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/circle/list">Circle</a></li>
+        <li class="headerNav-item"><a href="https://www.dlsite.com/eng/fs">Advanced Search</a></li>
+              </ul>
     </div>
   </div>
 </header>
@@ -294,21 +287,7 @@ if ($.cookie('loginchecked') >= 1) {
 
 <!--data-vue-component="header-banner"-->
 <div data-vue-component="header-banner" data-vue-async="true" data-section_name="campaign_header_banner">
-    <div v-if="loading" class="hd_cp_banner type_1bn">
-    <ul class="cp_bn_list">
-            <li class="cp_bn_item type_15">
-        <a href="https://www.dlsite.com/eng/campaign/sale201907">
-          <div class="cp_bn_inner">
-            <div class="cp_bn_reminder">
-              <div class="cp_bn_reminder_content"><i class="cp_bn_reminder_period type_date">~ SEP 17,</i><i class="cp_bn_reminder_period type_time">14:00</i></div>
-            </div>
-            <div class="cp_bn"><img src="/images/campaign/doujin_sale_1907/bn_hd_cp_01_eng.png"></div>
-                        <div class="cp_bn_work blank"></div>
-                      </div>
-        </a>
-      </li>
-          </ul>
-  </div>
+    <div v-if="loading"></div>
     
   <div v-else-if="is_show_frame" :class="style" class="hd_cp_banner" v-cloak>
     <ul class="cp_bn_list">
@@ -369,7 +348,7 @@ if ($.cookie('loginchecked') >= 1) {
 <h1 itemprop="name" id="work_name">
 <a href="https://www.dlsite.com/eng/work/=/product_id/RE228866.html" itemprop="url">With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]</a>
 </h1>
-<span class="link_twitter"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://dlsite.jp/enwtw/RE228866"  data-text="With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]/Triangle! 50%OFF Til Sep. 17, 2 p.m. (JST)" data-lang="en" data-hashtags="DLsite">Tweet</a>
+<span class="link_twitter"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://dlsite.jp/enwtw/RE228866"  data-text="With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]/Triangle!" data-lang="en" data-hashtags="DLsite">Tweet</a>
 <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 </span></div>
 </div>
@@ -384,17 +363,17 @@ if ($.cookie('loginchecked') >= 1) {
 <!-- main_inner -->
 <div id="main_inner">
 <div id="work_header" data-section_name="work_header">
-  <div id="work_left">
-    <table cellspacing="0" id="work_value" data-vue-component="product-evaluate" data-product-id="RE228866">
+  <div id="work_left" data-vue-component="product-evaluate" data-product-id="RE228866">
+    <table cellspacing="0" id="work_value">
       <tr>
         <td class="work_rankin">
           <table cellspacing="0">
             <tr>
-              <td v-if="product.ranks.total" v-cloak class="crown_total" :title="$t('product.evaluate.ranking_total'  , [ product.ranks.total.rank_date, product.ranks.total.rank ])">&nbsp;</td>
-              <td v-if="product.ranks.year"  v-cloak class="crown_year"  :title="$t('product.evaluate.ranking_year'   , [ product.ranks.year.rank_date , product.ranks.year.rank  ])">&nbsp;</td>
-              <td v-if="product.ranks.month" v-cloak class="crown_month" :title="$t('product.evaluate.ranking_monthly', [ product.ranks.month.rank_date, product.ranks.month.rank ])">&nbsp;</td>
-              <td v-if="product.ranks.week"  v-cloak class="crown_week"  :title="$t('product.evaluate.ranking_weekly' , [ product.ranks.week.rank_date , product.ranks.week.rank  ])">&nbsp;</td>
-              <td v-if="product.ranks.day"   v-cloak class="crown_hour"  :title="$t('product.evaluate.ranking_daily'  , [ product.ranks.day.rank_date  , product.ranks.day.rank   ])">&nbsp;</td>
+            <td v-if="product.ranks.total" v-cloak class="crown_total" :title="'Total ranking (' + product.ranks.total.rank_date + ') / ' + product.ranks.total.rank">&nbsp;</td>
+            <td v-if="product.ranks.year" v-cloak class="crown_year" :title="'Year ' + product.ranks.year.rank_date + ' ranking / ' + product.ranks.year.rank">&nbsp;</td>
+            <td v-if="product.ranks.month" v-cloak class="crown_month" :title="'Monthly chart (' + product.ranks.month.rank_date + ') / ' + product.ranks.month.rank">&nbsp;</td>
+            <td v-if="product.ranks.week" v-cloak class="crown_week" :title="'Weekly chart (' + product.ranks.week.rank_date + ') / ' + product.ranks.week.rank">&nbsp;</td>
+            <td v-if="product.ranks.day" v-cloak class="crown_hour" :title="'Daily chart (' + product.ranks.day.rank_date + ') / ' + product.ranks.day.rank">&nbsp;</td>
             </tr>
           </table>
         </td>
@@ -473,22 +452,14 @@ if ($.cookie('loginchecked') >= 1) {
 </div>
 
         </td>
-        <td v-if="product.review_count" v-cloak class="work_review">
-          <a class="_review_count" href="#review_link"><div :title="$t('product.evaluate.with_review')" v-text="product.review_count"></div></a>
-        </td>
-                  <!-- 販売 / DL数 -->
-          <td class="work_dl" v-if="product.dl_count !== undefined && product.dl_count > 0" v-cloak>
-            <div v-html="$t('product.evaluate.purchase_count', [ product.dl_count ])"></div>
-          </td>
-          <!-- お気に入り数 -->
-          <td class="work_dl" v-if="product.wishlist_count !== undefined && product.wishlist_count > 0" v-cloak>
-            <div v-html="$t('product.evaluate.favorite_count', [ product.wishlist_count ])"></div>
-          </td>
+        <td v-if="product.review_count" v-cloak class="work_review"><a class="_review_count" href="#review_link"><div title="レビューあり">({{ product.review_count }})</div></a></td>
+                <td class="work_dl" v-if="product.dl_count !== undefined && product.dl_count > 0" v-cloak><div>Purchased:&nbsp;<span class="_dl_count">{{ product.dl_count }}</span>&nbsp;times</div></td>
+        <td class="work_dl" v-if="product.wishlist_count !== undefined && product.wishlist_count > 0" v-cloak><div>Favorited:&nbsp;<span>{{ product.wishlist_count }}</span></div></td>
               </tr>
     </table>
 
   
-<div data-vue-component="product-slider" data-product-id="RE228866">
+<product-slider product_id="RE228866" inline-template>
 
 <div class="product-slider">
   <!-- Sample image data -->
@@ -541,10 +512,9 @@ if ($.cookie('loginchecked') >= 1) {
   </div>
   <div v-cloak class="work_slider_comp" v-if="items.length > 1">
 
-    <a rel="noopener" href="https://www.dlsite.com/eng/popup/=/file/smp1/product_id/RE228866.html" target="_blank">Display in HTML format</a>
+    <a href="https://www.dlsite.com/eng/popup/=/file/smp1/product_id/RE228866.html" target="_blank">Display in HTML format</a>
 
-    <!-- 枚数 -->
-    <span v-t="{ path: 'product.slider.totalImages', args: [items.length] }"></span>
+    <span>{{ __('totalImages', {count: items.length}) }}</span>  
   </div>
 
   <!-- Popup viewer -->
@@ -554,7 +524,7 @@ if ($.cookie('loginchecked') >= 1) {
       <div class="slider_popup_rightpane">
         <div class="slider_popup_sidebar">
         <template v-for="(item, index) in items">
-          <div rel="noopener" target="_blank" :class="{active:(index === swiper.realIndex)}" @click="slideTo(index, false)">
+          <div target="_blank" :class="{active:(index === swiper.realIndex)}" @click="slideTo(index, false)">
 
             <img :src="item.thumb.src" alt="With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing] [Triangle!]">
 
@@ -579,15 +549,15 @@ if ($.cookie('loginchecked') >= 1) {
         </div>
         <div class="slider_popup_tool">
           <input id="target1" class="checkbox" name="target" type="checkbox" value="1" v-model="alwaysActualSize" @change="toggleActualSize" @click="toggleActualSize">
-          <label for="target1" class="checkbox-label" v-t="'product.slider.alwaysActual'"></label>
-          <span class="slider_popup_description" v-t="'product.slider.tools'"></span>
+          <label for="target1" class="checkbox-label">{{ __('alwaysActual') }}</label>
+          <span class="slider_popup_description">{{ __('tools') }}</span>
         </div>
       </div>
     </div>
   </div>
 
 </div>
-</div>
+</product-slider>
 
 
   </div>
@@ -639,11 +609,16 @@ if ($.cookie('loginchecked') >= 1) {
         </tr>
 
 
-                
+        <tr>
+          <th>Option</th>
+          <td>
+            <div class="work_genre"><a href="https://www.dlsite.com/eng/fsr/=/work_category%5B0%5D/doujin/options/SND/from/icon.work"><span class="icon_SND" title="Inc. Voice">Inc. Voice</span></a><a href="https://www.dlsite.com/eng/fsr/=/work_category%5B0%5D/doujin/options/TRI/from/icon.work"><span class="icon_TRI" title="Trial">Trial</span></a></div>
+          </td>
+        </tr>
 
 
-        <tr><th>Genre</th><td><div class="main_genre"><a href="https://www.dlsite.com/eng/fsr/=/genre/056/from/work.genre">Healing</a><a href="https://www.dlsite.com/eng/fsr/=/genre/496/from/work.genre">Binaural</a><a href="https://www.dlsite.com/eng/fsr/=/genre/497/from/work.genre">ASMR</a><a href="https://www.dlsite.com/eng/fsr/=/genre/442/from/work.genre">Ear Cleaning</a><a href="https://www.dlsite.com/eng/fsr/=/genre/004/from/work.genre">Lovey Dovey/Sweet Love</a><a href="https://www.dlsite.com/eng/fsr/=/genre/222/from/work.genre">Childhood Friend</a>
-</div></td></tr>
+
+        <tr><th>Genre</th><td><div class="main_genre"><a href="https://www.dlsite.com/eng/fsr/=/genre/056/from/work.genre">Healing</a><a href="https://www.dlsite.com/eng/fsr/=/genre/496/from/work.genre">Binaural</a><a href="https://www.dlsite.com/eng/fsr/=/genre/497/from/work.genre">ASMR</a><a href="https://www.dlsite.com/eng/fsr/=/genre/222/from/work.genre">Childhood Friend</a><a href="https://www.dlsite.com/eng/fsr/=/genre/442/from/work.genre">Ear Cleaning</a><a href="https://www.dlsite.com/eng/fsr/=/genre/004/from/work.genre">Romance</a><a href="https://www.dlsite.com/eng/fsr/=/genre/306/from/work.genre">Romance</a><a href="https://www.dlsite.com/eng/fsr/=/genre/494/from/work.genre">Romance</a></div></td></tr>
 
         <tr><th>File Size</th><td><div class="main_genre">1.35GB</div></td></tr>
 
@@ -693,7 +668,7 @@ if ($.cookie('loginchecked') >= 1) {
 
 <div class="title_01 clearfix"><h2>Contents</h2></div>
 <div itemprop="description" class="work_article work_story">** Special Site **<br />
-<a rel="noopener nofollow" href="http://www.miyuki-web.net/hatsukoiobake/" target="_blank">http://www.miyuki-web.net/hatsukoiobake/</a><br />
+<a rel="nofollow" href="http://www.miyuki-web.net/hatsukoiobake/" target="_blank">http://www.miyuki-web.net/hatsukoiobake/</a><br />
 <br />
 "Yui Asami meets First Love"<br />
 <br />
@@ -708,7 +683,7 @@ To look silly in public may affect your social status.<br />
 [Synopsis]<br />
 <br />
 * Prequel:<br />
-<a rel="noopener" href="http://www.dlsite.com/eng/work/=/product_id/RE180674.html" target="_blank">http://www.dlsite.com/eng/work/=/product_id/RE180674.html</a><br />
+<a href="http://www.dlsite.com/eng/work/=/product_id/RE180674.html" target="_blank">http://www.dlsite.com/eng/work/=/product_id/RE180674.html</a><br />
 <br />
 Having got in a relationship, you and Natsumi go to a mountain for camping.<br />
 However...there is a thing that traumatized young Natsumi in the mountain...!?<br />
@@ -752,7 +727,7 @@ Bonuses:<br />
 <br />
 [Credits]<br />
 CV: Yui Asami<br />
-Script: Project E.L.C<br />
+Script: TOMOYA HIRATA (Project E.L.C)<br />
 Illustration: Yatomi<br />
 Web Design: Guzuri Takamachi / Aoi Kazuki<br />
 Logo Design: juda53 / SAKANAC<br />
@@ -1060,10 +1035,11 @@ jQuery(function($){
 
 <div class="work_article" id="work_review" data-section_name="work_review">
 
-  
-  <div class="review_head">
+  <!-- review_head -->
+  <div class="review_head clearfix">
     <p class="float_l review_count"><span class="fs20">0</span> user reviews</p>
       </div>
+  <!-- /review_head -->
 
   <!-- work_review_list -->
   <table id="work_review_list" cellspacing="0">
@@ -1140,7 +1116,7 @@ jQuery(function($){
         <div v-if="product.is_discount || product.is_pointup || rentaled" class="campaign_info">
           <p v-if="rentaled" class="type_rental"><span>レンタル期間中割引<span class="limit">あと{{ rentaled.limit }}</span><span class="period">{{ rentaled.period }}まで</span></span></p>
           <p v-if="product.is_discount" class="type_sale">
-            <a rel="noopener"    v-if="product.discount_to" :href="product.discount_to" :title="product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF'" target="_blank"><span>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span></a>
+            <a    v-if="product.discount_to" :href="product.discount_to" :title="product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF'" target="_blank"><span>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span></a>
             <span v-else>{{ product.discount_rate == 100 ? 'Free' : product.discount_rate + '%OFF' }}<span class="period" v-if="product.discount_end_date">Til {{ product.discount_end_date }}</span></span>
           </p>
         </div>
@@ -1206,7 +1182,7 @@ jQuery(function($){
       </template>
       <template v-else>
         <template v-if="is_bought">
-          <p class="work_stream"><a rel="noopener" href="https://play.dlsite.com/eng/?workno=RE228866" class="btn_st" :class="{ disabled: ! product.dlsiteplay_work || product.dl_format == 16 }" title="Open in DLsite Play" target="_blank">Open in DLsite Play</a></p>
+          <p class="work_stream"><a href="https://play.dlsite.com/eng/?workno=RE228866" class="btn_st" :class="{ disabled: ! product.dlsiteplay_work || product.dl_format == 16 }" title="Open in DLsite Play" target="_blank">Open in DLsite Play</a></p>
           <p class="work_cart"><a :href="product.down_url" class="btn_dl" :class="{ disabled: product.dl_format == 17 }">Download</a></p>
         </template>
         <template v-else-if="is_already">
@@ -1262,7 +1238,7 @@ jQuery(function($){
           <div class="work_buy_body">
             <div class="work_buy_label">Price</div>
             <div class="work_buy_content">
-              <span class="price">$4.54&nbsp;/&nbsp;&euro;4.12<i class="work_estimation">(estimation)</i><i class="work_jpy">486 JPY</i></span>
+              <span class="price">$8.95&nbsp;/&nbsp;&euro;7.94<i class="work_estimation">(estimation)</i><i class="work_jpy">972 JPY</i></span>
             </div>
           </div>
         </div>
@@ -1354,7 +1330,7 @@ jQuery(function($){
     <p v-if="product.is_rental" class="guide_message">レンタルでは購入特典は<br>付与されません。</p>
     
     <ul class="guide_list">
-      <li><a rel="noopener" href="https://www.dlsite.com/eng/faq/detail/=/type/user/mid/5/did/297" target="_blank">About Purchase Bonus</a></li>
+      <li><a href="https://www.dlsite.com/eng/faq/detail/=/type/user/mid/5/did/297" target="_blank">About Purchase Bonus</a></li>
     </ul>
   </div>
 
@@ -1396,7 +1372,7 @@ jQuery(function($){
         <tbody>
           <tr>
             <td>Windows</td>
-            <td>-</td>
+            <td>Windows7 / Windows8 / Windows8.1 / Windows10</td>
           </tr>
                     <tr>
             <td>Mac</td>
@@ -1443,44 +1419,44 @@ jQuery(function($){
     <table cellspacing="0" class="same_work">
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE180674.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ181000/RJ180674_img_sam_mini.jpg" alt="Fireworks With First Love Girlfriend [Ear Cleaning] [Fall Asleep] [Triangle!]" title="Fireworks With First Love Girlfriend [Ear Cleaning] [Fall Asleep] [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE180674.html">Fireworks With First Love Girlfriend [Ear Cleaning] [Fall Asleep]</a></span>
-          <span class="work_price">$4.54</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE180674.html">Fireworks With First Love Girlfriend [Ear Cleaning] [Fall Asleep]</a></span>
+          <span class="work_price">$8.95</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE176184.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ177000/RJ176184_img_sam_mini.jpg" alt="Hanikami Commute Date-chu! [Soothing Audio] [Triangle!]" title="Hanikami Commute Date-chu! [Soothing Audio] [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE176184.html">Hanikami Commute Date-chu! [Soothing Audio]</a></span>
-          <span class="work_price">$3.53</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE176184.html">Hanikami Commute Date-chu! [Soothing Audio]</a></span>
+          <span class="work_price">$6.96</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073910.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ074000/RJ073910_img_sam_mini.jpg" alt="Trianthology! ACE [Triangle!]" title="Trianthology! ACE [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073910.html">Trianthology! ACE</a></span>
-          <span class="work_price">$1.51</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073910.html">Trianthology! ACE</a></span>
+          <span class="work_price">$2.98</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073917.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ074000/RJ073917_img_sam_mini.jpg" alt="Trianthology! X [Triangle!]" title="Trianthology! X [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073917.html">Trianthology! X</a></span>
-          <span class="work_price">$2.01</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073917.html">Trianthology! X</a></span>
+          <span class="work_price">$3.98</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073911.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ074000/RJ073911_img_sam_mini.jpg" alt="Misato 4Coma Anthology [Triangle!]" title="Misato 4Coma Anthology [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073911.html">Misato 4Coma Anthology</a></span>
-          <span class="work_price">$1.51</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073911.html">Misato 4Coma Anthology</a></span>
+          <span class="work_price">$2.98</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073920.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ074000/RJ073920_img_sam_mini.jpg" alt="TRIF: trif [Triangle!]" title="TRIF: trif [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073920.html">TRIF: trif</a></span>
-          <span class="work_price">$7.57</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE073920.html">TRIF: trif</a></span>
+          <span class="work_price">$14.93</span>
         </td>
       </tr>
               <tr>
         <td class="work_img"><a href="https://www.dlsite.com/eng/work/=/product_id/RE081812.html"><img src="//img.dlsite.jp/modpub/images2/work/doujin/RJ082000/RJ081812_img_sam_mini.jpg" alt="See You Again in the SMILE  [Triangle!]" title="See You Again in the SMILE  [Triangle!]"  class="target_type" /></a></td>
-        <td class="name">          <div class="icon_wrap"><span class="icon_lead_01 type_sale">50%OFF</span></div>          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE081812.html">See You Again in the SMILE </a></span>
-          <span class="work_price">$2.01</span>
+        <td class="name">          <span class="work_name"><a href="https://www.dlsite.com/eng/work/=/product_id/RE081812.html">See You Again in the SMILE </a></span>
+          <span class="work_price">$3.98</span>
         </td>
       </tr>
             </table>
@@ -1537,103 +1513,97 @@ jQuery(function($){
 
 
 
+
+
 <!-- footer -->
 <div id="footer" data-section_name="footer">
     
     <div class="pagetop_block clearfix">
     <p class="pagetop"><a href="#header">Back to Top</a></p>
 </div>
-<div class="footer_floor_nav">
-<ul class="floor_list">
-<li class="floor_list_item"><a href="https://www.dlsite.com/">DLsite Home Page</a></li>
-<li class="floor_list_item"><a href="https://www.dlsite.com/eng/">Doujin</a></li>
-<li class="floor_list_item"><a href="https://www.dlsite.com/ecchi-eng/">Adult Doujin</a></li>
-<li class="floor_list_item sp_switch"><a id="_touch_link" href="https://www.dlsite.com/eng-touch/work/=/product_id/RE228866.html" data-platform="touch">For Smartphone</a></li>
+<div class="footer_link_01">
+<ul>
+<li><a href="https://www.dlsite.com/">DLsite Home Page</a></li>
+<li><a href="https://www.dlsite.com/eng/">Doujin</a></li>
+<li><a href="https://www.dlsite.com/ecchi-eng/">Adult Doujin</a></li>
+<li class="sp_switch"><a id="_touch_link" href="https://www.dlsite.com/eng-touch/work/=/product_id/RE228866.html" data-platform="touch">DLsite Mobile Site</a></li>
 </ul>
 </div>
 
         <div class="footer_section">
-    <div class="footer_section_inner">
-        <div class="link_list_wrap">
-            <div class="link_list_box col_2">
+    <div class="section_container clearfix">
+        <ul class="link_list">
+            <li class="list_item">
                 <div class="label">About DLsite</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a rel="noopener" href="https://www.eisys.co.jp/company/company-overview.html" target="_blank">About our Company</a></li>
-                    <li class="link_list_item"><a rel="noopener" href="https://eisys.talentcld.com/" target="_blank">Career Information</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/user/regulations">User Agreement</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/law">Legal Statement (ASCT)</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/settlement">Legal Statement (PSA)</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/privacy">Privacy Policy</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/mosaic">Compliance Policy</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/copy">Copyright</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/banners">Link to DLsite</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/sitemap">Site Map</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.eisys.co.jp/company/company-overview.html" target="_blank">About our Company</a></dd>
+                    <dd><a href="https://eisys.talentcld.com/" target="_blank">Career Information</a></dd>
+                                                            <dd><a href="https://twitter.com/DLsiteEnglish" target="_blank" class="twitter">Twitter</a> / <a href="https://www.facebook.com/DLsite-English-159690760755693/" target="_blank" class="facebook">Facebook</a> / <a href="http://dlsite-english.tumblr.com/" target="_blank" class="tumblr">Tumblr</a></dd>
+                                    </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">Payment / Points</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/payment">Payment Methods</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/mypage/aboutpoint">About Points</a></li>
-                                        <li class="link_list_item"><a href="https://www.dlsite.com/eng/mypage/aboutpoint#gp3">How to Buy Points</a></li>
-                                    </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.dlsite.com/eng/guide/payment">Payment Methods</a></dd>
+                    <dd><a href="https://www.dlsite.com/eng/mypage/aboutpoint">About Points</a></dd>
+                                        <dd><a href="https://www.dlsite.com/eng/mypage/aboutpoint#gp3">How to Buy Points</a></dd>
+                                    </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">Help / Guide</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome">New to DLsite?</a></li>
-                    <li class="link_list_item"><a rel="noopener" href="https://www.dlsite.com/eng/faq/=/type/user" target="_blank">Frequently Asked Questions</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/opinion/contribution">Product Request / Feedback</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+                <dl>
+                    <dd><a href="https://www.dlsite.com/eng/welcome">New to DLsite?</a></dd>
+                    <dd><a href="https://www.dlsite.com/eng/faq/=/type/user" target="_blank">Frequently Asked Questions</a></dd>
+                    <dd><a href="https://www.dlsite.com/eng/opinion/contribution">Product Request / Feedback</a></dd>
+                    <dd><a href="https://ssl.dlsite.com/eng/mypage/setting/mail">Newsletter</a></dd>
+                    <dd><a href="https://www.dlsite.com/eng/sitemap">Site Map</a></dd>
+                </dl>
+            </li>
+            <li class="list_item">
                 <div class="label">DLsite Services</div>
-                <ul class="link_list">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/circle/invite">Submit Your Works</a></li>
-                                        <li class="link_list_item"><a href="https://www.dlsite.com/eng/guide/affiliate">Affiliate Program</a></li>
-                    <li class="link_list_item"><a href="https://ssl.dlsite.com/eng/mypage/setting/mail">Newsletter</a></li>
-                                    </ul>
-            </div>
-        </div>
-    </div>
-    <div class="footer_section_inner sns">
-        <div class="label">Official SNS Accounts</div>
-        <ul class="footer_sns">
-                        <li class="footer_sns_item"><a rel="noopener" href="https://twitter.com/DLsiteEnglish" target="_blank" class="twitter">Twitter</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.facebook.com/DLsite-English-159690760755693/" target="_blank" class="facebook">Facebook</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="http://dlsite-english.tumblr.com/" target="_blank" class="tumblr">Tumblr</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.instagram.com/dlsite_english/" target="_blank" class="instagram">Instagram</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://www.youtube.com/channel/UCGKtTGBPGmB5d9jg-fIZc8w" target="_blank" class="youtube">Youtube</a></li>
-            <li class="footer_sns_item"><a rel="noopener" href="https://discordapp.com/channels/555918616793710592/" target="_blank" class="discord">Discord</a></li>
+                <dl>
+                    <dd><a href="https://www.dlsite.com/eng/circle/invite">Submit Your Works</a></dd>
+                                        <dd><a href="https://www.dlsite.com/eng/guide/affiliate">Affiliate Program</a></dd>
+                                    </dl>
+            </li>
                     </ul>
     </div>
-    <div class="footer_section_inner multilingual">
-        <div class="link_list_wrap">
-            <div class="link_list_box">
-                <div class="label">International</div>
-                <ul class="link_list type_horizontal">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/home/">日本語</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/">English</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com.tw/home/">繁體中文</a></li>
-                </ul>
-            </div>
-            <div class="link_list_box">
+    <div class="section_container type_multilingual clearfix">
+        <ul class="link_list">
+            <li class="list_item">
                 <div class="label">Global Guide</div>
-                <ul class="link_list type_horizontal">
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome">English</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome/deu">Deutsch</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome/fra">Français</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome/ita">Italiano</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome/esp">Español</a></li>
-                    <li class="link_list_item"><a href="https://www.dlsite.com/eng/welcome/chi">繁體中文</a></li>
+                <dl>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome">English</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome/deu">Deutsch</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome/fra">Français</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome/ita">Italiano</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome/esp">Español</a></dd>
+                    <dd class="list_item"><a href="https://www.dlsite.com/eng/welcome/chi">繁體中文</a></dd>
                 </dl>
-            </div>
+            </li>
+        </ul>
+        <div class="language_container">
+            <div class="label">Language</div>
+            <select name="language" id="language_select" onchange="location.href=value;">
+                <option value="https://www.dlsite.com/home/" >日本語</option>
+                <option value="https://www.dlsite.com/eng/" selected>English</option>
+                <option value="https://www.dlsite.com.tw/home/">繁體中文</option>
+            </select>
         </div>
     </div>
 </div>
 <div id="copyright">
     <div class="container clearfix">
         <div id="system">Recommended browsers: The latest version of Internet Explorer, Microsoft Edge, Safari, Chrome or Firefox with JavaScript/cookies enabled.</div>
+        <ul id="footer_nav">
+            <li><a href="https://www.dlsite.com/eng/user/regulations">User Agreement</a></li>
+            <li><a href="https://www.dlsite.com/eng/guide/law">Legal Statement (ASCT)</a></li>
+            <li><a href="https://www.dlsite.com/eng/guide/settlement">Legal Statement (PSA)</a></li>
+            <li><a href="https://www.dlsite.com/eng/guide/privacy">Privacy Policy</a></li>
+            <li><a href="https://www.dlsite.com/eng/mosaic">Compliance Policy</a></li>
+            <li><a href="https://www.dlsite.com/eng/guide/copy">Copyright</a></li>
+            <li><a href="https://www.dlsite.com/eng/banners">Link to DLsite</a></li>
+        </ul>
         <p>&copy; 1996 DLsite</p>
     </div>
 </div>
@@ -1658,8 +1628,8 @@ jQuery(function($){
 
 <div data-vue-component="cookie-policy" data-async="true"></div>
 
-<script type="text/javascript" src="/vue/js/pc/vendor.js?cdn_cache=1&v=0.1.2&_=1561425273"></script>
-<script type="text/javascript" src="/vue/js/pc/app.js?cdn_cache=1&v=0.1.2&_=1567559800"></script>
+<script type="text/javascript" src="/vue/js/pc/vendor.js?cdn_cache=1&v=0.1.2&_=1536029038"></script>
+<script type="text/javascript" src="/vue/js/pc/app.js?cdn_cache=1&v=0.1.2&_=1559289223"></script>
 
 
 <script type="text/javascript">
@@ -1702,6 +1672,6 @@ div.measure_tag {
 
 
 <!-- /script_footer -->
-<script type="text/javascript">var contents = {"impression":[],"detail":[{"id":"RE228866","name":"With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]","category":"eng","brand":"RG14177","price":450,"regist_date":"2018\/10\/02","image_main":"\/\/img.dlsite.jp\/modpub\/images2\/work\/doujin\/RJ229000\/RJ228866_img_main.jpg","restore_price":"900"}],"time":0.00013399124145507812};</script>
+<script type="text/javascript">var contents = {"impression":[],"detail":[{"id":"RE228866","name":"With Your First Girlfriend, at a Ghostly Night [Ear Cleaning] [Sleep Sharing]","category":"eng","brand":"RG14177","price":900,"regist_date":"2018\/10\/02","image_main":"\/\/img.dlsite.jp\/modpub\/images2\/work\/doujin\/RJ229000\/RJ228866_img_main.jpg","restore_price":null}],"time":0.0001552104949951172};</script>
 </body>
 </html>

tests/fixture/DeviantArt/mature.json

@@ -1 +0,0 @@
-{"version":"1.0","type":"photo","title":"R-15 mabel and will update","category":"Fan Art > Manga & Anime > Digital > Movies & TV","url":"https:\/\/images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com\/f\/6854f36d-8010-4cd0-9d62-0cf9b7829764\/dbcfq2q-d78c9f6e-dced-4e5c-a345-2a1bfd5d7620.jpg\/v1\/fill\/w_1193,h_670,q_70,strp\/r_15_mabel_and_will_update_by_gatanii69_dbcfq2q-pre.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9ODQyIiwicGF0aCI6IlwvZlwvNjg1NGYzNmQtODAxMC00Y2QwLTlkNjItMGNmOWI3ODI5NzY0XC9kYmNmcTJxLWQ3OGM5ZjZlLWRjZWQtNGU1Yy1hMzQ1LTJhMWJmZDVkNzYyMC5qcGciLCJ3aWR0aCI6Ijw9MTUwMCJ9XV0sImF1ZCI6WyJ1cm46c2VydmljZTppbWFnZS5vcGVyYXRpb25zIl19.6Vj946U_q31oKJDfyUfJGCj-kufd47zV1RjCtN_qtVc","author_name":"gatanii69","author_url":"https:\/\/www.deviantart.com\/gatanii69","provider_name":"DeviantArt","provider_url":"https:\/\/www.deviantart.com","safety":"adult","pubdate":"2017-06-12T06:08:10-07:00","community":{"statistics":{"_attributes":{"views":8322,"favorites":405,"comments":56,"downloads":50}}},"rating":"adult","tags":"nsfw, reversefalls, gravityfalls, gravityfallsfanart, mabelpines, billcipher, reversemabel, willcipher, reversebill, reversebillcipher, mawill","copyright":{"_attributes":{"url":"https:\/\/www.deviantart.com\/gatanii69","year":"2017","entity":"gatanii69"}},"width":1193,"height":670,"imagetype":"","thumbnail_url":"https:\/\/images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com\/f\/6854f36d-8010-4cd0-9d62-0cf9b7829764\/dbcfq2q-d78c9f6e-dced-4e5c-a345-2a1bfd5d7620.jpg\/v1\/fit\/w_300,h_842,q_70,strp\/r_15_mabel_and_will_update_by_gatanii69_dbcfq2q-300w.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9ODQyIiwicGF0aCI6IlwvZlwvNjg1NGYzNmQtODAxMC00Y2QwLTlkNjItMGNmOWI3ODI5NzY0XC9kYmNmcTJxLWQ3OGM5ZjZlLWRjZWQtNGU1Yy1hMzQ1LTJhMWJmZDVkNzYyMC5qcGciLCJ3aWR0aCI6Ijw9MTUwMCJ9XV0sImF1ZCI6WyJ1cm46c2VydmljZTppbWFnZS5vcGVyYXRpb25zIl19.6Vj946U_q31oKJDfyUfJGCj-kufd47zV1RjCtN_qtVc","thumbnail_width":300,"thumbnail_height":168,"thumbnail_url_150":"https:\/\/images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com\/f\/6854f36d-8010-4cd0-9d62-0cf9b7829764\/dbcfq2q-d78c9f6e-dced-4e5c-a345-2a1bfd5d7620.jpg\/v1\/fit\/w_150,h_150,q_70,strp\/r_15_mabel_and_will_update_by_gatanii69_dbcfq2q-150.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9ODQyIiwicGF0aCI6IlwvZlwvNjg1NGYzNmQtODAxMC00Y2QwLTlkNjItMGNmOWI3ODI5NzY0XC9kYmNmcTJxLWQ3OGM5ZjZlLWRjZWQtNGU1Yy1hMzQ1LTJhMWJmZDVkNzYyMC5qcGciLCJ3aWR0aCI6Ijw9MTUwMCJ9XV0sImF1ZCI6WyJ1cm46c2VydmljZTppbWFnZS5vcGVyYXRpb25zIl19.6Vj946U_q31oKJDfyUfJGCj-kufd47zV1RjCtN_qtVc","thumbnail_url_200h":"https:\/\/images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com\/f\/6854f36d-8010-4cd0-9d62-0cf9b7829764\/dbcfq2q-d78c9f6e-dced-4e5c-a345-2a1bfd5d7620.jpg\/v1\/fill\/w_300,h_168,q_70,strp\/r_15_mabel_and_will_update_by_gatanii69_dbcfq2q-200h.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7ImhlaWdodCI6Ijw9ODQyIiwicGF0aCI6IlwvZlwvNjg1NGYzNmQtODAxMC00Y2QwLTlkNjItMGNmOWI3ODI5NzY0XC9kYmNmcTJxLWQ3OGM5ZjZlLWRjZWQtNGU1Yy1hMzQ1LTJhMWJmZDVkNzYyMC5qcGciLCJ3aWR0aCI6Ijw9MTUwMCJ9XV0sImF1ZCI6WyJ1cm46c2VydmljZTppbWFnZS5vcGVyYXRpb25zIl19.6Vj946U_q31oKJDfyUfJGCj-kufd47zV1RjCtN_qtVc","thumbnail_width_200h":300,"thumbnail_height_200h":168}