Browse Source

AccountView: settings -> settings_store

tags/v1.1.4
lain 5 years ago
parent
commit
aaad85c4d9
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      lib/pleroma/web/mastodon_api/views/account_view.ex
  2. +3
    -3
      test/web/mastodon_api/account_view_test.exs

+ 1
- 1
lib/pleroma/web/mastodon_api/views/account_view.ex View File

@@ -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


+ 3
- 3
test/web/mastodon_api/account_view_test.exs View File

@@ -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

Loading…
Cancel
Save