From: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Tue, 23 Jun 2020 02:42:44 +0000 (+0200)
Subject: ActivityPubController: Update upload_media @doc
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c116b6d6d6e4b12d9d751481926183f19cdb5248;p=akkoma

ActivityPubController: Update upload_media @doc

Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
---

diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index f0b5c6e93..220c4fe52 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -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} <-