diff options
| author | lain <lain@soykaf.club> | 2020-01-20 13:49:06 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-20 13:49:06 +0000 |
| commit | 42ea480e95862c09c07f6b4711648c192a66fdf5 (patch) | |
| tree | e49456ef80b7ef64c4fdc75775f1ea2e7b1032eb | |
| parent | c814f22030c1341ec337bdd1c446536597e683e2 (diff) | |
| parent | 5fddf988ea45382d8e2307f11205afcc4b468d45 (diff) | |
| download | pleroma-42ea480e95862c09c07f6b4711648c192a66fdf5.tar.gz | |
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex | 2 | ||||
| -rw-r--r-- | test/web/pleroma_api/controllers/pleroma_api_controller_test.exs | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex index 772c535a4..3285dc11b 100644 --- a/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex @@ -23,7 +23,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do plug( OAuthScopesPlug, %{scopes: ["read:statuses"]} - when action in [:conversation, :conversation_statuses, :emoji_reactions_by] + when action in [:conversation, :conversation_statuses] ) plug( diff --git a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs index 3f7ef13bc..fb7500134 100644 --- a/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs @@ -57,11 +57,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"}) - conn = - conn - |> assign(:user, user) - |> assign(:token, insert(:oauth_token, user: user, scopes: ["read:statuses"])) - result = conn |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by") |