Merge branch 'develop' into gun

[akkoma] / lib / pleroma / config / deprecation_warnings.ex

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 0eb1833aab27052bc17cfaeeab8dde3d06ffbb80..c39a8984bf0d308d23ab2d99df11ad092c025e1e 100644 (file)
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -1,19 +1,12 @@
 # Pleroma: A lightweight social networking server
 # Pleroma: A lightweight social networking server

-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>

 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.DeprecationWarnings do
   require Logger
 
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Config.DeprecationWarnings do
   require Logger
 

-  def check_frontend_config_mechanism() do
-    if Pleroma.Config.get(:fe) do
-      Logger.warn("""
-      !!!DEPRECATION WARNING!!!
-      You are using the old configuration mechanism for the frontend. Please check config.md.
-      """)
-    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.
       Logger.warn("""
       !!!DEPRECATION WARNING!!!
       You are using the old configuration mechanism for the hellthread filter. Please check config.md.


@@ -22,6 +15,6 @@ defmodule Pleroma.Config.DeprecationWarnings do
   end
 
   def warn do
   end
 
   def warn do

-    check_frontend_config_mechanism()
+    check_hellthread_threshold()

   end
 end
   end
 end