mirror/pixelfed
1
0
Fork 1
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-25 01:05:36 +00:00
Code Issues Releases Wiki Activity

Update AccountController

Browse source
This commit is contained in:
Daniel Supernault 2018-07-17 18:06:57 -06:00
parent 1dd7c8d189
commit 593d532236
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/Http/Controllers/AccountController.php
View file

@ -18,15 +18,24 @@ class AccountController extends Controller
public function notifications(Request $request) public function notifications(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'page' => 'nullable|min:1|max:3' 'page' => 'nullable|min:1|max:3',
'a' => 'nullable|alpha_dash',
]); ]);
$profile = Auth::user()->profile; $profile = Auth::user()->profile;
$action = $request->input('a');
$timeago = Carbon::now()->subMonths(6); $timeago = Carbon::now()->subMonths(6);
$notifications = Notification::whereProfileId($profile->id) if($action && in_array($action, ['comment', 'follow', 'mention'])) {
->whereDate('created_at', '>', $timeago) $notifications = Notification::whereProfileId($profile->id)
->orderBy('id','desc') ->whereAction($action)
->take(30) ->whereDate('created_at', '>', $timeago)
->simplePaginate(); ->orderBy('id','desc')
->simplePaginate(30);
} else {
$notifications = Notification::whereProfileId($profile->id)
->whereDate('created_at', '>', $timeago)
->orderBy('id','desc')
->simplePaginate(30);
}
return view('account.activity', compact('profile', 'notifications')); return view('account.activity', compact('profile', 'notifications'));
} }
@ -105,4 +114,5 @@ class AccountController extends Controller
} }
return $notifications; return $notifications;
} }
} }