Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/Http/Controllers/SearchController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Rapidez\Core\Models\Scopes\IsActiveScope;
use Rapidez\Core\Models\SearchQuery;

Expand All @@ -15,9 +16,13 @@ public function __invoke(Request $request)
return view('rapidez::search.overview');
}

$searchQuery = $this->track($request);
try {
$searchQuery = $this->track($request);
} catch (ValidationException $e) {
$searchQuery = null;
}

if ($searchQuery->is_active === 1 && $searchQuery->redirect) {
if ($searchQuery && $searchQuery->is_active === 1 && $searchQuery->redirect) {
return redirect($searchQuery->redirect, 301);
}

Expand All @@ -37,6 +42,8 @@ public function store(Request $request)

public function track(Request $request): SearchQuery
{
$request->validate(['q' => 'required|string|max:255']);

// Prevent automatic indexing each time it is updated.
config('rapidez.models.search_query')::disableSearchSyncing();
$searchQuery = config('rapidez.models.search_query')::withoutGlobalScope(IsActiveScope::class)
Expand Down
Loading