Merge branch 'fix/missing-deprecation' into 'develop'
Add missing deprecation warning left out of !2842 See merge request pleroma/pleroma!3444
This commit is contained in:
commit
a07310888f
|
@ -41,7 +41,8 @@ def warn do
|
||||||
:ok <- check_gun_pool_options(),
|
:ok <- check_gun_pool_options(),
|
||||||
:ok <- check_activity_expiration_config(),
|
:ok <- check_activity_expiration_config(),
|
||||||
:ok <- check_remote_ip_plug_name(),
|
:ok <- check_remote_ip_plug_name(),
|
||||||
:ok <- check_uploders_s3_public_endpoint() do
|
:ok <- check_uploders_s3_public_endpoint(),
|
||||||
|
:ok <- check_old_chat_shoutbox() do
|
||||||
:ok
|
:ok
|
||||||
else
|
else
|
||||||
_ ->
|
_ ->
|
||||||
|
@ -215,4 +216,27 @@ def check_uploders_s3_public_endpoint do
|
||||||
:ok
|
:ok
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec check_old_chat_shoutbox() :: :ok | nil
|
||||||
|
def check_old_chat_shoutbox do
|
||||||
|
instance_config = Pleroma.Config.get([:instance])
|
||||||
|
chat_config = Pleroma.Config.get([:chat]) || []
|
||||||
|
|
||||||
|
use_old_config =
|
||||||
|
Keyword.has_key?(instance_config, :chat_limit) or
|
||||||
|
Keyword.has_key?(chat_config, :enabled)
|
||||||
|
|
||||||
|
if use_old_config do
|
||||||
|
Logger.error("""
|
||||||
|
!!!DEPRECATION WARNING!!!
|
||||||
|
Your config is using the old namespace for the Shoutbox configuration. You need to convert to the new namespace. e.g.,
|
||||||
|
\n* `config :pleroma, :chat, enabled` and `config :pleroma, :instance, chat_limit` are now equal to:
|
||||||
|
\n* `config :pleroma, :shout, enabled` and `config :pleroma, :shout, limit`
|
||||||
|
""")
|
||||||
|
|
||||||
|
:error
|
||||||
|
else
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -146,4 +146,14 @@ test "pool timeout" do
|
||||||
"Your config is using old setting name `timeout` instead of `recv_timeout` in pool settings"
|
"Your config is using old setting name `timeout` instead of `recv_timeout` in pool settings"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "check_old_chat_shoutbox/0" do
|
||||||
|
clear_config([:instance, :chat_limit], 1_000)
|
||||||
|
clear_config([:chat, :enabled], true)
|
||||||
|
|
||||||
|
assert capture_log(fn ->
|
||||||
|
DeprecationWarnings.check_old_chat_shoutbox()
|
||||||
|
end) =~
|
||||||
|
"Your config is using the old namespace for the Shoutbox configuration."
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue