From ad5fbc7ada0eac795245a4d1b80e8039faa69c43 Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Tue, 8 Jan 2019 23:27:48 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=9A=E3=83=BC=E3=82=B8=E3=82=BF?=
 =?UTF-8?q?=E3=82=A4=E3=83=88=E3=83=AB=E3=82=92=E8=A8=AD=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/auth/login.blade.php           | 2 ++
 resources/views/auth/passwords/email.blade.php | 2 ++
 resources/views/auth/passwords/reset.blade.php | 2 ++
 resources/views/auth/register.blade.php        | 2 ++
 resources/views/ejaculation/checkin.blade.php  | 2 ++
 resources/views/ejaculation/edit.blade.php     | 2 ++
 resources/views/ejaculation/show.blade.php     | 6 ++++++
 resources/views/info/index.blade.php           | 2 ++
 resources/views/info/show.blade.php            | 2 ++
 resources/views/layouts/base.blade.php         | 6 +++++-
 resources/views/search/base.blade.php          | 2 ++
 resources/views/user/okazu.blade.php           | 2 ++
 resources/views/user/profile.blade.php         | 2 ++
 resources/views/user/stats.blade.php           | 2 ++
 14 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 7eacbfa..fed7176 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'ログイン')
+
 @section('content')
 <div class="container">
     <h2>ログイン</h2>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 6339bb9..c0fa9b6 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'パスワードの再発行')
+
 @section('content')
 <div class="container">
     <h2>パスワードの再発行</h2>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 5dd5424..e9ab11c 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'パスワードの再発行')
+
 @section('content')
 <div class="container">
     <h2>パスワードの再発行</h2>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index a0a103e..7ef6a7d 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', '新規登録')
+
 @section('content')
 <div class="container">
     <h2>新規登録</h2>
diff --git a/resources/views/ejaculation/checkin.blade.php b/resources/views/ejaculation/checkin.blade.php
index 770ab80..99d04c3 100644
--- a/resources/views/ejaculation/checkin.blade.php
+++ b/resources/views/ejaculation/checkin.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'チェックイン')
+
 @section('content')
 <div class="container">
     <h2>今致してる？</h2>
diff --git a/resources/views/ejaculation/edit.blade.php b/resources/views/ejaculation/edit.blade.php
index 8a91139..dab8924 100644
--- a/resources/views/ejaculation/edit.blade.php
+++ b/resources/views/ejaculation/edit.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'チェックインの修正')
+
 @section('content')
 <div class="container">
     <h2>チェックインの修正</h2>
diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php
index 90ca29f..9a359c7 100644
--- a/resources/views/ejaculation/show.blade.php
+++ b/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">
diff --git a/resources/views/info/index.blade.php b/resources/views/info/index.blade.php
index fac5aa9..dd7119b 100644
--- a/resources/views/info/index.blade.php
+++ b/resources/views/info/index.blade.php
@@ -1,5 +1,7 @@
 @extends('layouts.base')
 
+@section('title', 'お知らせ')
+
 @section('content')
 <div class="container">
     <h2>サイトからのお知らせ</h2>
diff --git a/resources/views/info/show.blade.php b/resources/views/info/show.blade.php
index b342654..8dba829 100644
--- a/resources/views/info/show.blade.php
+++ b/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">
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index ed872f1..7185719 100644
--- a/resources/views/layouts/base.blade.php
+++ b/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">
diff --git a/resources/views/search/base.blade.php b/resources/views/search/base.blade.php
index 5aed699..e0ae362 100644
--- a/resources/views/search/base.blade.php
+++ b/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>
diff --git a/resources/views/user/okazu.blade.php b/resources/views/user/okazu.blade.php
index b1f135e..c32e9f2 100644
--- a/resources/views/user/okazu.blade.php
+++ b/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">
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 6ef3370..bc4a146 100644
--- a/resources/views/user/profile.blade.php
+++ b/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')
diff --git a/resources/views/user/stats.blade.php b/resources/views/user/stats.blade.php
index 799e789..31d661e 100644
--- a/resources/views/user/stats.blade.php
+++ b/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

From 581c1ed952a10c0aa4ac8a7685080aad9f3ac74b Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Thu, 10 Jan 2019 01:29:26 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A1=E3=83=AD=E3=83=B3=E3=81=8B?=
 =?UTF-8?q?=E3=82=89=E5=8F=96=E5=BE=97=E3=81=97=E3=81=9F=E3=82=B5=E3=83=A0?=
 =?UTF-8?q?=E3=83=8D=E3=82=A4=E3=83=AB=E3=81=8B=E3=82=89censored=20flag?=
 =?UTF-8?q?=E3=82=89=E3=81=97=E3=81=8D=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=82=92=E5=A4=96=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/MetadataResolver/MelonbooksResolver.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/MetadataResolver/MelonbooksResolver.php b/app/MetadataResolver/MelonbooksResolver.php
index dd1e0b2..90d221a 100644
--- a/app/MetadataResolver/MelonbooksResolver.php
+++ b/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");
         }