aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-05-31 14:49:46 +0200
committerlain <lain@soykaf.club>2019-05-31 14:49:46 +0200
commitaaad85c4d908dd14c1d836ebe2a5302cfdfaff2e (patch)
tree9c35561cd952f42acc8538b838eb383be4739de3
parenteb2963bc43f2cb195c2f19e6081c3faa6375fe4e (diff)
downloadpleroma-aaad85c4d908dd14c1d836ebe2a5302cfdfaff2e.tar.gz
AccountView: settings -> settings_store
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex2
-rw-r--r--test/web/mastodon_api/account_view_test.exs6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 04d485340..dc32a1525 100644
--- 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 ca73d6581..5e6f1d00b 100644
--- 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