From 36e4f87386207d3ecb186f8b578f3cd2e037ba9a Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Sat, 2 Mar 2019 21:46:49 -0700
Subject: [PATCH] Update DiscoverController

---
 app/Http/Controllers/DiscoverController.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php
index 2a69f97eb..4501535d2 100644
--- a/app/Http/Controllers/DiscoverController.php
+++ b/app/Http/Controllers/DiscoverController.php
@@ -28,16 +28,12 @@ class DiscoverController extends Controller
 
     public function showTags(Request $request, $hashtag)
     {
-        $this->validate($request, [
-          'page' => 'nullable|integer|min:1|max:20',
-        ]);
-
         $tag = Hashtag::whereSlug($hashtag)
           ->firstOrFail();
 
-        $page = $request->input('page') ?? 1;
+        $page = 1;
         $key = 'discover:tag-'.$tag->id.':page-'.$page;
-        $keyMinutes = $page == 1 ? 15 : 5;
+        $keyMinutes = 15;
 
         $posts = Cache::remember($key, now()->addMinutes($keyMinutes), function() use ($tag, $request) {
           return $tag->posts()
@@ -48,7 +44,8 @@ class DiscoverController extends Controller
           ->whereIsNsfw(false)
           ->whereVisibility('public')
           ->orderBy('id', 'desc')
-          ->simplePaginate(24);
+          ->take(24)
+          ->get();
         });
 
         if($posts->count() == 0) {