From 6fc0dcb34d52bc523fd41ac46de73480d3467020 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 9 Jan 2022 20:18:51 -0700 Subject: [PATCH 1/2] Update ApiV1Controller, fix home timeline entities --- app/Http/Controllers/Api/ApiV1Controller.php | 128 +++++++++---------- 1 file changed, 59 insertions(+), 69 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 3f116e3f1..c8cdc7dfd 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -1596,8 +1596,6 @@ class ApiV1Controller extends Controller */ public function timelineHome(Request $request) { - abort_if(!$request->user(), 403); - $this->validate($request,[ 'page' => 'nullable|integer|max:40', 'min_id' => 'nullable|integer|min:0|max:' . PHP_INT_MAX, @@ -1609,18 +1607,6 @@ class ApiV1Controller extends Controller $min = $request->input('min_id'); $max = $request->input('max_id'); $limit = $request->input('limit') ?? 3; - $user = $request->user(); - - if($user->last_active_at) { - $key = 'user:last_active_at:id:'.$user->id; - $ttl = now()->addMinutes(5); - Cache::remember($key, $ttl, function() use($user) { - $user->last_active_at = now(); - $user->save(); - return; - }); - } - $pid = $request->user()->profile_id; $following = Cache::remember('profile:following:'.$pid, now()->addMinutes(1440), function() use($pid) { @@ -1631,63 +1617,68 @@ class ApiV1Controller extends Controller if($min || $max) { $dir = $min ? '>' : '<'; $id = $min ?? $max; - $timeline = Status::select( - 'id', - 'uri', - 'caption', - 'rendered', - 'profile_id', - 'type', - 'in_reply_to_id', - 'reblog_of_id', - 'is_nsfw', - 'scope', - 'local', - 'reply_count', - 'likes_count', - 'reblogs_count', - 'comments_disabled', - 'place_id', - 'created_at', - 'updated_at' - )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) - ->with('profile', 'hashtags', 'mentions') - ->where('id', $dir, $id) - ->whereIn('profile_id', $following) - ->whereIn('visibility',['public', 'unlisted', 'private']) - ->latest() - ->limit($limit) - ->get(); + $res = Status::select( + 'id', + 'profile_id', + 'type', + 'visibility', + 'created_at' + ) + ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) + ->where('id', $dir, $id) + ->whereIn('profile_id', $following) + ->whereIn('visibility',['public', 'unlisted', 'private']) + ->latest() + ->take($limit) + ->get() + ->map(function($s) use($pid) { + $status = StatusService::getMastodon($s['id']); + if(!$status || !isset($status['account']) || !isset($status['account']['id'])) { + return false; + } + + if($pid) { + $status['favourited'] = (bool) LikeService::liked($pid, $s['id']); + } + return $status; + }) + ->filter(function($status) { + return $status && isset($status['account']); + }) + ->values() + ->toArray(); } else { - $timeline = Status::select( - 'id', - 'uri', - 'caption', - 'rendered', - 'profile_id', - 'type', - 'in_reply_to_id', - 'reblog_of_id', - 'is_nsfw', - 'scope', - 'local', - 'reply_count', - 'comments_disabled', - 'likes_count', - 'reblogs_count', - 'place_id', - 'created_at', - 'updated_at' - )->whereIn('type', ['photo', 'photo:album', 'video', 'video:album']) - ->with('profile', 'hashtags', 'mentions') - ->whereIn('profile_id', $following) - ->whereIn('visibility',['public', 'unlisted', 'private']) - ->latest() - ->simplePaginate($limit); + $res = Status::select( + 'id', + 'profile_id', + 'type', + 'visibility', + 'created_at' + ) + ->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) + ->whereIn('profile_id', $following) + ->whereIn('visibility',['public', 'unlisted', 'private']) + ->latest() + ->take($limit) + ->get() + ->map(function($s) use($pid) { + $status = StatusService::getMastodon($s['id']); + if(!$status || !isset($status['account']) || !isset($status['account']['id'])) { + return false; + } + + if($pid) { + $status['favourited'] = (bool) LikeService::liked($pid, $s['id']); + } + return $status; + }) + ->filter(function($status) { + return $status && isset($status['account']); + }) + ->values() + ->toArray(); } - $fractal = new Fractal\Resource\Collection($timeline, new StatusTransformer()); - $res = $this->fractal->createData($fractal)->toArray(); return response()->json($res); } @@ -1800,7 +1791,6 @@ class ApiV1Controller extends Controller if($user) { $status['favourited'] = (bool) LikeService::liked($user->profile_id, $k); - $status['relationship'] = RelationshipService::get($user->profile_id, $status['account']['id']); } return $status; }) From 5de6d8accbbab93bd5445e470fdab69c3f81554a Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 9 Jan 2022 20:20:38 -0700 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a4a245ab5..5808e6a9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -92,6 +92,7 @@ - Updated components, fix api endpoints. Fixes #3138. ([e724633e](https://github.com/pixelfed/pixelfed/commit/e724633e)) - Updated ApiV1Controller, fix public timeline endpoint. ([80c7def3](https://github.com/pixelfed/pixelfed/commit/80c7def3)) - Updated PublicApiController, fix public timeline endpoint. ([dcb7ba9c](https://github.com/pixelfed/pixelfed/commit/dcb7ba9c)) +- Updated ApiV1Controller, fix home timeline entities. ([6fc0dcb3](https://github.com/pixelfed/pixelfed/commit/6fc0dcb3)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.1 (2021-09-07)](https://github.com/pixelfed/pixelfed/compare/v0.11.0...v0.11.1)