fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-29 16:56:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'

Browse source 
Pleroma API: `emoji_reactions_by` does not need authorization

See merge request pleroma/pleroma!2117
This commit is contained in:
lain 2020-01-20 13:49:06 +00:00
parent c814f22030 5fddf988ea
commit 42ea480e95
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/pleroma_api/controllers/pleroma_api_controller.ex
View file

@ -23,7 +23,7 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIController do
plug( plug(
OAuthScopesPlug, OAuthScopesPlug,
%{scopes: ["read:statuses"]} %{scopes: ["read:statuses"]}
when action in [:conversation, :conversation_statuses, :emoji_reactions_by] when action in [:conversation, :conversation_statuses]
) )
plug( plug(

5
test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
View file

@ -57,11 +57,6 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do
{:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"}) {:ok, activity} = CommonAPI.post(user, %{"status" => "#cofe"})
conn =
conn
|> assign(:user, user)
|> assign(:token, insert(:oauth_token, user: user, scopes: ["read:statuses"]))
result = result =
conn conn
|> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by") |> get("/api/v1/pleroma/statuses/#{activity.id}/emoji_reactions_by")