aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-01-20 13:49:06 +0000
committerlain <lain@soykaf.club>2020-01-20 13:49:06 +0000
commit42ea480e95862c09c07f6b4711648c192a66fdf5 (patch)
treee49456ef80b7ef64c4fdc75775f1ea2e7b1032eb /lib
parentc814f22030c1341ec337bdd1c446536597e683e2 (diff)
parent5fddf988ea45382d8e2307f11205afcc4b468d45 (diff)
downloadpleroma-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
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex2
1 files changed, 1 insertions, 1 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(