moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ilja 2020-10-05 11:26:08 +02:00 committed by Haelwenn (lanodan) Monnier
parent 64002e92ad
commit c0489f9fac
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/pleroma/config/deprecation_warnings.ex
View File

@ -170,23 +170,24 @@ def check_hellthread_threshold do
end end
def warn do def warn do
with :ok <- check_hellthread_threshold(), [
:ok <- check_old_mrf_config(), check_hellthread_threshold(),
:ok <- check_media_proxy_whitelist_config(), check_old_mrf_config(),
:ok <- check_welcome_message_config(), check_media_proxy_whitelist_config(),
:ok <- check_gun_pool_options(), check_welcome_message_config(),
:ok <- check_activity_expiration_config(), check_gun_pool_options(),
:ok <- check_remote_ip_plug_name(), check_activity_expiration_config(),
:ok <- check_uploders_s3_public_endpoint(), check_remote_ip_plug_name(),
:ok <- check_old_chat_shoutbox(), check_uploders_s3_public_endpoint(),
:ok <- check_quarantined_instances_tuples(), check_old_chat_shoutbox(),
:ok <- check_transparency_exclusions_tuples(), check_quarantined_instances_tuples(),
:ok <- check_simple_policy_tuples() do check_transparency_exclusions_tuples(),
:ok check_simple_policy_tuples()
else ]
_ -> |> Enum.reduce(:ok, fn
:error :ok, :ok -> :ok
end _, _ -> :error
end)
end end
def check_welcome_message_config do def check_welcome_message_config do

6
test/pleroma/config/deprecation_warnings_test.exs
View File

@ -73,7 +73,7 @@ test "transforms config to tuples" do
{:media_removal, [{"some.removal", ""}, {"some.other.instance", "Some reason"}]} {: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 assert Config.get([:mrf_simple]) == expected_config
end end
@ -122,7 +122,7 @@ test "transforms config to tuples" do
expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}] 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 assert Config.get([:instance, :quarantined_instances]) == expected_config
end end
@ -172,7 +172,7 @@ test "transforms config to tuples" do
expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}] 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 assert Config.get([:mrf, :transparency_exclusions]) == expected_config
end end