From: Haelwenn (lanodan) Monnier Date: Tue, 24 Sep 2019 17:03:06 +0000 (+0200) Subject: /api/ap/uploadMedia → /api/ap/upload_media X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0dc8f3d6d2fa18261e9a6fa8da540c434f1fa67b;p=akkoma /api/ap/uploadMedia → /api/ap/upload_media --- diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 8ee188f08..2e8fda4ab 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -572,7 +572,7 @@ defmodule Pleroma.Web.Router do scope [] do pipe_through(:oauth_write) post("/users/:nickname/outbox", ActivityPubController, :update_outbox) - post("/api/ap/uploadMedia", ActivityPubController, :upload_media) + post("/api/ap/upload_media", ActivityPubController, :upload_media) end scope [] do diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs index c2bcddf85..8868d8a0d 100644 --- a/test/web/activity_pub/activity_pub_controller_test.exs +++ b/test/web/activity_pub/activity_pub_controller_test.exs @@ -1008,7 +1008,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do conn = conn |> assign(:user, user) - |> post("/api/ap/uploadMedia", %{"file" => image, "description" => desc}) + |> post("/api/ap/upload_media", %{"file" => image, "description" => desc}) assert object = json_response(conn, :created) assert object["name"] == desc diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index fc1635a2f..3a867b8c0 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -401,7 +401,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps", "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token", "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox", - "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia" + "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media" } assert response["@context"] == [ @@ -464,7 +464,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do "oauthRegistrationEndpoint" => "#{Pleroma.Web.base_url()}/api/v1/apps", "oauthTokenEndpoint" => "#{Pleroma.Web.base_url()}/oauth/token", "sharedInbox" => "#{Pleroma.Web.base_url()}/inbox", - "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/uploadMedia" + "uploadMedia" => "#{Pleroma.Web.base_url()}/api/ap/upload_media" } assert response["@context"] == [