mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #929 from pixelfed/frontend-ui-refactor 

Update DiscoverController
This commit is contained in:
daniel 2019-03-02 01:40:05 -07:00 committed by GitHub
parent 2a1d4124be d50e9c4df9
commit d52fa44dd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/DiscoverController.php
View File

@ -29,7 +29,7 @@ class DiscoverController extends Controller
public function showTags(Request $request, $hashtag) public function showTags(Request $request, $hashtag)
{ {
$this->validate($request, [ $this->validate($request, [
'page' => 'nullable|integer|min:1|max:10', 'page' => 'nullable|integer|min:1|max:20',
]); ]);
$tag = Hashtag::with('posts') $tag = Hashtag::with('posts')
@ -37,7 +37,12 @@ class DiscoverController extends Controller
->whereSlug($hashtag) ->whereSlug($hashtag)
->firstOrFail(); ->firstOrFail();
$posts = $tag->posts() $page = $request->input('page') ?? 1;
$key = 'discover:tag-'.$tag->id.':page-'.$page;
$keyMinutes = $page > 1 ? 5 : 2;
$posts = Cache::remember($key, now()->addMinutes($keyMinutes), function() use ($tag, $request) {
return $tag->posts()
->whereNull('url') ->whereNull('url')
->whereNull('uri') ->whereNull('uri')
->whereHas('media') ->whereHas('media')
@ -45,7 +50,8 @@ class DiscoverController extends Controller
->whereIsNsfw(false) ->whereIsNsfw(false)
->whereVisibility('public') ->whereVisibility('public')
->orderBy('id', 'desc') ->orderBy('id', 'desc')
->simplePaginate(12); ->simplePaginate(24);
});
if($posts->count() == 0) { if($posts->count() == 0) {
abort(404); abort(404);