commit: c0489f9fac78701345c2902fa59bd99381bc27ab
parent 64002e92adcf08564d9b8e3fa2dcf7c07c72145a
Author: Ilja <domainepublic@spectraltheorem.be>
Date: Mon, 5 Oct 2020 11:26:08 +0200
Fixed deprecation warning checks
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
Diffstat:
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/lib/pleroma/config/deprecation_warnings.ex b/lib/pleroma/config/deprecation_warnings.ex
@@ -170,23 +170,24 @@ defmodule Pleroma.Config.DeprecationWarnings do
end
def warn do
- with :ok <- check_hellthread_threshold(),
- :ok <- check_old_mrf_config(),
- :ok <- check_media_proxy_whitelist_config(),
- :ok <- check_welcome_message_config(),
- :ok <- check_gun_pool_options(),
- :ok <- check_activity_expiration_config(),
- :ok <- check_remote_ip_plug_name(),
- :ok <- check_uploders_s3_public_endpoint(),
- :ok <- check_old_chat_shoutbox(),
- :ok <- check_quarantined_instances_tuples(),
- :ok <- check_transparency_exclusions_tuples(),
- :ok <- check_simple_policy_tuples() do
- :ok
- else
- _ ->
- :error
- end
+ [
+ check_hellthread_threshold(),
+ check_old_mrf_config(),
+ check_media_proxy_whitelist_config(),
+ check_welcome_message_config(),
+ check_gun_pool_options(),
+ check_activity_expiration_config(),
+ check_remote_ip_plug_name(),
+ check_uploders_s3_public_endpoint(),
+ check_old_chat_shoutbox(),
+ check_quarantined_instances_tuples(),
+ check_transparency_exclusions_tuples(),
+ check_simple_policy_tuples()
+ ]
+ |> Enum.reduce(:ok, fn
+ :ok, :ok -> :ok
+ _, _ -> :error
+ end)
end
def check_welcome_message_config do
diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
@@ -73,7 +73,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
{:media_removal, [{"some.removal", ""}, {"some.other.instance", "Some reason"}]}
]
- capture_log(fn -> DeprecationWarnings.check_simple_policy_tuples() end)
+ capture_log(fn -> DeprecationWarnings.warn() end)
assert Config.get([:mrf_simple]) == expected_config
end
@@ -122,7 +122,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}]
- capture_log(fn -> DeprecationWarnings.check_quarantined_instances_tuples() end)
+ capture_log(fn -> DeprecationWarnings.warn() end)
assert Config.get([:instance, :quarantined_instances]) == expected_config
end
@@ -172,7 +172,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}]
- capture_log(fn -> DeprecationWarnings.check_transparency_exclusions_tuples() end)
+ capture_log(fn -> DeprecationWarnings.warn() end)
assert Config.get([:mrf, :transparency_exclusions]) == expected_config
end