mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-25 15:55:22 +00:00
Improve DiscoverService
This commit is contained in:
parent
fd2d37432b
commit
aee9b994e3
3 changed files with 16 additions and 18 deletions
|
@ -2446,7 +2446,7 @@ class ApiV1Controller extends Controller
|
|||
$pid = $request->user()->profile_id;
|
||||
$filters = UserFilterService::filters($pid);
|
||||
$forYou = DiscoverService::getForYou();
|
||||
$posts = $forYou->random(50)->map(function($post) {
|
||||
$posts = $forYou->take(50)->map(function($post) {
|
||||
return StatusService::get($post);
|
||||
})
|
||||
->filter(function($post) use($filters) {
|
||||
|
|
|
@ -72,7 +72,7 @@ class InternalApiController extends Controller
|
|||
$pid = $request->user()->profile_id;
|
||||
$filters = UserFilterService::filters($pid);
|
||||
$forYou = DiscoverService::getForYou();
|
||||
$posts = $forYou->random(50)->map(function($post) {
|
||||
$posts = $forYou->take(50)->map(function($post) {
|
||||
return StatusService::get($post);
|
||||
})
|
||||
->filter(function($post) use($filters) {
|
||||
|
|
|
@ -3,28 +3,26 @@
|
|||
namespace App\Services;
|
||||
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use App\Status;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class DiscoverService
|
||||
{
|
||||
public static function getDailyIdPool()
|
||||
{
|
||||
$min_id = SnowflakeService::byDate(now()->subMonths(3));
|
||||
return Status::select(
|
||||
'id',
|
||||
'is_nsfw',
|
||||
'profile_id',
|
||||
'type',
|
||||
'uri',
|
||||
)
|
||||
->whereNull('uri')
|
||||
->whereType('photo')
|
||||
->whereIsNsfw(false)
|
||||
->whereVisibility('public')
|
||||
->where('id', '>', $min_id)
|
||||
->inRandomOrder()
|
||||
->take(300)
|
||||
->pluck('id');
|
||||
$sqld = config('database.default') == 'mysql';
|
||||
return DB::table('statuses')
|
||||
->whereNull('uri')
|
||||
->whereType('photo')
|
||||
->whereIsNsfw(false)
|
||||
->whereVisibility('public')
|
||||
->when($sqld, function($q, $sqld) {
|
||||
return $q->groupBy('profile_id');
|
||||
})
|
||||
->where('id', '>', $min_id)
|
||||
->inRandomOrder()
|
||||
->take(300)
|
||||
->pluck('id');
|
||||
}
|
||||
|
||||
public static function getForYou()
|
||||
|
|
Loading…
Reference in a new issue