Add support for AP C2S uploadMedia
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
This commit is contained in:
parent
2ad50583f0
commit
815b904508
@ -443,4 +443,31 @@ defp ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do
|
|||||||
|
|
||||||
{new_user, for_user}
|
{new_user, for_user}
|
||||||
end
|
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
|
end
|
||||||
|
@ -25,7 +25,8 @@ def render("endpoints.json", %{user: %User{local: true} = _user}) do
|
|||||||
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
|
"oauthAuthorizationEndpoint" => Helpers.o_auth_url(Endpoint, :authorize),
|
||||||
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),
|
"oauthRegistrationEndpoint" => Helpers.mastodon_api_url(Endpoint, :create_app),
|
||||||
"oauthTokenEndpoint" => Helpers.o_auth_url(Endpoint, :token_exchange),
|
"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
|
end
|
||||||
|
|
||||||
|
@ -572,6 +572,7 @@ defmodule Pleroma.Web.Router do
|
|||||||
scope [] do
|
scope [] do
|
||||||
pipe_through(:oauth_write)
|
pipe_through(:oauth_write)
|
||||||
post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
|
post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
|
||||||
|
post("/api/ap/uploadMedia", ActivityPubController, :upload_media)
|
||||||
end
|
end
|
||||||
|
|
||||||
scope [] do
|
scope [] do
|
||||||
|
@ -990,5 +990,30 @@ test "/api/ap/whoami", %{conn: conn} do
|
|||||||
|
|
||||||
assert UserView.render("user.json", %{user: user}) == json_response(conn, 200)
|
assert UserView.render("user.json", %{user: user}) == json_response(conn, 200)
|
||||||
end
|
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
|
||||||
end
|
end
|
||||||
|
@ -400,7 +400,8 @@ test "activity+json format. it redirects on actual feed of user", %{conn: conn}
|
|||||||
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
||||||
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
||||||
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
"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"] == [
|
assert response["@context"] == [
|
||||||
@ -462,7 +463,8 @@ test "json format. it redirects on actual feed of user", %{conn: conn} do
|
|||||||
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
"oauthAuthorizationEndpoint" => "#{Pleroma.Web.base_url()}/oauth/authorize",
|
||||||
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
"oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps",
|
||||||
"oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token",
|
"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"] == [
|
assert response["@context"] == [
|
||||||
|
Loading…
Reference in New Issue
Block a user