summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-10-26 02:09:20 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-10-26 02:09:20 +0000
commit073ad7e6d91884f3c972f903d936f029c7a884e6 (patch)
tree0c74a857fdffa28e37a867993c79143410da99b2 /lib
parent2fd384e0a28c2e8259ba1afccb2495f4a2399a58 (diff)
parentf497eb034df6647fef9086a6e2ef03e61e2efc47 (diff)
downloadpleroma-073ad7e6d91884f3c972f903d936f029c7a884e6.tar.gz
pleroma-073ad7e6d91884f3c972f903d936f029c7a884e6.zip
Merge branch 'docs/ap_c2s' into 'develop'
AP C2S: Document our additional endpoints See merge request pleroma/pleroma!3056
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub_controller.ex13
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 44f09be75..31df80adb 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -525,19 +525,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
{new_user, for_user}
end
- @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
-
- 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} <-
ActivityPub.upload(