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))) !!}
@endif + +@if ($ejaculation->likes_count > 0) +