浏览代码

Update ApiV1Controller and DiscoverController, fix postgres hashtag search

Daniel Supernault 2 年之前
父节点
当前提交
055aa6b39f
共有 2 个文件被更改,包括 15 次插入4 次删除
  1. 9 3
      app/Http/Controllers/Api/ApiV1Controller.php
  2. 6 1
      app/Http/Controllers/DiscoverController.php

+ 9 - 3
app/Http/Controllers/Api/ApiV1Controller.php

@@ -3245,9 +3245,15 @@ class ApiV1Controller extends Controller
 		  'limit'       => 'nullable|integer|max:100'
 		  '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) {
 		if(!$tag) {
 			return response()->json([]);
 			return response()->json([]);

+ 6 - 1
app/Http/Controllers/DiscoverController.php

@@ -61,7 +61,12 @@ class DiscoverController extends Controller
 		$end = $page > 1 ? $page * 9 : 0;
 		$end = $page > 1 ? $page * 9 : 0;
 		$tag = $request->input('hashtag');
 		$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) {
 		if($hashtag->is_banned == true) {
 			return [];
 			return [];
 		}
 		}