From 8c65d60b7704a230994fb9aa7c2f02a159b573a6 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 24 Mar 2022 22:41:19 -0600
Subject: [PATCH] Update ApiV1Controller, fix tag timeline limits and remove
 has(media) constraint

---
 app/Http/Controllers/Api/ApiV1Controller.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
index 6cc6fccea..5f601d4d6 100644
--- a/app/Http/Controllers/Api/ApiV1Controller.php
+++ b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -2365,7 +2365,7 @@ class ApiV1Controller extends Controller
 		  'page'        => 'nullable|integer|max:40',
 		  'min_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
 		  'max_id'      => 'nullable|integer|min:0|max:' . PHP_INT_MAX,
-		  'limit'       => 'nullable|integer|max:40'
+		  'limit'       => 'nullable|integer|max:100'
 		]);
 
 		$tag = Hashtag::whereName($hashtag)
@@ -2390,18 +2390,18 @@ class ApiV1Controller extends Controller
 
 		$res = StatusHashtag::whereHashtagId($tag->id)
 			->whereStatusVisibility('public')
-			->whereHas('media')
 			->where('status_id', $dir, $id)
 			->latest()
 			->limit($limit)
 			->pluck('status_id')
-			->filter(function($i) {
-				return StatusService::getMastodon($i);
-			})
 			->map(function ($i) {
-				return StatusService::getMastodon($i);
+				if($i) {
+					return StatusService::getMastodon($i);
+				}
+			})
+			->filter(function($i) {
+				return $i && isset($i['account']);
 			})
-			->filter()
 			->values()
 			->toArray();