Merge branch 'features/apc2s-media-upload' into 'develop'

AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00 · 2019-09-30 11:21:49 +00:00 · 26f66fb70a
commit 26f66fb70a
parent 0e356cc800 0dc8f3d6d2
6 changed files with 79 additions and 3 deletions
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@ -608,6 +608,7 @@ defmodule Pleroma.Web.Router do
    scope [] do
      pipe_through(:oauth_write)
      post("/users/:nickname/outbox", ActivityPubController, :update_outbox)
+      post("/api/ap/upload_media", ActivityPubController, :upload_media)
    end

    scope [] do