sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add default config for keyword policy

Browse Source
This commit is contained in:
rinpatch 2019-02-08 12:48:39 +03:00
parent 46aa8c18a2
commit 2174f6eb4f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/config.exs
View File

@ -238,6 +238,11 @@
reject: [], reject: [],
accept: [] accept: []
config :pleroma, :mrf_keyword,
reject: [],
ftl_removal: [],
replace: []
config :pleroma, :rich_media, enabled: true config :pleroma, :rich_media, enabled: true
config :pleroma, :media_proxy, config :pleroma, :media_proxy,

2
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
View File

@ -46,7 +46,7 @@ def raw_nodeinfo() do
# This horror is needed to convert regex sigils to strings # This horror is needed to convert regex sigils to strings
mrf_keyword = mrf_keyword =
Application.get_env(:pleroma, :mrf_keyword) Application.get_env(:pleroma, :mrf_keyword, [])
|> Enum.map(fn {key, value} -> |> Enum.map(fn {key, value} ->
{key, {key,
Enum.map(value, fn Enum.map(value, fn