diff options
| author | lain <lain@soykaf.club> | 2020-07-03 14:59:12 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-03 14:59:12 +0000 |
| commit | 9a27ef47f1a3a95952f9c9b416e190f86b91b0ee (patch) | |
| tree | aab5e4b8d4c4687a27138b33066c01d0986627d1 /lib | |
| parent | 19fbfbb767169b58a8f6558d0ad1a9be6425b59d (diff) | |
| parent | 945e75c8e8f05fadd669c7aa084dd6ba7e9b5ab2 (diff) | |
| download | pleroma-9a27ef47f1a3a95952f9c9b416e190f86b91b0ee.tar.gz | |
Merge branch '1912-leading-trailing-space-search' into 'develop'
SearchController: Trim query.
Closes #1912
See merge request pleroma/pleroma!2717
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/search_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex index e50980122..29affa7d5 100644 --- a/lib/pleroma/web/mastodon_api/controllers/search_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/search_controller.ex @@ -44,6 +44,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchController do def search(conn, params), do: do_search(:v1, conn, params) defp do_search(version, %{assigns: %{user: user}} = conn, %{q: query} = params) do + query = String.trim(query) options = search_options(params, user) timeout = Keyword.get(Repo.config(), :timeout, 15_000) default_values = %{"statuses" => [], "accounts" => [], "hashtags" => []} |