MastoAPI: Add accounts getting.

This commit is contained in:
Roger Braun 2017-09-13 17:36:02 +02:00
parent ad5001828e
commit d168ef5a9e
3 changed files with 40 additions and 13 deletions

View file

@ -28,6 +28,17 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
json(conn, account)
end
def user(conn, %{"id" => id}) do
with %User{} = user <- Repo.get(User, id) do
account = AccountView.render("account.json", %{user: user})
json(conn, account)
else
_e -> conn
|> put_status(404)
|> json(%{error: "Can't find user"})
end
end
def masto_instance(conn, _params) do
response = %{
uri: Web.base_url,

View file

@ -39,19 +39,6 @@ defmodule Pleroma.Web.Router do
post "/token", OAuthController, :token_exchange
end
scope "/api/v1", Pleroma.Web.MastodonAPI do
pipe_through :api
get "/instance", MastodonAPIController, :masto_instance
post "/apps", MastodonAPIController, :create_app
get "/timelines/public", MastodonAPIController, :public_timeline
get "/statuses/:id", MastodonAPIController, :get_status
get "/statuses/:id/context", MastodonAPIController, :get_context
get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
end
scope "/api/v1", Pleroma.Web.MastodonAPI do
pipe_through :authenticated_api
@ -70,6 +57,20 @@ defmodule Pleroma.Web.Router do
get "/notifications", MastodonAPIController, :notifications
end
scope "/api/v1", Pleroma.Web.MastodonAPI do
pipe_through :api
get "/instance", MastodonAPIController, :masto_instance
post "/apps", MastodonAPIController, :create_app
get "/timelines/public", MastodonAPIController, :public_timeline
get "/statuses/:id", MastodonAPIController, :get_status
get "/statuses/:id/context", MastodonAPIController, :get_context
get "/accounts/:id/statuses", MastodonAPIController, :user_statuses
get "/accounts/:id", MastodonAPIController, :user
end
scope "/api", Pleroma.Web do
pipe_through :config

View file

@ -198,4 +198,19 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert other_user.id == relationship["id"]
end
end
test "account fetching", %{conn: conn} do
user = insert(:user)
conn = conn
|> get("/api/v1/accounts/#{user.id}")
assert %{"id" => id} = json_response(conn, 200)
assert id == user.id
conn = build_conn()
|> get("/api/v1/accounts/-1")
assert %{"error" => "Can't find user"} = json_response(conn, 404)
end
end