Update ApiV1Controller, fix max_id pagination on home and public timeline feeds

pull/5850/head
Daniel Supernault 6 months ago
parent cd85123ea7
commit 38e17a06e0
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1

@ -2554,7 +2554,7 @@ class ApiV1Controller extends Controller
$minId = null; $minId = null;
} }
if ($maxId) { if ($maxId && $res->count() >= $limit) {
$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"'; $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
} }
@ -2977,7 +2977,7 @@ class ApiV1Controller extends Controller
$minId = null; $minId = null;
} }
if ($maxId) { if ($maxId && $res->count() >= $limit) {
$link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"'; $link = '<'.$baseUrl.'max_id='.$minId.'>; rel="next"';
} }

@ -79,13 +79,13 @@ class LikeService {
$res = Cache::remember('pf:services:likes:liked_by:' . $status->id, 86400, function() use($status, $empty) { $res = Cache::remember('pf:services:likes:liked_by:' . $status->id, 86400, function() use($status, $empty) {
$like = Like::whereStatusId($status->id)->first(); $like = Like::whereStatusId($status->id)->first();
if(!$like) { if(!$like || !$like->profile_id) {
return $empty; return $empty;
} }
$id = $like->profile_id; $id = $like->profile_id;
$profile = ProfileService::get($id, true); $profile = AccountService::get($id, true);
if(!$profile) { if(!$profile) {
return []; return $empty;
} }
$profileUrl = "/i/web/profile/{$profile['id']}"; $profileUrl = "/i/web/profile/{$profile['id']}";
$res = [ $res = [

Loading…
Cancel
Save