limepotato/akkoma
1
0
Fork 0
Code Pull requests 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 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 @@ 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

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

@ -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