From 6160a1b3c07c49cf81e2353cc25a123e75843581 Mon Sep 17 00:00:00 2001 From: Vivian Lim Date: Sun, 24 Jun 2018 15:24:41 -0700 Subject: [PATCH] mix format --- lib/pleroma/web/activity_pub/mrf/simple_policy.ex | 2 +- test/web/twitter_api/twitter_api_controller_test.exs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex index 0a047013a..7fecb8a4f 100644 --- a/lib/pleroma/web/activity_pub/mrf/simple_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/simple_policy.ex @@ -6,7 +6,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do @accept Keyword.get(@mrf_policy, :accept) 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} else {:ok, object} diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 5fcd23d90..3a035e298 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -504,6 +504,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do conn |> with_credentials(current_user.nickname, "test") |> get("/api/qvitter/mutes.json") + current_user = Repo.get(User, current_user.id) assert [] = json_response(conn, 200)