diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-02-08 12:48:39 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-02-08 12:48:39 +0300 |
| commit | 2174f6eb4f2b9b970e9823fe0846643fb274f009 (patch) | |
| tree | 7d9bbf0783c580a297331ba5d4bb4c63b5cf6d6f | |
| parent | 46aa8c18a211034bc102cfffec61c9cc8c3cdf02 (diff) | |
| download | pleroma-2174f6eb4f2b9b970e9823fe0846643fb274f009.tar.gz | |
Add default config for keyword policy
| -rw-r--r-- | config/config.exs | 5 | ||||
| -rw-r--r-- | lib/pleroma/web/nodeinfo/nodeinfo_controller.ex | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 8b42a5351..223ab0c52 100644 --- a/config/config.exs +++ b/config/config.exs @@ -238,6 +238,11 @@ config :pleroma, :mrf_simple, reject: [], accept: [] +config :pleroma, :mrf_keyword, + reject: [], + ftl_removal: [], + replace: [] + config :pleroma, :rich_media, enabled: true config :pleroma, :media_proxy, diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex index 7c24d4761..8c7df5b90 100644 --- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex +++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex @@ -46,7 +46,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do # This horror is needed to convert regex sigils to strings mrf_keyword = - Application.get_env(:pleroma, :mrf_keyword) + Application.get_env(:pleroma, :mrf_keyword, []) |> Enum.map(fn {key, value} -> {key, Enum.map(value, fn |