Merge branch 'deprecations' into 'develop'

Deprecations

See merge request pleroma/pleroma!4011

changelog.d/deprecations.skip

@@ -0,0 +1 @@
+

lib/pleroma/application.ex

@@ -138,7 +138,7 @@ defp set_postgres_server_version do
         num
       else
         e ->
-          Logger.warn(
+          Logger.warning(
             "Could not get the postgres version: #{inspect(e)}.\nSetting the default value of 9.6"
           )
 

lib/pleroma/application_requirements.ex

@@ -34,7 +34,7 @@ defp handle_result({:error, message}), do: raise(VerifyError, message: message)
   defp check_welcome_message_config!(:ok) do
     if Pleroma.Config.get([:welcome, :email, :enabled], false) and
          not Pleroma.Emails.Mailer.enabled?() do
-      Logger.warn("""
+      Logger.warning("""
       To send welcome emails, you need to enable the mailer.
       Welcome emails will NOT be sent with the current config.
 
@@ -53,7 +53,7 @@ defp check_welcome_message_config!(result), do: result
   def check_confirmation_accounts!(:ok) do
     if Pleroma.Config.get([:instance, :account_activation_required]) &&
          not Pleroma.Emails.Mailer.enabled?() do
-      Logger.warn("""
+      Logger.warning("""
       Account activation is required, but the mailer is disabled.
       Users will NOT be able to confirm their accounts with this config.
       Either disable account activation or enable the mailer.

lib/pleroma/config/deprecation_warnings.ex

@@ -24,7 +24,7 @@ def check_exiftool_filter do
     filters = Config.get([Pleroma.Upload]) |> Keyword.get(:filters, [])
 
     if Pleroma.Upload.Filter.Exiftool in filters do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using Exiftool as a filter instead of Exiftool.StripLocation. This should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -63,7 +63,7 @@ def check_simple_policy_tuples do
       |> Enum.any?(fn {_, v} -> Enum.any?(v, &is_binary/1) end)
 
     if has_strings do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the SimplePolicy configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -121,7 +121,7 @@ def check_quarantined_instances_tuples do
     has_strings = Config.get([:instance, :quarantined_instances]) |> Enum.any?(&is_binary/1)
 
     if has_strings do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the quarantined_instances configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -158,7 +158,7 @@ def check_transparency_exclusions_tuples do
     has_strings = Config.get([:mrf, :transparency_exclusions]) |> Enum.any?(&is_binary/1)
 
     if has_strings do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using strings in the transparency_exclusions configuration instead of tuples. They should work for now, but you are advised to change to the new configuration to prevent possible issues later:
 
@@ -193,7 +193,7 @@ def check_transparency_exclusions_tuples do
 
   def check_hellthread_threshold do
     if Config.get([:mrf_hellthread, :threshold]) do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       You are using the old configuration mechanism for the hellthread filter. Please check config.md.
       """)
@@ -274,7 +274,7 @@ def move_namespace_and_warn(config_map, warning_preface) do
     if warning == "" do
       :ok
     else
-      Logger.warn(warning_preface <> warning)
+      Logger.warning(warning_preface <> warning)
       :error
     end
   end
@@ -284,7 +284,7 @@ def check_media_proxy_whitelist_config do
     whitelist = Config.get([:media_proxy, :whitelist])
 
     if Enum.any?(whitelist, &(not String.starts_with?(&1, "http"))) do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using old format (only domain) for MediaProxy whitelist option. Setting should work for now, but you are advised to change format to scheme with port to prevent possible issues later.
       """)
@@ -299,7 +299,7 @@ def check_gun_pool_options do
     pool_config = Config.get(:connections_pool)
 
     if timeout = pool_config[:await_up_timeout] do
-      Logger.warn("""
+      Logger.warning("""
       !!!DEPRECATION WARNING!!!
       Your config is using old setting `config :pleroma, :connections_pool, await_up_timeout`. Please change to `config :pleroma, :connections_pool, connect_timeout` to ensure compatibility with future releases.
       """)
@@ -331,7 +331,7 @@ def check_gun_pool_options do
           "\n* `:timeout` options in #{pool_name} pool is now `:recv_timeout`"
         end)
 
-      Logger.warn(Enum.join([warning_preface | pool_warnings]))
+      Logger.warning(Enum.join([warning_preface | pool_warnings]))
 
       Config.put(:pools, updated_config)
       :error

lib/pleroma/config/oban.ex

@@ -23,7 +23,7 @@ def warn do
           You are using old workers in Oban crontab settings, which were removed.
           Please, remove setting from crontab in your config file (prod.secret.exs): #{inspect(setting)}
           """
-          |> Logger.warn()
+          |> Logger.warning()
 
           List.delete(acc, setting)
         else

lib/pleroma/config/transfer_task.ex

@@ -144,7 +144,7 @@ defp update({group, key, value, merged}) do
         error_msg =
           "updating env causes error, group: #{inspect(group)}, key: #{inspect(key)}, value: #{inspect(value)} error: #{inspect(error)}"
 
-        Logger.warn(error_msg)
+        Logger.warning(error_msg)
 
         nil
     end
@@ -178,12 +178,12 @@ defp restart(started_applications, app, _) do
       :ok = Application.start(app)
     else
       nil ->
-        Logger.warn("#{app} is not started.")
+        Logger.warning("#{app} is not started.")
 
       error ->
         error
         |> inspect()
-        |> Logger.warn()
+        |> Logger.warning()
     end
   end
 

lib/pleroma/emoji/loader.ex

@@ -59,7 +59,7 @@ def load do
           Logger.info("Found emoji packs: #{Enum.join(packs, ", ")}")
 
           if not Enum.empty?(files) do
-            Logger.warn(
+            Logger.warning(
               "Found files in the emoji folder. These will be ignored, please move them to a subdirectory\nFound files: #{Enum.join(files, ", ")}"
             )
           end

lib/pleroma/gun/conn.ex

@@ -56,7 +56,7 @@ defp do_open(uri, %{proxy: {proxy_host, proxy_port}} = opts) do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 
@@ -90,7 +90,7 @@ defp do_open(uri, %{proxy: {proxy_type, proxy_host, proxy_port}} = opts) do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening socks proxied connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 
@@ -106,7 +106,7 @@ defp do_open(%URI{host: host, port: port} = uri, opts) do
       {:ok, conn, protocol}
     else
       error ->
-        Logger.warn(
+        Logger.warning(
           "Opening connection to #{compose_uri_log(uri)} failed with error #{inspect(error)}"
         )
 

lib/pleroma/http/adapter_helper.ex

@@ -70,15 +70,15 @@ def parse_proxy(proxy) when is_binary(proxy) do
       {:ok, parse_host(host), port}
     else
       {_, _} ->
-        Logger.warn("Parsing port failed #{inspect(proxy)}")
+        Logger.warning("Parsing port failed #{inspect(proxy)}")
         {:error, :invalid_proxy_port}
 
       :error ->
-        Logger.warn("Parsing port failed #{inspect(proxy)}")
+        Logger.warning("Parsing port failed #{inspect(proxy)}")
         {:error, :invalid_proxy_port}
 
       _ ->
-        Logger.warn("Parsing proxy failed #{inspect(proxy)}")
+        Logger.warning("Parsing proxy failed #{inspect(proxy)}")
         {:error, :invalid_proxy}
     end
   end
@@ -88,7 +88,7 @@ def parse_proxy(proxy) when is_tuple(proxy) do
       {:ok, type, parse_host(host), port}
     else
       _ ->
-        Logger.warn("Parsing proxy failed #{inspect(proxy)}")
+        Logger.warning("Parsing proxy failed #{inspect(proxy)}")
         {:error, :invalid_proxy}
     end
   end

lib/pleroma/instances/instance.ex

@@ -173,7 +173,7 @@ def get_or_update_favicon(%URI{host: host} = instance_uri) do
     end
   rescue
     e ->
-      Logger.warn("Instance.get_or_update_favicon(\"#{host}\") error: #{inspect(e)}")
+      Logger.warning("Instance.get_or_update_favicon(\"#{host}\") error: #{inspect(e)}")
       nil
   end
 
@@ -201,7 +201,7 @@ defp scrape_favicon(%URI{} = instance_uri) do
       end
     rescue
       e ->
-        Logger.warn(
+        Logger.warning(
           "Instance.scrape_favicon(\"#{to_string(instance_uri)}\") error: #{inspect(e)}"
         )
 
@@ -284,7 +284,7 @@ defp scrape_metadata(%URI{} = instance_uri) do
       end
     rescue
       e ->
-        Logger.warn(
+        Logger.warning(
           "Instance.scrape_metadata(\"#{to_string(instance_uri)}\") error: #{inspect(e)}"
         )
 

lib/pleroma/maintenance.ex

@@ -20,7 +20,7 @@ def vacuum(args) do
       "full" ->
         Logger.info("Running VACUUM FULL.")
 
-        Logger.warn(
+        Logger.warning(
           "Re-packing your entire database may take a while and will consume extra disk space during the process."
         )
 

lib/pleroma/migrators/support/base_migrator.ex

@@ -73,7 +73,7 @@ def handle_continue(:init_state, _state) do
           data_migration.state == :manual or data_migration.name in manual_migrations ->
             message = "Data migration is in manual execution or manual fix mode."
             update_status(:manual, message)
-            Logger.warn("#{__MODULE__}: #{message}")
+            Logger.warning("#{__MODULE__}: #{message}")
 
           data_migration.state == :complete ->
             on_complete(data_migration)
@@ -109,7 +109,7 @@ def handle_info(:perform, state) do
             Putting data migration to manual fix mode. Try running `#{__MODULE__}.retry_failed/0`.
             """
 
-            Logger.warn("#{__MODULE__}: #{message}")
+            Logger.warning("#{__MODULE__}: #{message}")
             update_status(:manual, message)
             on_complete(data_migration())
 
@@ -125,7 +125,7 @@ def handle_info(:perform, state) do
 
       defp on_complete(data_migration) do
         if data_migration.feature_lock || feature_state() == :disabled do
-          Logger.warn(
+          Logger.warning(
             "#{__MODULE__}: migration complete but feature is locked; consider enabling."
           )
 

lib/pleroma/reverse_proxy.ex

@@ -192,7 +192,7 @@ defp response(conn, client, url, status, headers, opts) do
         halt(conn)
 
       {:error, error, conn} ->
-        Logger.warn(
+        Logger.warning(
           "#{__MODULE__} request to #{url} failed while reading/chunking: #{inspect(error)}"
         )
 

lib/pleroma/telemetry/logger.ex

@@ -70,7 +70,7 @@ def handle_event(
         %{key: key},
         _
       ) do
-    Logger.warn(fn ->
+    Logger.warning(fn ->
       "Pool worker for #{key}: Client #{inspect(client_pid)} died before releasing the connection with #{inspect(reason)}"
     end)
   end

lib/pleroma/upload/filter/analyze_metadata.ex

@@ -29,7 +29,7 @@ def filter(%Pleroma.Upload{tempfile: file, content_type: "image" <> _} = upload)
       {:ok, :filtered, upload}
     rescue
       e in ErlangError ->
-        Logger.warn("#{__MODULE__}: #{inspect(e)}")
+        Logger.warning("#{__MODULE__}: #{inspect(e)}")
         {:ok, :noop}
     end
   end
@@ -46,7 +46,7 @@ def filter(%Pleroma.Upload{tempfile: file, content_type: "video" <> _} = upload)
       {:ok, :filtered, upload}
     rescue
       e in ErlangError ->
-        Logger.warn("#{__MODULE__}: #{inspect(e)}")
+        Logger.warning("#{__MODULE__}: #{inspect(e)}")
         {:ok, :noop}
     end
   end

lib/pleroma/user.ex

@@ -1560,7 +1560,7 @@ def unmute(muter_id, mutee_id) do
       unmute(muter, mutee)
     else
       {who, result} = error ->
-        Logger.warn(
+        Logger.warning(
           "User.unmute/2 failed. #{who}: #{result}, muter_id: #{muter_id}, mutee_id: #{mutee_id}"
         )
 

lib/pleroma/user/backup.ex

@@ -293,7 +293,7 @@ defp write(query, dir, name, fun, caller_pid) do
             acc + 1
           else
             {:error, e} ->
-              Logger.warn(
+              Logger.warning(
                 "Error processing backup item: #{inspect(e)}\n The item is: #{inspect(i)}"
               )
 

lib/pleroma/web/activity_pub/activity_pub_controller.ex

@@ -475,7 +475,7 @@ def update_outbox(
         |> json(message)
 
       e ->
-        Logger.warn(fn -> "AP C2S: #{inspect(e)}" end)
+        Logger.warning(fn -> "AP C2S: #{inspect(e)}" end)
 
         conn
         |> put_status(:bad_request)

lib/pleroma/web/activity_pub/mrf.ex

@@ -203,7 +203,7 @@ def config_descriptions(policies) do
         if Enum.all?(@required_description_keys, &Map.has_key?(description, &1)) do
           [description | acc]
         else
-          Logger.warn(
+          Logger.warning(
             "#{policy} config description doesn't have one or all required keys #{inspect(@required_description_keys)}"
           )
 

lib/pleroma/web/activity_pub/mrf/follow_bot_policy.ex

@@ -19,7 +19,7 @@ def filter(message) do
       try_follow(follower, message)
     else
       nil ->
-        Logger.warn(
+        Logger.warning(
           "#{__MODULE__} skipped because of missing `:mrf_follow_bot, :follower_nickname` configuration, the :follower_nickname
             account does not exist, or the account is not correctly configured as a bot."
         )

lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex

@@ -41,7 +41,7 @@ defp steal_emoji({shortcode, url}, emoji_dir_path) do
             shortcode
 
           e ->
-            Logger.warn("MRF.StealEmojiPolicy: Failed to write to #{file_path}: #{inspect(e)}")
+            Logger.warning("MRF.StealEmojiPolicy: Failed to write to #{file_path}: #{inspect(e)}")
             nil
         end
       else
@@ -53,7 +53,7 @@ defp steal_emoji({shortcode, url}, emoji_dir_path) do
       end
     else
       e ->
-        Logger.warn("MRF.StealEmojiPolicy: Failed to fetch #{url}: #{inspect(e)}")
+        Logger.warning("MRF.StealEmojiPolicy: Failed to fetch #{url}: #{inspect(e)}")
         nil
     end
   end

lib/pleroma/web/activity_pub/transmogrifier.ex

@@ -156,7 +156,7 @@ def fix_in_reply_to(%{"inReplyTo" => in_reply_to} = object, options)
         |> Map.drop(["conversation", "inReplyToAtomUri"])
       else
         e ->
-          Logger.warn("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}")
+          Logger.warning("Couldn't fetch #{inspect(in_reply_to_id)}, error: #{inspect(e)}")
           object
       end
     else
@@ -182,7 +182,7 @@ def fix_quote_url_and_maybe_fetch(object, options \\ []) do
         object
 
       e ->
-        Logger.warn("Couldn't fetch #{inspect(quote_url)}, error: #{inspect(e)}")
+        Logger.warning("Couldn't fetch #{inspect(quote_url)}, error: #{inspect(e)}")
         object
     end
   end

lib/pleroma/web/common_api.ex

@@ -550,7 +550,7 @@ def remove_mute(user_id, activity_id) do
       remove_mute(user, activity)
     else
       {what, result} = error ->
-        Logger.warn(
+        Logger.warning(
           "CommonAPI.remove_mute/2 failed. #{what}: #{result}, user_id: #{user_id}, activity_id: #{activity_id}"
         )
 

lib/pleroma/web/common_api/utils.ex

@@ -321,13 +321,13 @@ def date_to_asctime(date) when is_binary(date) do
       format_asctime(date)
     else
       _e ->
-        Logger.warn("Date #{date} in wrong format, must be ISO 8601")
+        Logger.warning("Date #{date} in wrong format, must be ISO 8601")
         ""
     end
   end
 
   def date_to_asctime(date) do
-    Logger.warn("Date #{date} in wrong format, must be ISO 8601")
+    Logger.warning("Date #{date} in wrong format, must be ISO 8601")
     ""
   end
 

lib/pleroma/web/plugs/http_security_plug.ex

@@ -201,7 +201,7 @@ defp build_csp_param(url) when is_binary(url) do
 
   def warn_if_disabled do
     unless Config.get([:http_security, :enabled]) do
-      Logger.warn("
+      Logger.warning("
                                  .i;;;;i.
                                iYcviii;vXY:
                              .YXi       .i1c.

lib/pleroma/web/plugs/rate_limiter.ex

@@ -89,7 +89,7 @@ def call(conn, plug_opts) do
   end
 
   defp handle_disabled(conn) do
-    Logger.warn(
+    Logger.warning(
       "Rate limiter disabled due to forwarded IP not being found. Please ensure your reverse proxy is providing the X-Forwarded-For header or disable the RemoteIP plug/rate limiter."
     )
 

lib/pleroma/web/push.ex

@@ -9,7 +9,7 @@ defmodule Pleroma.Web.Push do
 
   def init do
     unless enabled() do
-      Logger.warn("""
+      Logger.warning("""
       VAPID key pair is not found. If you wish to enabled web push, please run
 
           mix web_push.gen.keypair

lib/pleroma/web/push/impl.ex

@@ -57,7 +57,7 @@ def perform(
   end
 
   def perform(_) do
-    Logger.warn("Unknown notification type")
+    Logger.warning("Unknown notification type")
     {:error, :unknown_type}
   end
 

lib/pleroma/web/rich_media/parser.ex

@@ -75,7 +75,7 @@ defp log_error(url, {:invalid_metadata, data}) do
     end
 
     defp log_error(url, reason) do
-      Logger.warn(fn -> "Rich media error for #{url}: #{inspect(reason)}" end)
+      Logger.warning(fn -> "Rich media error for #{url}: #{inspect(reason)}" end)
     end
   end
 

lib/pleroma/web/web_finger.ex

@@ -163,7 +163,7 @@ def find_lrdd_template(domain) do
       get_template_from_xml(body)
     else
       error ->
-        Logger.warn("Can't find LRDD template in #{inspect(meta_url)}: #{inspect(error)}")
+        Logger.warning("Can't find LRDD template in #{inspect(meta_url)}: #{inspect(error)}")
         {:error, :lrdd_not_found}
     end
   end

test/support/cluster.ex

@@ -127,7 +127,10 @@ def eval_quoted(block, binding) do
 
   defp start_slave({node_host, override_configs}) do
     log(node_host, "booting federated VM")
-    {:ok, node} = :slave.start(~c"127.0.0.1", node_name(node_host), vm_args())
+
+    {:ok, node} =
+      do_start_slave(%{host: "127.0.0.1", name: node_name(node_host), args: vm_args()})
+
     add_code_paths(node)
     load_apps_and_transfer_configuration(node, override_configs)
     ensure_apps_started(node)
@@ -219,4 +222,18 @@ defp node_name(node_host) do
     |> Enum.at(0)
     |> String.to_atom()
   end
+
+  if System.otp_release() >= "25" do
+    @peer :peer
+  else
+    @peer :slave
+  end
+
+  defp do_start_slave(%{host: host, name: name, args: args} = opts) do
+    if System.otp_release() >= "25" do
+      @peer.start(opts)
+    else
+      @peer.start(host, name, args)
+    end
+  end
 end

test/support/helpers.ex

@@ -41,7 +41,7 @@ defmacro clear_config(config_path, temp_setting) do
     # NOTE: `clear_config([section, key], value)` != `clear_config([section], key: value)` (!)
     # Displaying a warning to prevent unintentional clearing of all but one keys in section
     if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
-      Logger.warn(
+      Logger.warning(
         "Please change `clear_config([section], key: value)` to `clear_config([section, key], value)`"
       )
     end

test/support/http_request_mock.ex

@@ -21,7 +21,7 @@ def request(
     else
       error ->
         with {:error, message} <- error do
-          Logger.warn(to_string(message))
+          Logger.warning(to_string(message))
         end
 
         {_, _r} = error