Update ApiV1Controller, fix bookmarks endpoint

app/Http/Controllers/Api/ApiV1Controller.php

@@ -2935,24 +2935,20 @@ class ApiV1Controller extends Controller
 		$dir = $min_id ? '>' : '<';
 		$id = $min_id ?? $max_id;
 
-		if($id) {
+		$bookmarks = Bookmark::whereProfileId($pid)
-			$bookmarks = Bookmark::whereProfileId($pid)
+			->when($id, function($id, $query) use($dir) {
-				->where('status_id', $dir, $id)
+				return $query->where('status_id', $dir, $id);
-				->limit($limit)
+			})
-				->pluck('status_id');
+			->limit($limit)
-		} else {
+			->pluck('status_id')
-			$bookmarks = Bookmark::whereProfileId($pid)
+			->map(function($id) {
-				->latest()
+				return \App\Services\StatusService::getMastodon($id);
-				->limit($limit)
+			})
-				->pluck('status_id');
+			->filter()
-		}
+			->values()
-
+			->toArray();
-		$res = [];
-		foreach($bookmarks as $id) {
-			$res[] = \App\Services\StatusService::getMastodon($id);
-		}
 
-		return $this->json($res);
+		return $this->json($bookmarks);
 	}
 
 	/**