X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fconfig%2Fdeprecation_warnings.ex;h=b68ded01f6bd486f575485515cd588c2e0b312e5;hb=6efd3730c31c9121894c825b1bef87796a67d000;hp=7451fd0a7675d8c63b1ab10e398b34462eb7721f;hpb=3ae11835a9ff8c4bc01c3b790229e87857a9812d;p=akkoma

diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
index 7451fd0a7..b68ded01f 100644
--- a/lib/pleroma/config/deprecation_warnings.ex
+++ b/lib/pleroma/config/deprecation_warnings.ex
@@ -1,30 +1,43 @@
 # 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
+  alias Pleroma.Config
 
-  def check_frontend_config_mechanism() do
-    if Pleroma.Config.get(:fe) do
+  def check_hellthread_threshold do
+    if Config.get([:mrf_hellthread, :threshold]) do
       Logger.warn("""
       !!!DEPRECATION WARNING!!!
-      You are using the old configuration mechanism for the frontend. Please check config.md.
+      You are using the old configuration mechanism for the hellthread filter. Please check config.md.
       """)
     end
   end
 
-  def check_hellthread_threshold do
-    if Pleroma.Config.get([:mrf_hellthread, :threshold]) do
-      Logger.warn("""
+  def mrf_user_allowlist do
+    config = Config.get(:mrf_user_allowlist)
+
+    if config && Enum.any?(config, fn {k, _} -> is_atom(k) end) do
+      rewritten =
+        Enum.reduce(Config.get(:mrf_user_allowlist), Map.new(), fn {k, v}, acc ->
+          Map.put(acc, to_string(k), v)
+        end)
+
+      Config.put(:mrf_user_allowlist, rewritten)
+
+      Logger.error("""
       !!!DEPRECATION WARNING!!!
-      You are using the old configuration mechanism for the hellthread filter. Please check config.md.
+      As of Pleroma 2.0.7, the `mrf_user_allowlist` setting changed of format.
+      Pleroma 2.1 will remove support for the old format. Please change your configuration to match this:
+
+      config :pleroma, :mrf_user_allowlist, #{inspect(rewritten, pretty: true)}
       """)
     end
   end
 
   def warn do
-    check_frontend_config_mechanism()
     check_hellthread_threshold()
+    mrf_user_allowlist()
   end
 end