diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php index b9011e595..37412c489 100644 --- a/app/Http/Controllers/Api/ApiV1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Controller.php @@ -3245,9 +3245,15 @@ class ApiV1Controller extends Controller 'limit' => 'nullable|integer|max:100' ]); - $tag = Hashtag::whereName($hashtag) - ->orWhere('slug', $hashtag) - ->first(); + if(config('database.default') === 'pgsql') { + $tag = Hashtag::where('name', 'ilike', $hashtag) + ->orWhere('slug', 'ilike', $hashtag) + ->first(); + } else { + $tag = Hashtag::whereName($hashtag) + ->orWhere('slug', $hashtag) + ->first(); + } if(!$tag) { return response()->json([]); diff --git a/app/Http/Controllers/DiscoverController.php b/app/Http/Controllers/DiscoverController.php index 3dab2b40b..4bb7277a4 100644 --- a/app/Http/Controllers/DiscoverController.php +++ b/app/Http/Controllers/DiscoverController.php @@ -61,7 +61,12 @@ class DiscoverController extends Controller $end = $page > 1 ? $page * 9 : 0; $tag = $request->input('hashtag'); - $hashtag = Hashtag::whereName($tag)->firstOrFail(); + if(config('database.default') === 'pgsql') { + $hashtag = Hashtag::where('name', 'ilike', $tag)->firstOrFail(); + } else { + $hashtag = Hashtag::whereName($tag)->firstOrFail(); + } + if($hashtag->is_banned == true) { return []; }