From 641c24cdd46f36205d91a2de7da8bbbfa7aac3ce Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 14 Sep 2017 08:08:32 +0200 Subject: Add media upload endpoint. --- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 9 +++++++++ lib/pleroma/web/router.ex | 2 ++ 2 files changed, 11 insertions(+) (limited to 'lib') diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index f17cf40e6..b537bcf71 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -199,6 +199,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do render conn, AccountView, "relationships.json", %{user: user, targets: targets} end + def upload(%{assigns: %{user: user}} = conn, %{"file" => file}) do + with {:ok, object} <- ActivityPub.upload(file) do + data = object.data + |> Map.put("id", object.id) + + render conn, StatusView, "attachment.json", %{attachment: data} + end + end + def empty_array(conn, _) do Logger.debug("Unimplemented, returning an empty array") json(conn, []) diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 0bd8e40c4..93b31aba5 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -55,6 +55,8 @@ defmodule Pleroma.Web.Router do post "/statuses/:id/unfavourite", MastodonAPIController, :unfav_status get "/notifications", MastodonAPIController, :notifications + + post "/media", MastodonAPIController, :upload end scope "/api/v1", Pleroma.Web.MastodonAPI do -- cgit v1.2.3