[KeywordPolicy] Use atom-keyed maps instead of string-keyed maps

This commit is contained in:
Hécate 2019-02-22 16:08:04 +01:00
parent 29f7fa1726
commit d677c0fda2
2 changed files with 7 additions and 7 deletions

View File

@ -61,9 +61,9 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicy do
end
def save_keyword_policy(%{
"federated_timeline_removal" => ftr,
"reject" => reject,
"replace" => replace
federated_timeline_removal: ftr,
reject: reject,
replace: replace
}) do
with true <- Enum.all?(ftr, &String.valid?(&1)),
true <- Enum.all?(reject, &String.valid?(&1)),

View File

@ -197,7 +197,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
def add_keyword_policy(conn, %{"policy" => policy}) do
result =
policy
|> Poison.decode!()
|> Poison.decode!(keys: :atoms!)
|> KeywordPolicy.save_keyword_policy()
case result do
@ -216,9 +216,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
@doc "Reset the keyword policy"
def reset_keyword_policy(conn, _params) do
KeywordPolicy.save_keyword_policy(%{
"federated_timeline_removal" => [],
"reject" => [],
"replace" => %{}
federated_timeline_removal: [],
reject: [],
replace: %{}
})
conn