diff options
| -rw-r--r-- | lib/pleroma/web/api_spec/operations/media_operation.ex | 14 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/media_controller.ex | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lib/pleroma/web/api_spec/operations/media_operation.ex b/lib/pleroma/web/api_spec/operations/media_operation.ex index e6df21246..718cacec1 100644 --- a/lib/pleroma/web/api_spec/operations/media_operation.ex +++ b/lib/pleroma/web/api_spec/operations/media_operation.ex @@ -36,18 +36,18 @@ defmodule Pleroma.Web.ApiSpec.MediaOperation do title: "MediaCreateRequest", description: "POST body for creating an attachment", type: :object, - required: [:file], + required: ["file"], properties: %{ - file: %Schema{ + "file" => %Schema{ type: :string, format: :binary, description: "The file to be attached, using multipart form data." }, - description: %Schema{ + "description" => %Schema{ type: :string, description: "A plain-text description of the media, for accessibility purposes." }, - focus: %Schema{ + "focus" => %Schema{ type: :string, description: "Two floating points (x,y), comma-delimited, ranging from -1.0 to 1.0." } @@ -79,16 +79,16 @@ defmodule Pleroma.Web.ApiSpec.MediaOperation do description: "POST body for updating an attachment", type: :object, properties: %{ - file: %Schema{ + "file" => %Schema{ type: :string, format: :binary, description: "The file to be attached, using multipart form data." }, - description: %Schema{ + "description" => %Schema{ type: :string, description: "A plain-text description of the media, for accessibility purposes." }, - focus: %Schema{ + "focus" => %Schema{ type: :string, description: "Two floating points (x,y), comma-delimited, ranging from -1.0 to 1.0." } diff --git a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex index 7d9a63cf4..b0c7a858b 100644 --- a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex @@ -20,12 +20,12 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.MediaOperation @doc "POST /api/v1/media" - def create(%{assigns: %{user: user}, body_params: %{file: file} = data} = conn, _) do + def create(%{assigns: %{user: user}, body_params: %{"file" => file} = data} = conn, _) do with {:ok, object} <- ActivityPub.upload( file, actor: User.ap_id(user), - description: Map.get(data, :description) + description: Map.get(data, "description") ) do attachment_data = Map.put(object.data, "id", object.id) @@ -36,12 +36,12 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do def create(_conn, _data), do: {:error, :bad_request} @doc "POST /api/v2/media" - def create2(%{assigns: %{user: user}, body_params: %{file: file} = data} = conn, _) do + def create2(%{assigns: %{user: user}, body_params: %{"file" => file} = data} = conn, _) do with {:ok, object} <- ActivityPub.upload( file, actor: User.ap_id(user), - description: Map.get(data, :description) + description: Map.get(data, "description") ) do attachment_data = Map.put(object.data, "id", object.id) @@ -54,7 +54,9 @@ 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}) do + def update(%{assigns: %{user: user}, body_params: %{"description" => description}} = conn, %{ + id: id + }) do with %Object{} = object <- Object.get_by_id(id), :ok <- Object.authorize_access(object, user), {:ok, %Object{data: data}} <- Object.update_data(object, %{"name" => description}) do |