From c36229c4aa3bd0ac49d9dcd589790f5c47470564 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 16 Sep 2017 11:26:20 +0200 Subject: Add remote user fetching to search. --- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3