Update ApiV1Controller and DiscoverController, fix postgres hashtag s…

…earch
pixelfed · May 3, 2023 · 055aa6b · 055aa6b
1 parent 55293e9
commit 055aa6b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/app/Http/Controllers/Api/ApiV1Controller.php b/app/Http/Controllers/Api/ApiV1Controller.php
@@ -3245,9 +3245,15 @@ public function timelineHashtag(Request $request, $hashtag)
 		  '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
@@ -61,7 +61,12 @@ public function getHashtags(Request $request)
 		$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 [];
 		}