commit: c36229c4aa3bd0ac49d9dcd589790f5c47470564
parent: f0257c751611f4eed076c69260a5dc4ef81a6728
Author: Roger Braun <roger@rogerbraun.net>
Date: Sat, 16 Sep 2017 11:26:20 +0200
Add remote user fetching to search.
Diffstat:
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git 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
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -332,4 +332,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
[status] = results["statuses"]
assert status["id"] == activity.id
end
+
+ test "search fetches remote accounts", %{conn: conn} do
+ conn = conn
+ |> get("/api/v1/search", %{"q" => "shp@social.heldscal.la", "resolve" => "true"})
+
+ assert results = json_response(conn, 200)
+ [account] = results["accounts"]
+ assert account["acct"] == "shp@social.heldscal.la"
+ end
end