Merge pull request #171 from shikorism/develop

Release 20190407.0014

app/Http/Controllers/SearchController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Ejaculation;
 use App\Tag;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class SearchController extends Controller
 {
@@ -18,6 +19,12 @@ class SearchController extends Controller
             ->whereHas('tags', function ($query) use ($inputs) {
                 $query->where('name', 'like', "%{$inputs['q']}%");
             })
+            ->whereHas('user', function ($query) {
+                $query->where('is_protected', false);
+                if (Auth::check()) {
+                    $query->orWhere('id', Auth::id());
+                }
+            })
             ->where('is_private', false)
             ->orderBy('ejaculated_date', 'desc')
             ->with(['user', 'tags'])

app/Http/Controllers/UserController.php

@@ -67,6 +67,8 @@ SQL
             abort(404);
         }
 
+        $dateUntil = now()->addMonth()->startOfMonth();
+
         $groupByDay = Ejaculation::select(DB::raw(
             <<<'SQL'
 to_char(ejaculated_date, 'YYYY/MM/DD') AS "date",
@@ -74,6 +76,7 @@ count(*) AS "count"
 SQL
         ))
             ->where('user_id', $user->id)
+            ->where('ejaculated_date', '<', $dateUntil)
             ->groupBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')"))
             ->orderBy(DB::raw("to_char(ejaculated_date, 'YYYY/MM/DD')"))
             ->get();
@@ -85,6 +88,7 @@ count(*) AS "count"
 SQL
         ))
             ->where('user_id', $user->id)
+            ->where('ejaculated_date', '<', $dateUntil)
             ->groupBy(DB::raw("to_char(ejaculated_date, 'HH24')"))
             ->orderBy(DB::raw('1'))
             ->get();

public/manifest.json

@@ -4,6 +4,7 @@
     "description": "気持ちよくティッシュを使った、そのあとの感想戦。",
     "display": "minimal-ui",
     "start_url": "/",
+    "theme_color": "#e53fb1",
     "share_target": {
         "action": "/checkin",
         "method": "GET",

resources/views/home.blade.php

@@ -58,7 +58,7 @@
                             <!-- span -->
                             <div class="d-flex justify-content-between">
                                 <h5>
-                                    <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> {{ $ejaculation->user->display_name }}</a>
+                                    <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> <bdi>{{ $ejaculation->user->display_name }}</bdi></a>
                                     <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a>
                                 </h5>
                                 <div>

resources/views/search/index.blade.php

@@ -10,7 +10,7 @@
                 <!-- span -->
                 <div class="d-flex justify-content-between">
                     <h5>
-                        <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> {{ $ejaculation->user->display_name }}</a>
+                        <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> <bdi>{{ $ejaculation->user->display_name }}</bdi></a>
                         <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a>
                     </h5>
                     <div>

resources/views/timeline/public.blade.php

@@ -14,7 +14,7 @@
                     <!-- span -->
                     <div class="d-flex justify-content-between">
                         <h5>
-                            <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> {{ $ejaculation->user->display_name }}</a>
+                            <a href="{{ route('user.profile', ['id' => $ejaculation->user->name]) }}" class="text-dark"><img src="{{ $ejaculation->user->getProfileImageUrl(30) }}" width="30" height="30" class="rounded d-inline-block align-bottom"> <bdi>{{ $ejaculation->user->display_name }}</bdi></a>
                             <a href="{{ route('checkin.show', ['id' => $ejaculation->id]) }}" class="text-muted"><small>{{ $ejaculation->ejaculated_date->format('Y/m/d H:i') }}</small></a>
                         </h5>
                         <div>