little cleanup

[akkoma] / lib / pleroma / web / admin_api / config.ex

diff --git a/lib/pleroma/web/admin_api/config.ex b/lib/pleroma/web/admin_api/config.ex
index ef658e0793b120503302fc04a9dfa92010ed2d57..49f0f8223beec52be539dd1531cc19c8750c47af 100644 (file)
--- a/lib/pleroma/web/admin_api/config.ex
+++ b/lib/pleroma/web/admin_api/config.ex
@@ -48,6 +48,7 @@ defmodule Pleroma.Web.AdminAPI.Config do
 
   @full_key_update [
     {:pleroma, :ecto_repos},
+    {:pleroma, :assets},
     {:quack, :meta},
     {:mime, :types},
     {:cors_plug, [:max_age, :methods, :expose, :headers]},
@@ -81,7 +82,7 @@ defmodule Pleroma.Web.AdminAPI.Config do
          old_value <- from_binary(config.value),
          transformed_value <- do_transform(params[:value]),
          {:can_be_merged, true, config} <- {:can_be_merged, is_list(transformed_value), config},
-         new_value <- Keyword.merge(old_value, transformed_value) do
+         new_value <- DeepMerge.deep_merge(old_value, transformed_value) do
       Config.update(config, %{value: new_value, transformed?: true})
     else
       {reason, false, config} when reason in [:partial_update, :can_be_merged] ->
@@ -183,6 +184,11 @@ defmodule Pleroma.Web.AdminAPI.Config do
   defp do_convert(entity) when is_boolean(entity) or is_number(entity) or is_nil(entity),
     do: entity
 
+  defp do_convert(entity)
+       when is_atom(entity) and entity in [:"tlsv1.1", :"tlsv1.2", :"tlsv1.3"] do
+    ":#{to_string(entity)}"
+  end
+
   defp do_convert(entity) when is_atom(entity), do: inspect(entity)
 
   defp do_convert(entity) when is_binary(entity), do: entity