|
|
@ -2015,6 +2015,19 @@ class ApiV1Controller extends Controller
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
$res = collect($feed)
|
|
|
|
$res = collect($feed)
|
|
|
|
|
|
|
|
->filter(function($k) use($min, $max) {
|
|
|
|
|
|
|
|
if(!$min && !$max) {
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if($min) {
|
|
|
|
|
|
|
|
return $min != $k;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if($max) {
|
|
|
|
|
|
|
|
return $max != $k;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
})
|
|
|
|
->map(function($k) use($user) {
|
|
|
|
->map(function($k) use($user) {
|
|
|
|
$status = StatusService::getMastodon($k);
|
|
|
|
$status = StatusService::getMastodon($k);
|
|
|
|
if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
|
|
|
|
if(!$status || !isset($status['account']) || !isset($status['account']['id'])) {
|
|
|
@ -2032,7 +2045,6 @@ class ApiV1Controller extends Controller
|
|
|
|
})
|
|
|
|
})
|
|
|
|
->take($limit)
|
|
|
|
->take($limit)
|
|
|
|
->values();
|
|
|
|
->values();
|
|
|
|
// ->toArray();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&';
|
|
|
|
$baseUrl = config('app.url') . '/api/v1/timelines/public?limit=' . $limit . '&';
|
|
|
|
if($remote) {
|
|
|
|
if($remote) {
|
|
|
|