diff options
author | Roger Braun <roger@rogerbraun.net> | 2017-09-16 11:26:20 +0200 |
---|---|---|
committer | Roger Braun <roger@rogerbraun.net> | 2017-09-16 11:26:20 +0200 |
commit | c36229c4aa3bd0ac49d9dcd589790f5c47470564 (patch) | |
tree | 41069cf98a07d3cac10f8a4a5d3299c21e228c12 /lib | |
parent | f0257c751611f4eed076c69260a5dc4ef81a6728 (diff) | |
download | pleroma-c36229c4aa3bd0ac49d9dcd589790f5c47470564.tar.gz |
Add remote user fetching to search.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index fcc87d414..c231ff7f8 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -287,7 +287,11 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end end - def search(%{assigns: %{user: user}} = conn, %{"q" => query}) do + def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do + if params["resolve"] == "true" do + User.get_or_fetch_by_nickname(query) + end + q = from u in User, where: fragment("(to_tsvector('english', ?) || to_tsvector('english', ?)) @@ plainto_tsquery('english', ?)", u.nickname, u.name, ^query), limit: 20 |