AccountView: settings -> settings_store

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 04d48534090fa1f295e08167945d60b3c4627c34..dc32a152549f2e41f297504b16f78d77b655b5de 100644 (file)
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -157,7 +157,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
          with_pleroma_settings: true
        }) do
     data
-    |> Kernel.put_in([:pleroma, :settings], info.pleroma_settings_store)
+    |> Kernel.put_in([:pleroma, :settings_store], info.pleroma_settings_store)
   end
 
   defp maybe_put_settings_store(data, _, _, _), do: data

diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs
index ca73d6581a7edfd9ed61d3476cc96d4afeee64af..5e6f1d00b737ed494142d8dc03b9f942f3250acd 100644 (file)
--- a/test/web/mastodon_api/account_view_test.exs
+++ b/test/web/mastodon_api/account_view_test.exs
@@ -246,12 +246,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
     result =
       AccountView.render("account.json", %{user: user, for: user, with_pleroma_settings: true})
 
-    assert result.pleroma.settings == %{:fe => "test"}
+    assert result.pleroma.settings_store == %{:fe => "test"}
 
     result = AccountView.render("account.json", %{user: user, with_pleroma_settings: true})
-    assert result.pleroma[:settings] == nil
+    assert result.pleroma[:settings_store] == nil
 
     result = AccountView.render("account.json", %{user: user, for: user})
-    assert result.pleroma[:settings] == nil
+    assert result.pleroma[:settings_store] == nil
   end
 end