Merge pull request #4353 from pixelfed/staging

Staging

app/Services/SearchApiV2Service.php

@@ -96,9 +96,10 @@ class SearchApiV2Service
 			$webfingerQuery = '@' . $webfingerQuery;
 		}
 		$banned = InstanceService::getBannedDomains();
+		$operator = config('database.default') === 'pgsql' ? 'ilike' : 'like';
 		$results = Profile::select('username', 'id', 'followers_count', 'domain')
-			->where('username', 'like', $query)
-			->orWhere('webfinger', 'like', $webfingerQuery)
+			->where('username', $operator, $query)
+			->orWhere('webfinger', $operator, $webfingerQuery)
 			->orderByDesc('profiles.followers_count')
 			->offset($offset)
 			->limit($limit)
@@ -160,23 +161,8 @@ class SearchApiV2Service
 
 	protected function statusesById()
 	{
-		$mastodonMode = self::$mastodonMode;
-		$accountId = $this->query->input('account_id');
-		$limit = $this->query->input('limit', 20);
-		$query = '%' . $this->query->input('q') . '%';
-		$results = Status::where('caption', 'like', $query)
-			->whereProfileId($accountId)
-			->limit($limit)
-			->get()
-			->map(function($status) use($mastodonMode) {
-				return $mastodonMode ?
-					StatusService::getMastodon($status->id) :
-					StatusService::get($status->id);
-			})
-			->filter(function($status) {
-				return $status && isset($status['account']);
-			});
-		return $results;
+		// Removed until we provide more relevent sorting/results
+		return [];
 	}
 
 	protected function resolveQuery()

public/mix-manifest.json

@@ -18,7 +18,7 @@
     "/js/direct.js": "/js/direct.js?id=5816111700ad8f8a89c932485f3a1e47",
     "/js/admin.js": "/js/admin.js?id=840e3b76bda57a29784bb2988e856cd8",
     "/js/live-player.js": "/js/live-player.js?id=c987b3cd69e432f1b3d52da2901ed305",
-    "/js/spa.js": "/js/spa.js?id=4ce50f39c838c9a5360caaefd32b0893",
+    "/js/spa.js": "/js/spa.js?id=389c0d1180a5c70596512ae37331e59b",
     "/js/stories.js": "/js/stories.js?id=4db94699502e85543192865879bece7d",
     "/js/portfolio.js": "/js/portfolio.js?id=646ebcbb4cab1dc0942dde3f8126940d",
     "/js/installer.js": "/js/installer.js?id=cd240ae970947b76ac49032ba95e0922",