From 566d288395bf3efdd885c0c25909aeb342e4004a Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Tue, 9 Apr 2019 23:04:42 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=81=84=E3=81=AD=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E3=81=8C=E5=B8=B8=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserController.php |  4 ----
 resources/views/user/base.blade.php     | 12 +++++++-----
 resources/views/user/likes.blade.php    |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 72fc0cc..5bdc9b5 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -185,10 +185,6 @@ SQL
             abort(404);
         }
 
-        if (!$user->isMe()) {
-            abort(403);
-        }
-
         $likes = $user->likes()
             ->orderBy('created_at', 'desc')
             ->with('ejaculation.user', 'ejaculation.tags')
diff --git a/resources/views/user/base.blade.php b/resources/views/user/base.blade.php
index ee33db5..49598ac 100644
--- a/resources/views/user/base.blade.php
+++ b/resources/views/user/base.blade.php
@@ -20,11 +20,13 @@
                     <li class="nav-item">
                         <a class="nav-link {{ Route::currentRouteName() === 'user.okazu' ? 'active' : '' }}" href="{{ route('user.okazu', ['name' => $user->name]) }}">オカズ</a>
                     </li>
-                    @if ($user->isMe())
-                        <li class="nav-item">
-                            <a class="nav-link {{ Route::currentRouteName() === 'user.likes' ? 'active' : '' }}" href="{{ route('user.likes', ['name' => $user->name]) }}">いいね <span class="badge badge-primary">{{ $user->likes()->count() }}</span></a>
-                        </li>
-                    @endif
+                    <li class="nav-item">
+                        <a class="nav-link {{ Route::currentRouteName() === 'user.likes' ? 'active' : '' }}" href="{{ route('user.likes', ['name' => $user->name]) }}">いいね
+                            @if ($user->isMe() || !($user->is_protected || $user->private_likes))
+                                <span class="badge badge-primary">{{ $user->likes()->count() }}</span>
+                            @endif
+                        </a>
+                    </li>
                 </ul>
                 <div class="tab-content">
                     @yield('tab-content')
diff --git a/resources/views/user/likes.blade.php b/resources/views/user/likes.blade.php
index 7c78f50..ddb89eb 100644
--- a/resources/views/user/likes.blade.php
+++ b/resources/views/user/likes.blade.php
@@ -3,7 +3,7 @@
 @section('title', $user->display_name . ' (@' . $user->name . ') さんがいいねしたチェックイン')
 
 @section('tab-content')
-@if ($user->is_protected && !$user->isMe())
+@if (($user->is_protected || $user->private_likes) && !$user->isMe())
     <p class="mt-4">
         <span class="oi oi-lock-locked"></span> このユーザはいいね一覧を公開していません。
     </p>