diff options
author | lain <lain@soykaf.club> | 2020-05-15 13:45:02 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-15 13:45:02 +0000 |
commit | fee3aa82e8ebf67f081a275f681105a56fea0d6e (patch) | |
tree | fe97e64b186343dea8e39dadcfe461149d1d42c6 /lib | |
parent | 081d1d3f48f2264ee329f7ff7af7c2f88fe0a654 (diff) | |
parent | 3c29f4f957dbfa4bf7b914ecc1680bfa71bb7621 (diff) | |
download | pleroma-fee3aa82e8ebf67f081a275f681105a56fea0d6e.tar.gz |
Merge branch 'fix/database-config' into 'develop'
Returning partial chain
Closes #1772
See merge request pleroma/pleroma!2537
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/config/config_db.ex | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/pleroma/config/config_db.ex b/lib/pleroma/config/config_db.ex index 4097ee5b7..2b43d4c36 100644 --- a/lib/pleroma/config/config_db.ex +++ b/lib/pleroma/config/config_db.ex @@ -278,6 +278,8 @@ defmodule Pleroma.ConfigDB do } end + defp do_convert({:partial_chain, entity}), do: %{"tuple" => [":partial_chain", inspect(entity)]} + defp do_convert(entity) when is_tuple(entity) do value = entity @@ -321,6 +323,15 @@ defmodule Pleroma.ConfigDB do {:proxy_url, {do_transform_string(type), parse_host(host), port}} end + defp do_transform(%{"tuple" => [":partial_chain", entity]}) do + {partial_chain, []} = + entity + |> String.replace(~r/[^\w|^{:,[|^,|^[|^\]^}|^\/|^\.|^"]^\s/, "") + |> Code.eval_string() + + {:partial_chain, partial_chain} + end + defp do_transform(%{"tuple" => entity}) do Enum.reduce(entity, {}, fn val, acc -> Tuple.append(acc, do_transform(val)) end) end |