summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-02-04 17:32:12 +0000
committerrinpatch <rinpatch@sdf.org>2019-02-04 17:32:12 +0000
commit3ae11835a9ff8c4bc01c3b790229e87857a9812d (patch)
tree1289e55aaa5839ae62d80533a81d63259827f1cd
parent25a659d2dcd093939aa2cba049902ea54ab89312 (diff)
parent4031c94a59dd36753d96666dadc1b32678d37c74 (diff)
downloadpleroma-3ae11835a9ff8c4bc01c3b790229e87857a9812d.tar.gz
pleroma-3ae11835a9ff8c4bc01c3b790229e87857a9812d.zip
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
fix hellthread threshold deprecation warning See merge request pleroma/pleroma!770
-rw-r--r--lib/pleroma/config/deprecation_warnings.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 0eb1833aa..7451fd0a7 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -12,8 +12,10 @@ defmodule Pleroma.Config.DeprecationWarnings do
You are using the old configuration mechanism for the frontend. Please check config.md.
""")
end
+ end
- if Pleroma.Config.get(:mrf_hellthread, :threshold) do
+ def check_hellthread_threshold do
+ if Pleroma.Config.get([:mrf_hellthread, :threshold]) do
Logger.warn("""
!!!DEPRECATION WARNING!!!
You are using the old configuration mechanism for the hellthread filter. Please check config.md.
@@ -23,5 +25,6 @@ defmodule Pleroma.Config.DeprecationWarnings do
def warn do
check_frontend_config_mechanism()
+ check_hellthread_threshold()
end
end