a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Do not require `description` in `update` action

This commit is contained in:
Egor Kislitsyn 2020-05-14 16:29:32 +04:00
parent 0f885b4b86
commit bb03dfdb03
No known key found for this signature in database
GPG Key ID: 1B49CB15B71E7805
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/mastodon_api/controllers/media_controller.ex
View File

@ -53,10 +53,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do
def create2(_conn, _data), do: {:error, :bad_request}
@doc "PUT /api/v1/media/:id"
def update(%{assigns: %{user: user}, body_params: %{description: description}} = conn, %{
id: id
})
when is_binary(description) do
def update(%{assigns: %{user: user}, body_params: %{description: description}} = conn, %{id: id}) do
with %Object{} = object <- Object.get_by_id(id),
true <- Object.authorize_mutation(object, user),
{:ok, %Object{data: data}} <- Object.update_data(object, %{"name" => description}) do
@ -66,7 +63,7 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do
end
end
def update(_conn, _data), do: {:error, :bad_request}
def update(conn, data), do: show(conn, data)
@doc "GET /api/v1/media/:id"
def show(conn, %{id: id}) do

10
test/web/mastodon_api/controllers/media_controller_test.exs
View File

@ -94,16 +94,6 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
assert media["description"] == "test-media"
assert refresh_record(object).data["name"] == "test-media"
end
test "/api/v1/media/:id bad request", %{conn: conn, object: object} do
media =
conn
|> put_req_header("content-type", "multipart/form-data")
|> put("/api/v1/media/#{object.id}", %{})
|> json_response_and_validate_schema(400)
assert media == %{"error" => "bad_request"}
end
end
describe "Get media by id" do