UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-23 04:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update TimelineController

Browse source
This commit is contained in:
Daniel Supernault 2018-11-08 18:27:38 -07:00
parent 853a4bc7a5
commit cba743bb5b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,13 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Auth;
use App\Follower; use App\Follower;
use App\Profile; use App\Profile;
use App\Status; use App\Status;
use App\User; use App\User;
use App\UserFilter; use App\UserFilter;
use Auth; use Illuminate\Http\Request;
class TimelineController extends Controller class TimelineController extends Controller
{ {
@ -17,8 +18,11 @@ class TimelineController extends Controller
$this->middleware('twofactor'); $this->middleware('twofactor');
} }
public function personal() public function personal(Request $request)
{ {
$this->validate($request,[
'page' => 'nullable|integer|max:20'
]);
$pid = Auth::user()->profile->id; $pid = Auth::user()->profile->id;
// TODO: Use redis for timelines // TODO: Use redis for timelines
$following = Follower::whereProfileId($pid)->pluck('following_id'); $following = Follower::whereProfileId($pid)->pluck('following_id');
@ -32,14 +36,17 @@ class TimelineController extends Controller
->whereVisibility('public') ->whereVisibility('public')
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->withCount(['comments', 'likes']) ->withCount(['comments', 'likes'])
->simplePaginate(20); ->simplePaginate(10);
$type = 'personal'; $type = 'personal';
return view('timeline.template', compact('timeline', 'type')); return view('timeline.template', compact('timeline', 'type'));
} }
public function local() public function local(Request $request)
{ {
$this->validate($request,[
'page' => 'nullable|integer|max:20'
]);
// TODO: Use redis for timelines // TODO: Use redis for timelines
// $timeline = Timeline::build()->local(); // $timeline = Timeline::build()->local();
$pid = Auth::user()->profile->id; $pid = Auth::user()->profile->id;
@ -57,7 +64,7 @@ class TimelineController extends Controller
->whereVisibility('public') ->whereVisibility('public')
->withCount(['comments', 'likes']) ->withCount(['comments', 'likes'])
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')
->simplePaginate(20); ->simplePaginate(10);
$type = 'local'; $type = 'local';
return view('timeline.template', compact('timeline', 'type')); return view('timeline.template', compact('timeline', 'type'));