MastoAPI: Add list of blocked users.

This commit is contained in:
Roger Braun 2017-11-03 08:51:17 +01:00
parent 5bf92e50be
commit c6b9b777da
3 changed files with 25 additions and 1 deletions

View File

@ -335,6 +335,15 @@ def unblock(%{assigns: %{user: blocker}} = conn, %{"id" => id}) do
end end
end end
# TODO: Use proper query
def blocks(%{assigns: %{user: user}} = conn, _) do
with blocked_users <- user.info["blocks"] || [],
accounts <- Enum.map(blocked_users, fn (ap_id) -> User.get_cached_by_ap_id(ap_id) end) do
res = AccountView.render("accounts.json", users: accounts, for: user, as: :user)
json(conn, res)
end
end
def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
accounts = User.search(query, params["resolve"] == "true") accounts = User.search(query, params["resolve"] == "true")

View File

@ -65,7 +65,8 @@ def user_fetcher(username) do
post "/follows", MastodonAPIController, :follow post "/follows", MastodonAPIController, :follow
get "/blocks", MastodonAPIController, :empty_array get "/blocks", MastodonAPIController, :blocks
get "/domain_blocks", MastodonAPIController, :empty_array get "/domain_blocks", MastodonAPIController, :empty_array
get "/follow_requests", MastodonAPIController, :empty_array get "/follow_requests", MastodonAPIController, :empty_array
get "/mutes", MastodonAPIController, :empty_array get "/mutes", MastodonAPIController, :empty_array

View File

@ -309,6 +309,20 @@ test "blocking / unblocking a user", %{conn: conn} do
assert %{"id" => id, "blocking" => false} = json_response(conn, 200) assert %{"id" => id, "blocking" => false} = json_response(conn, 200)
end end
test "getting a list of blocks", %{conn: conn} do
user = insert(:user)
other_user = insert(:user)
{:ok, user} = User.block(user, other_user)
conn = conn
|> assign(:user, user)
|> get("/api/v1/blocks")
other_user_id = other_user.id
assert [%{"id" => ^other_user_id}] = json_response(conn, 200)
end
test "unimplemented mute endpoints" do test "unimplemented mute endpoints" do
user = insert(:user) user = insert(:user)
other_user = insert(:user) other_user = insert(:user)