UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-26 23:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Update DiscoverController
This commit is contained in:
daniel 2019-03-02 01:40:05 -07:00 committed by GitHub
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)
{
$this->validate($request, [
'page' => 'nullable|integer|min:1|max:10',
'page' => 'nullable|integer|min:1|max:20',
]);
$tag = Hashtag::with('posts')
@ -37,7 +37,12 @@ class DiscoverController extends Controller
->whereSlug($hashtag)
->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('uri')
->whereHas('media')
@ -45,7 +50,8 @@ class DiscoverController extends Controller
->whereIsNsfw(false)
->whereVisibility('public')
->orderBy('id', 'desc')
->simplePaginate(12);
->simplePaginate(24);
});
if($posts->count() == 0) {
abort(404);