Browse Source

Add support for AP C2S uploadMedia

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
object-id-column
Haelwenn (lanodan) Monnier 4 years ago
parent
commit
815b904508
No known key found for this signature in database GPG Key ID: D5B7A8E43C997DEE
5 changed files with 59 additions and 3 deletions
  1. +27
    -0
      lib/pleroma/web/activity_pub/activity_pub_controller.ex
  2. +2
    -1
      lib/pleroma/web/activity_pub/views/user_view.ex
  3. +1
    -0
      lib/pleroma/web/router.ex
  4. +25
    -0
      test/web/activity_pub/activity_pub_controller_test.exs
  5. +4
    -2
      test/web/ostatus/ostatus_controller_test.exs

+ 27
- 0
lib/pleroma/web/activity_pub/activity_pub_controller.ex View File

@@ -443,4 +443,31 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do

{new_user, for_user}
end

# TODO: Add support for "object" field
@doc """
Endpoint based on <https://www.w3.org/wiki/SocialCG/ActivityPub/MediaUpload>

Parameters:
- (required) `file`: data of the media
- (optionnal) `description`: description of the media, intended for accessibility

Response:
- HTTP Code: 201 Created
- HTTP Body: ActivityPub object to be inserted into another's `attachment` field
"""
def upload_media(%{assigns: %{user: user}} = conn, %{"file" => file} = data) do
with {:ok, object} <-
ActivityPub.upload(
file,
actor: User.ap_id(user),
description: Map.get(data, "description")
) do
Logger.debug(inspect(object))

conn
|> put_status(:created)
|> json(object.data)
end
end
end

+ 2
- 1
lib/pleroma/web/activity_pub/views/user_view.ex View File

@@ -25,7 +25,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),
"oauthTokenEndpoint" => Helpers.o_auth_url(Endpoint, :token_exchange),
"sharedInbox" => Helpers.activity_pub_url(Endpoint, :inbox)
"sharedInbox" => Helpers.activity_pub_url(Endpoint, :inbox),
"uploadMedia" => Helpers.activity_pub_url(Endpoint, :upload_media)
}
end



+ 1
- 0
lib/pleroma/web/router.ex View File

@@ -572,6 +572,7 @@ defmodule Pleroma.Web.Router do
scope [] do
pipe_through(:oauth_write)
post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
post("/api/ap/uploadMedia", ActivityPubController, :upload_media)
end

scope [] do


+ 25
- 0
test/web/activity_pub/activity_pub_controller_test.exs View File

@@ -990,5 +990,30 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do

assert UserView.render("user.json", %{user: user}) == json_response(conn, 200)
end

clear_config([:media_proxy])
clear_config([Pleroma.Upload])

test "uploadMedia", %{conn: conn} do
user = insert(:user)

desc = "Description of the image"

image = %Plug.Upload{
content_type: "image/jpg",
path: Path.absname("test/fixtures/image.jpg"),
filename: "an_image.jpg"
}

conn =
conn
|> assign(:user, user)
|> post("/api/ap/uploadMedia", %{"file" => image, "description" => desc})

assert object = json_response(conn, :created)
assert object["name"] == desc
assert object["type"] == "Document"
assert object["actor"] == user.ap_id
end
end
end

+ 4
- 2
test/web/ostatus/ostatus_controller_test.exs View File

@@ -400,7 +400,8 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox"
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
"uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"
}

assert response["@context"] == [
@@ -462,7 +463,8 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox"
"sharedInbox" => "#{Pleroma.Web.base_url()}/inbox",
"uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia"
}

assert response["@context"] == [


Loading…
Cancel
Save