diff --git a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex index 2d73573ea..e38dc18e9 100644 --- a/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/keyword_policy.ex @@ -79,7 +79,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do |> put_in(["object", "summary"], summary)} end - def save_keyword_policy(%{ + def save(%{ federated_timeline_removal: ftr, reject: reject, replace: replace @@ -100,7 +100,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do end end - def list_keyword_policy do + def list do config = Pleroma.Config.get(:mrf_keyword, %{}) Enum.reduce(config, %{}, fn {key, value}, acc -> diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index 6f2286ab9..5eb25eedf 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -243,7 +243,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do @doc "List this instance's keyword policy" def list_keyword_policy(conn, _params) do - mrf_keyword = KeywordPolicy.list_keyword_policy() + mrf_keyword = KeywordPolicy.list() conn |> put_status(200) @@ -255,7 +255,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do result = policy |> Poison.decode!(keys: :atoms!) - |> KeywordPolicy.save_keyword_policy() + |> KeywordPolicy.save() case result do :ok -> @@ -272,7 +272,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do @doc "Reset the keyword policy" def reset_keyword_policy(conn, _params) do - KeywordPolicy.save_keyword_policy(%{ + KeywordPolicy.save(%{ federated_timeline_removal: [], reject: [], replace: %{} diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 0df061d2d..d1041a110 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -45,7 +45,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do Application.get_env(:pleroma, :mrf_simple) |> Enum.into(%{}) - mrf_keyword = KeywordPolicy.list_keyword_policy() + mrf_keyword = KeywordPolicy.list() mrf_policies = MRF.get_policies() diff --git a/test/web/activity_pub/mrf/keyword_policy_test.exs b/test/web/activity_pub/mrf/keyword_policy_test.exs index 28f4be647..bfd4c09f0 100644 --- a/test/web/activity_pub/mrf/keyword_policy_test.exs +++ b/test/web/activity_pub/mrf/keyword_policy_test.exs @@ -14,13 +14,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do describe "managing keyword policies" do test "save a new valid keyword policy" do config = Pleroma.Config.get(:mrf_keyword) - result = KeywordPolicy.save_keyword_policy(%{config | replace: %{"toot" => "jort"}}) + result = KeywordPolicy.save(%{config | replace: %{"toot" => "jort"}}) assert result == :ok end test "save a new invalid keyword policy" do config = Pleroma.Config.get(:mrf_keyword) - result = KeywordPolicy.save_keyword_policy(%{config | replace: %{3 => "jort"}}) + result = KeywordPolicy.save(%{config | replace: %{3 => "jort"}}) assert {:error, _} = result end end