From 4ed2a9048d82b0e4d98052d0b4dfe8b954fce71e Mon Sep 17 00:00:00 2001
From: shibafu <shibafu528@gmail.com>
Date: Sun, 7 Apr 2019 23:27:24 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=81=84=E3=81=AD=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E4=B8=80=E8=A6=A7?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Ejaculation.php                           | 23 +++++++++++++------
 resources/assets/sass/app.scss                |  4 ++++
 .../views/components/ejaculation.blade.php    | 13 +++++++++++
 resources/views/ejaculation/show.blade.php    | 13 +++++++++++
 resources/views/user/profile.blade.php        | 13 +++++++++++
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/app/Ejaculation.php b/app/Ejaculation.php
index 3794add..7a8b2a7 100644
--- a/app/Ejaculation.php
+++ b/app/Ejaculation.php
@@ -46,14 +46,23 @@ class Ejaculation extends Model
     {
         if (Auth::check()) {
             // (ejaculation_id, user_id) でユニークなわけですが、サブクエリ発行させるのとLeft JoinしてNULLかどうかで結果を見るのどっちがいいんでしょうね
-            return $query->withCount([
-                'likes',
-                'likes as is_liked' => function ($query) {
-                    $query->where('user_id', Auth::id());
-                }
-            ]);
+            return $query
+                ->with(['likes.user' => function ($query) {
+                    $query->where('is_protected', false)
+                        ->orWhere('id', Auth::id());
+                }])
+                ->withCount([
+                    'likes',
+                    'likes as is_liked' => function ($query) {
+                        $query->where('user_id', Auth::id());
+                    }
+                ]);
         } else {
-            return $query->withCount('likes')
+            return $query
+                ->with(['likes.user' => function ($query) {
+                    $query->where('is_protected', false);
+                }])
+                ->withCount('likes')
                 ->addSelect('0 as is_liked');
         }
     }
diff --git a/resources/assets/sass/app.scss b/resources/assets/sass/app.scss
index 0da45fd..0075714 100644
--- a/resources/assets/sass/app.scss
+++ b/resources/assets/sass/app.scss
@@ -26,4 +26,8 @@ $primary: #e53fb1;
 
 .like-count:not(:empty) {
   padding-left: 0.5rem;
+}
+
+.like-users {
+  height: 30px;
 }
\ No newline at end of file
diff --git a/resources/views/components/ejaculation.blade.php b/resources/views/components/ejaculation.blade.php
index 0203135..2a398ff 100644
--- a/resources/views/components/ejaculation.blade.php
+++ b/resources/views/components/ejaculation.blade.php
@@ -29,6 +29,19 @@
         {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
     </p>
 @endif
+<!-- likes -->
+@if ($ejaculation->likes_count > 0)
+    <div class="my-2 py-1 border-top border-bottom d-flex align-items-center">
+        <div class="ml-2 mr-3 text-secondary"><span class="oi oi-heart" title="いいねしたユーザー"></span></div>
+        <div class="like-users flex-grow-1 overflow-hidden">
+            @foreach ($ejaculation->likes as $like)
+                @if ($like->user !== null)
+                    <a href="{{ route('user.profile', ['name' => $like->user->name]) }}"><img src="{{ $like->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded" data-toggle="tooltip" data-placement="bottom" title="{{ $like->user->display_name }}"></a>
+                @endif
+            @endforeach
+        </div>
+    </div>
+@endif
 <!-- actions -->
 <div class="ejaculation-actions">
     <button type="button" class="btn btn-link text-secondary"
diff --git a/resources/views/ejaculation/show.blade.php b/resources/views/ejaculation/show.blade.php
index a74bf70..d861fb6 100644
--- a/resources/views/ejaculation/show.blade.php
+++ b/resources/views/ejaculation/show.blade.php
@@ -60,6 +60,19 @@
                                 {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                             </p>
                         @endif
+                        <!-- likes -->
+                        @if ($ejaculation->likes_count > 0)
+                            <div class="my-2 py-1 border-top border-bottom d-flex align-items-center">
+                                <div class="ml-2 mr-3 text-secondary"><span class="oi oi-heart" title="いいねしたユーザー"></span></div>
+                                <div class="like-users flex-grow-1 overflow-hidden">
+                                    @foreach ($ejaculation->likes as $like)
+                                        @if ($like->user !== null)
+                                            <a href="{{ route('user.profile', ['name' => $like->user->name]) }}"><img src="{{ $like->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded" data-toggle="tooltip" data-placement="bottom" title="{{ $like->user->display_name }}"></a>
+                                        @endif
+                                    @endforeach
+                                </div>
+                            </div>
+                        @endif
                         <!-- actions -->
                         <div class="ejaculation-actions">
                             <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>
diff --git a/resources/views/user/profile.blade.php b/resources/views/user/profile.blade.php
index 22d5cd9..a81cf57 100644
--- a/resources/views/user/profile.blade.php
+++ b/resources/views/user/profile.blade.php
@@ -66,6 +66,19 @@
                         {!! Formatter::linkify(nl2br(e($ejaculation->note))) !!}
                     </p>
                 @endif
+                <!-- likes -->
+                @if ($ejaculation->likes_count > 0)
+                    <div class="my-2 py-1 border-top border-bottom d-flex align-items-center">
+                        <div class="ml-2 mr-3 text-secondary"><span class="oi oi-heart" title="いいねしたユーザー"></span></div>
+                        <div class="like-users flex-grow-1 overflow-hidden">
+                            @foreach ($ejaculation->likes as $like)
+                                @if ($like->user !== null)
+                                    <a href="{{ route('user.profile', ['name' => $like->user->name]) }}"><img src="{{ $like->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded" data-toggle="tooltip" data-placement="bottom" title="{{ $like->user->display_name }}"></a>
+                                @endif
+                            @endforeach
+                        </div>
+                    </div>
+                @endif
                 <!-- actions -->
                 <div class="ejaculation-actions">
                     <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>