Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706
This commit is contained in:
commit
26f66fb70a
|
@ -334,6 +334,7 @@ def internal_fetch(conn, _params) do
|
||||||
|> represent_service_actor(conn)
|
|> represent_service_actor(conn)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@doc "Returns the authenticated user's ActivityPub User object or a 404 Not Found if non-authenticated"
|
||||||
def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
|
def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("application/activity+json")
|
|> put_resp_content_type("application/activity+json")
|
||||||
|
@ -509,4 +510,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
|
||||||
|
|
|
@ -24,7 +24,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
|
||||||
|
|
||||||
|
|
|
@ -608,6 +608,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/upload_media", ActivityPubController, :upload_media)
|
||||||
end
|
end
|
||||||
|
|
||||||
scope [] do
|
scope [] do
|
||||||
|
|
|
@ -28,6 +28,10 @@
|
||||||
"oauthRegistrationEndpoint": {
|
"oauthRegistrationEndpoint": {
|
||||||
"@id": "litepub:oauthRegistrationEndpoint",
|
"@id": "litepub:oauthRegistrationEndpoint",
|
||||||
"@type": "@id"
|
"@type": "@id"
|
||||||
|
},
|
||||||
|
"uploadMedia": {
|
||||||
|
"@id": "litepub:uploadMedia",
|
||||||
|
"@type": "@id"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -976,4 +976,44 @@ test "it tracks a signed activity fetch when the json is cached", %{conn: conn}
|
||||||
assert Delivery.get(object.id, other_user.id)
|
assert Delivery.get(object.id, other_user.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "Additionnal ActivityPub C2S endpoints" do
|
||||||
|
test "/api/ap/whoami", %{conn: conn} do
|
||||||
|
user = insert(:user)
|
||||||
|
|
||||||
|
conn =
|
||||||
|
conn
|
||||||
|
|> assign(:user, user)
|
||||||
|
|> get("/api/ap/whoami")
|
||||||
|
|
||||||
|
user = User.get_cached_by_id(user.id)
|
||||||
|
|
||||||
|
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/upload_media", %{"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
|
||||||
|
|
|
@ -396,7 +396,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/upload_media"
|
||||||
}
|
}
|
||||||
|
|
||||||
assert response["@context"] == [
|
assert response["@context"] == [
|
||||||
|
@ -458,7 +459,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/upload_media"
|
||||||
}
|
}
|
||||||
|
|
||||||
assert response["@context"] == [
|
assert response["@context"] == [
|
||||||
|
|
Loading…
Reference in New Issue