projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
pleroma_api
/
controllers
/
pleroma_api_controller.ex
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 8fed3f5bb7dfcc07e21164ab7093a89984fdfc7e..772c535a498d0a79b236415c8f11b324dd78d7ad 100644
(file)
--- a/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
+++ b/
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
@@
-22,7
+22,14
@@
defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
plug(
OAuthScopesPlug,
plug(
OAuthScopesPlug,
- %{scopes: ["read:statuses"]} when action in [:conversation, :conversation_statuses]
+ %{scopes: ["read:statuses"]}
+ when action in [:conversation, :conversation_statuses, :emoji_reactions_by]
+ )
+
+ plug(
+ OAuthScopesPlug,
+ %{scopes: ["write:statuses"]}
+ when action in [:react_with_emoji, :unreact_with_emoji]
)
plug(
)
plug(