diff options
| author | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
| commit | 1963e143c5feace9eb9a3be29b0eeba2ad88751a (patch) | |
| tree | 9a7ae160dd452db000e33af62f61057667c5953f /lib/pleroma/user.ex | |
| parent | 67d92ac7b7b977debac8f8e580db1f0e1ef3ed52 (diff) | |
| parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
| download | pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 9d5c61e79..8a54546d6 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -115,7 +115,7 @@ defmodule Pleroma.User do field(:is_moderator, :boolean, default: false) field(:is_admin, :boolean, default: false) field(:show_role, :boolean, default: true) - field(:settings, :map, default: nil) + field(:mastofe_settings, :map, default: nil) field(:uri, ObjectValidators.Uri, default: nil) field(:hide_followers_count, :boolean, default: false) field(:hide_follows_count, :boolean, default: false) @@ -2118,8 +2118,8 @@ defmodule Pleroma.User do def mastodon_settings_update(user, settings) do user - |> cast(%{settings: settings}, [:settings]) - |> validate_required([:settings]) + |> cast(%{mastofe_settings: settings}, [:mastofe_settings]) + |> validate_required([:mastofe_settings]) |> update_and_set_cache() end |