Merge branch 'develop'

app/MetadataResolver/MelonbooksResolver.php

@@ -14,7 +14,14 @@ class MelonbooksResolver implements Resolver
         $res = $client->get($url, ['cookies' => $cookieJar]);
         if ($res->getStatusCode() === 200) {
             $ogpResolver = new OGPResolver();
-            return $ogpResolver->parse($res->getBody());
+            $metadata = $ogpResolver->parse($res->getBody());
+
+            // censoredフラグの除去
+            if (mb_strpos($metadata->image, '&c=1') !== false) {
+                $metadata->image = preg_replace('/&c=1/u', '', $metadata->image);
+            }
+
+            return $metadata;
         } else {
             throw new \RuntimeException("{$res->getStatusCode()}: $url");
         }

resources/views/auth/login.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'ログイン')
+
 @section('content')
 <div class="container">
     <h2>ログイン</h2>

resources/views/auth/passwords/email.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'パスワードの再発行')
+
 @section('content')
 <div class="container">
     <h2>パスワードの再発行</h2>

resources/views/auth/passwords/reset.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'パスワードの再発行')
+
 @section('content')
 <div class="container">
     <h2>パスワードの再発行</h2>

resources/views/auth/register.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', '新規登録')
+
 @section('content')
 <div class="container">
     <h2>新規登録</h2>

resources/views/ejaculation/checkin.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'チェックイン')
+
 @section('content')
 <div class="container">
     <h2>今致してる？</h2>

resources/views/ejaculation/edit.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'チェックインの修正')
+
 @section('content')
 <div class="container">
     <h2>チェックインの修正</h2>

resources/views/ejaculation/show.blade.php

@@ -1,5 +1,11 @@
 @extends('layouts.base')
 
+@if (!$user->isMe() && ($user->is_protected || $ejaculation->is_private))
+    @section('title', $user->display_name . ' さんのチェックイン')
+@else
+    @section('title', $user->display_name . ' さんのチェックイン (' . $ejaculation->ejaculated_date->format('m月d日 H:i') . ')')
+@endif
+
 @section('content')
 <div class="container">
     <div class="row">

resources/views/info/index.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'お知らせ')
+
 @section('content')
 <div class="container">
     <h2>サイトからのお知らせ</h2>

resources/views/info/show.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', $category['label'] . ': ' . $info->title)
+
 @section('content')
 <div class="container">
     <nav aria-label="breadcrumb" role="navigation">

resources/views/layouts/base.blade.php

@@ -6,7 +6,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>{{ config('app.name', 'Tissue') }}</title>
+    @hasSection('title')
+        <title>@yield('title') - {{ config('app.name', 'Tissue') }}</title>
+    @else
+        <title>{{ config('app.name', 'Tissue') }}</title>
+    @endif
 
     <link href="{{ asset('css/bootstrap.min.css') }}" rel="stylesheet">
     <link href="{{ asset('css/open-iconic-bootstrap.min.css') }}" rel="stylesheet">

resources/views/search/base.blade.php

@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', $inputs['q'] . ' の検索結果')
+
 @section('content')
     <div class="container">
         <h2 class="mb-4"><strong>{{ $inputs['q'] }}</strong> の検索結果</h2>

resources/views/user/okazu.blade.php

@@ -1,5 +1,7 @@
 @extends('user.base')
 
+@section('title', $user->display_name . ' さんのオカズ')
+
 @section('tab-content')
 @if ($user->is_protected && !$user->isMe())
     <p class="mt-4">

resources/views/user/profile.blade.php

@@ -1,5 +1,7 @@
 @extends('user.base')
 
+@section('title', $user->display_name . ' (@' . $user->name . ')')
+
 @section('sidebar')
     {{-- TODO: タイムラインとオカズのテンプレを分けたら条件外す --}}
     @if (Route::currentRouteName() === 'user.profile')

resources/views/user/stats.blade.php

@@ -1,5 +1,7 @@
 @extends('user.base')
 
+@section('title', $user->display_name . ' さんのグラフ')
+
 @push('head')
 <link rel="stylesheet" href="//cdn.jsdelivr.net/cal-heatmap/3.3.10/cal-heatmap.css" />
 @endpush