sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Pleroma.Web.MastodonAPI.MediaController: dialyzer errors" 

This reverts commit 8cd5279857.
This commit is contained in:
Mark Felder 2024-01-30 14:13:13 -05:00
parent b666710574
commit a3426fcaf3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/pleroma/web/api_spec/operations/media_operation.ex
View File

@ -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."
}

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

@ -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,9 +54,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
}) 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