From fc1a385cfda2e8419239b6ee89ca3a8fa03e0185 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 8 May 2023 22:50:49 -0600 Subject: [PATCH] Update ApiV1Controller, fix hashtag timeline --- app/Http/Controllers/Api/ApiV1Controller.php | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index 1ba73ae8f..1c4254fef 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -3270,6 +3270,16 @@ class ApiV1Controller extends Controller $max = $request->input('max_id'); $limit = $request->input('limit', 20); + if($min || $max) { + $minMax = SnowflakeService::byDate(now()->subMonths(6)); + if($min && intval($min) < $minMax) { + return []; + } + if($max && intval($max) < $minMax) { + return []; + } + } + if(!$min && !$max) { $id = 1; $dir = '>'; @@ -3279,15 +3289,13 @@ class ApiV1Controller extends Controller } $res = StatusHashtag::whereHashtagId($tag->id) - ->whereStatusVisibility('public') ->where('status_id', $dir, $id) - ->latest() + ->whereStatusVisibility('public') + ->orderBy('status_id', 'desc') ->limit($limit) ->pluck('status_id') ->map(function ($i) { - if($i) { - return StatusService::getMastodon($i); - } + return StatusService::getMastodon($i); }) ->filter(function($i) { return $i && isset($i['account']);