merge fix

This commit is contained in:
Alexander Strizhakov 2020-01-20 18:25:00 +03:00
parent efb8ef5abe
commit 8023fa48db
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
2 changed files with 20 additions and 2 deletions

View File

@ -102,7 +102,7 @@ defmodule Pleroma.ConfigDB do
subkeys = sub_key_full_update(group, key, intersect_keys) subkeys = sub_key_full_update(group, key, intersect_keys)
merged_value = DeepMerge.deep_merge(old_value, new_value) merged_value = ConfigDB.merge(old_value, new_value)
Enum.reduce(subkeys, merged_value, fn subkey, acc -> Enum.reduce(subkeys, merged_value, fn subkey, acc ->
Keyword.put(acc, subkey, new_value[subkey]) Keyword.put(acc, subkey, new_value[subkey])
@ -127,6 +127,24 @@ defmodule Pleroma.ConfigDB do
|> List.flatten() |> List.flatten()
end end
def merge(config1, config2) when is_list(config1) and is_list(config2) do
Keyword.merge(config1, config2, fn _, app1, app2 ->
if Keyword.keyword?(app1) and Keyword.keyword?(app2) do
Keyword.merge(app1, app2, &deep_merge/3)
else
app2
end
end)
end
defp deep_merge(_key, value1, value2) do
if Keyword.keyword?(value1) and Keyword.keyword?(value2) do
Keyword.merge(value1, value2, &deep_merge/3)
else
value2
end
end
@full_key_update [ @full_key_update [
{:pleroma, :ecto_repos}, {:pleroma, :ecto_repos},
{:quack, :meta}, {:quack, :meta},

View File

@ -826,7 +826,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
else else
merged = merged =
Pleroma.Config.Holder.config() Pleroma.Config.Holder.config()
|> DeepMerge.deep_merge(configs) |> ConfigDB.merge(configs)
|> Enum.map(fn {group, values} -> |> Enum.map(fn {group, values} ->
Enum.map(values, fn {key, value} -> Enum.map(values, fn {key, value} ->
db = db =