squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed deprecation warning checks

Browse Source 
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
parent 3ea3f49268
commit 9a213ee9ee
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,20 +170,21 @@ defmodule Pleroma.Config.DeprecationWarnings 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_quarantined_instances_tuples(), check_activity_expiration_config(),
: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/config/deprecation_warnings_test.exs
View File

@ -69,7 +69,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest 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
@ -118,7 +118,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest 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
@ -168,7 +168,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest 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