UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 22:41:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update TimelineController

Browse source
This commit is contained in:
Daniel Supernault 2018-08-15 20:03:32 -06:00
parent 865a7c4da5
commit 5f13428197
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/TimelineController.php
View file

@ -20,6 +20,7 @@ class TimelineController extends Controller
$following->push(Auth::user()->profile->id); $following->push(Auth::user()->profile->id);
$timeline = Status::whereIn('profile_id', $following) $timeline = Status::whereIn('profile_id', $following)
->orderBy('id','desc') ->orderBy('id','desc')
->withCount(['comments', 'likes'])
->simplePaginate(20); ->simplePaginate(20);
$type = 'personal'; $type = 'personal';
return view('timeline.template', compact('timeline', 'type')); return view('timeline.template', compact('timeline', 'type'));
@ -31,6 +32,7 @@ class TimelineController extends Controller
// $timeline = Timeline::build()->local(); // $timeline = Timeline::build()->local();
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')
->withCount(['comments', 'likes'])
->orderBy('id','desc') ->orderBy('id','desc')
->simplePaginate(20); ->simplePaginate(20);
$type = 'local'; $type = 'local';