Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mix format

Browse Source
This commit is contained in:
Vivian Lim 2018-06-24 15:24:41 -07:00
parent 1299bccc7d
commit 6160a1b3c0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
View File

@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
@accept Keyword.get(@mrf_policy, :accept) @accept Keyword.get(@mrf_policy, :accept)
defp check_accept(actor_info, object) do defp check_accept(actor_info, object) do
if length(@accept) > 0 and not actor_info.host in @accept do if length(@accept) > 0 and not (actor_info.host in @accept) do
{:reject, nil} {:reject, nil}
else else
{:ok, object} {:ok, object}

1
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -504,6 +504,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
conn conn
|> with_credentials(current_user.nickname, "test") |> with_credentials(current_user.nickname, "test")
|> get("/api/qvitter/mutes.json") |> get("/api/qvitter/mutes.json")
current_user = Repo.get(User, current_user.id) current_user = Repo.get(User, current_user.id)
assert [] = json_response(conn, 200) assert [] = json_response(conn, 200)