From bb03dfdb03714027640087ad1bd6475a8bb1c2c3 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 14 May 2020 16:29:32 +0400
Subject: [PATCH] Do not require `description` in `update` action

---
 .../web/mastodon_api/controllers/media_controller.ex   |  7 ++-----
 .../mastodon_api/controllers/media_controller_test.exs | 10 ----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
index 3b2ea751c..a21233393 100644
--- a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
@@ -53,10 +53,7 @@ def create2(%{assigns: %{user: user}, body_params: %{file: file} = data} = conn,
   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 @@ def update(%{assigns: %{user: user}, body_params: %{description: description}} =
     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
diff --git a/test/web/mastodon_api/controllers/media_controller_test.exs b/test/web/mastodon_api/controllers/media_controller_test.exs
index 715747818..7ba1727f2 100644
--- a/test/web/mastodon_api/controllers/media_controller_test.exs
+++ b/test/web/mastodon_api/controllers/media_controller_test.exs
@@ -94,16 +94,6 @@ test "/api/v1/media/:id good request", %{conn: conn, object: object} 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