ActivityPubController: Update upload_media @doc
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Tue, 23 Jun 2020 02:42:44 +0000 (04:42 +0200)
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>
Tue, 23 Jun 2020 02:42:44 +0000 (04:42 +0200)
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810

lib/pleroma/web/activity_pub/activity_pub_controller.ex

index f0b5c6e935eca254b6238f3d8fb44be2bd303ac2..220c4fe52cce85789b2f762acbebf5200484ed81 100644 (file)
@@ -514,7 +514,6 @@ 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>
 
@@ -525,6 +524,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   Response:
   - HTTP Code: 201 Created
   - HTTP Body: ActivityPub object to be inserted into another's `attachment` field
+
+  Note: Will not point to a URL with a `Location` header because no standalone Activity has been created.
   """
   def upload_media(%{assigns: %{user: %User{} = user}} = conn, %{"file" => file} = data) do
     with {:ok, object} <-