chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

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

Browse source 
Update BaseApiController, remove caching
This commit is contained in:
daniel 2019-04-06 22:56:59 -06:00 committed by GitHub
commit 9f5d31ec01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/Api/BaseApiController.php
View file

@ -56,17 +56,13 @@ class BaseApiController extends Controller
public function notifications(Request $request) public function notifications(Request $request)
{ {
$pid = Auth::user()->profile->id; $pid = Auth::user()->profile->id;
$page = $request->input('page') ?? 1;
$res = Cache::remember('profile:notifications:'.$pid.':page:'.$page, now()->addMinutes(5), function() use($pid) {
$timeago = Carbon::now()->subMonths(6); $timeago = Carbon::now()->subMonths(6);
$notifications = Notification::whereHas('actor') $notifications = Notification::whereProfileId($pid)
->whereProfileId($pid)
->whereDate('created_at', '>', $timeago) ->whereDate('created_at', '>', $timeago)
->orderBy('created_at','desc') ->orderBy('created_at','desc')
->paginate(10); ->paginate(10);
$resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer()); $resource = new Fractal\Resource\Collection($notifications, new NotificationTransformer());
return $this->fractal->createData($resource)->toArray(); $res = $this->fractal->createData($resource)->toArray();
});
return response()->json($res); return response()->json($res);
} }