From 66322dfec02b65c6dfad6299dd8e64b7a9a5ff4e Mon Sep 17 00:00:00 2001 From: shibafu Date: Fri, 24 Jul 2020 17:51:48 +0900 Subject: [PATCH] =?UTF-8?q?Webhook=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=82=92=E3=81=8A=E6=83=A3=E8=8F=9C=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=8A=E3=83=BC=E3=81=AB=E6=B5=81=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Ejaculation.php | 4 ++-- app/Http/Controllers/HomeController.php | 2 +- app/Http/Controllers/TimelineController.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Ejaculation.php b/app/Ejaculation.php index 5515cfc..bc0c236 100644 --- a/app/Ejaculation.php +++ b/app/Ejaculation.php @@ -49,9 +49,9 @@ class Ejaculation extends Model return $this->hasMany(Like::class); } - public function scopeOnlyWebCheckin(Builder $query) + public function scopePublic(Builder $query) { - return $query->where('ejaculations.source', Ejaculation::SOURCE_WEB); + return $query->whereIn('ejaculations.source', [Ejaculation::SOURCE_WEB, Ejaculation::SOURCE_WEBHOOK]); } public function scopeWithLikes(Builder $query) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index e158ddb..d029996 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -71,7 +71,7 @@ SQL ->select('ejaculations.*') ->with('user', 'tags') ->withLikes() - ->onlyWebCheckin() + ->public() ->take(21) ->get(); diff --git a/app/Http/Controllers/TimelineController.php b/app/Http/Controllers/TimelineController.php index 1113c6d..e0a50e0 100644 --- a/app/Http/Controllers/TimelineController.php +++ b/app/Http/Controllers/TimelineController.php @@ -19,7 +19,7 @@ class TimelineController extends Controller ->select('ejaculations.*') ->with('user', 'tags') ->withLikes() - ->onlyWebCheckin() + ->public() ->paginate(21); return view('timeline.public')->with(compact('ejaculations'));