Commit 502cb38c authored by lain's avatar lain

Move user search to User module.

parent efe12e1a
......@@ -274,4 +274,14 @@ def get_notified_from_activity(%Activity{data: %{"to" => to}} = activity) do
Repo.all(query)
end
def search(query, resolve) do
if resolve 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
Repo.all(q)
end
end
......@@ -308,19 +308,8 @@ def unfollow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
end
end
def dousersearch(%{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
accounts = Repo.all(q)
end
def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
accounts = Pleroma.Web.MastodonAPI.MastodonAPIController.dousersearch(conn, params)
accounts = User.search(query, params["resolve"] == "true")
q = from a in Activity,
where: fragment("?->>'type' = 'Create'", a.data),
......@@ -337,8 +326,8 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
json(conn, res)
end
def accountsearch(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
accounts = Pleroma.Web.MastodonAPI.MastodonAPIController.dousersearch(conn, params)
def account_search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
accounts = User.search(query, params["resolve"] == "true")
res = AccountView.render("accounts.json", users: accounts, for: user, as: :user)
......
......@@ -55,7 +55,7 @@ def user_fetcher(username) do
get "/accounts/verify_credentials", MastodonAPIController, :verify_credentials
get "/accounts/relationships", MastodonAPIController, :relationships
get "/accounts/search", MastodonAPIController, :accountsearch
get "/accounts/search", MastodonAPIController, :account_search
post "/accounts/:id/follow", MastodonAPIController, :follow
post "/accounts/:id/unfollow", MastodonAPIController, :unfollow
post "/accounts/:id/block", MastodonAPIController, :relationship_noop
......
......@@ -319,6 +319,19 @@ test "unimplemented mutes, follow_requests, blocks, domain blocks" do
end)
end
test "account seach", %{conn: conn} do
user = insert(:user)
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
conn = conn
|> assign(:user, user)
|> get("/api/v1/accounts/search", %{"q" => "2hu"})
assert [account] = json_response(conn, 200)
assert account["id"] == user_three.id
end
test "search", %{conn: conn} do
user = insert(:user)
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment