Dev patch applied

1 files changed, 3 insertions, 20 deletions

diff --git a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
index 1bd521460..d9e5241da 100644
--- a/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/media_controller.ex
@@ -36,34 +36,17 @@ defmodule Pleroma.Web.MastodonAPI.MediaController do
 
   def create(_conn, _data), do: {:error, :bad_request}
 
-  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)
-           ) do
-      attachment_data = Map.put(object.data, "id", object.id)
-
-      render(conn, "attachment.json", %{attachment: attachment_data})
-    end
-  end
-
-  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
-    with {:ok, object} <-
+    with {:ok, media} <-
            ActivityPub.upload(
              file,
-             actor: User.ap_id(user),
+             user: user,
              description: Map.get(data, :description)
            ) do
-      attachment_data = Map.put(object.data, "id", object.id)
-
       conn
       |> put_status(202)
-      |> render("attachment.json", %{attachment: attachment_data})
+      |> render("media.json", %{media: media})
     end
   end