2 files changed, 13 insertions, 8 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index cc93c2309..7572a6b65 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -827,15 +827,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
         merged =
           Pleroma.Config.Holder.config()
           |> DeepMerge.deep_merge(configs)
-          |> Enum.map(fn {group, value} ->
-            Enum.map(value, fn {key, value} ->
+          |> Enum.map(fn {group, values} ->
+            Enum.map(values, fn {key, value} ->
               db =
                 if configs[group][key] do
-                  if Keyword.keyword?(value) do
-                    Keyword.keys(value) |> Enum.map(fn key -> ConfigDB.convert(key) end)
-                  else
-                    ConfigDB.convert(key)
-                  end
+                  ConfigDB.get_db_keys(value, key)
                 end
 
               setting = %{
@@ -871,6 +867,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
             end
         end)
         |> Enum.reject(&is_nil(&1))
+        |> Enum.map(fn config ->
+          Map.put(config, :db, ConfigDB.get_db_keys(config))
+        end)
 
       Pleroma.Config.TransferTask.load_and_update_env()
 
diff --git a/lib/pleroma/web/admin_api/views/config_view.ex b/lib/pleroma/web/admin_api/views/config_view.ex
index 72b042ab7..23d97e847 100644
--- a/lib/pleroma/web/admin_api/views/config_view.ex
+++ b/lib/pleroma/web/admin_api/views/config_view.ex
@@ -12,10 +12,16 @@ defmodule Pleroma.Web.AdminAPI.ConfigView do
   end
 
   def render("show.json", %{config: config}) do
-    %{
+    map = %{
       key: config.key,
       group: config.group,
       value: Pleroma.ConfigDB.from_binary_with_convert(config.value)
     }
+
+    if config.db != [] do
+      Map.put(map, :db, config.db)
+    else
+      map
+    end
   end
 end