|
|
@ -304,7 +304,7 @@ class PublicApiController extends Controller
|
|
|
|
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
|
|
|
|
->whereIn('type', ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
|
|
|
|
->whereNotIn('profile_id', $filtered)
|
|
|
|
->whereNotIn('profile_id', $filtered)
|
|
|
|
->whereLocal(true)
|
|
|
|
->whereLocal(true)
|
|
|
|
->whereVisibility('public')
|
|
|
|
->whereScope('public')
|
|
|
|
->orderBy('created_at', 'desc')
|
|
|
|
->orderBy('created_at', 'desc')
|
|
|
|
->limit($limit)
|
|
|
|
->limit($limit)
|
|
|
|
->get();
|
|
|
|
->get();
|
|
|
@ -332,7 +332,7 @@ class PublicApiController extends Controller
|
|
|
|
->whereNotIn('profile_id', $filtered)
|
|
|
|
->whereNotIn('profile_id', $filtered)
|
|
|
|
->with('profile', 'hashtags', 'mentions')
|
|
|
|
->with('profile', 'hashtags', 'mentions')
|
|
|
|
->whereLocal(true)
|
|
|
|
->whereLocal(true)
|
|
|
|
->whereVisibility('public')
|
|
|
|
->whereScope('public')
|
|
|
|
->orderBy('created_at', 'desc')
|
|
|
|
->orderBy('created_at', 'desc')
|
|
|
|
->simplePaginate($limit);
|
|
|
|
->simplePaginate($limit);
|
|
|
|
}
|
|
|
|
}
|
|
|
|