Merge branch 'generic-fe-settings' into 'develop'

Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/user/info.ex
index 88bec76a77f8ca397fbce0b258c86dabfa948ad1,37cdf2fa76e1f77c3afb7ce790f81a64d950fdf2..fb9ab92ab851c0db79339296e9a5bc2d2e6cd058
--- 1/lib/pleroma/user/info.ex
--- 2/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@@ -42,16 -42,13 +42,17 @@@ defmodule Pleroma.User.Info d
      field(:hide_follows, :boolean, default: false)
      field(:hide_favorites, :boolean, default: true)
      field(:pinned_activities, {:array, :string}, default: [])
 -    field(:flavour, :string, default: nil)
      field(:mascot, :map, default: nil)
      field(:emoji, {:array, :map}, default: [])
+     field(:pleroma_settings_store, :map, default: %{})
  
      field(:notification_settings, :map,
 -      default: %{"remote" => true, "local" => true, "followers" => true, "follows" => true}
 +      default: %{
 +        "followers" => true,
 +        "follows" => true,
 +        "non_follows" => true,
 +        "non_followers" => true
 +      }
      )
  
      # Found in the wild

diff --cc lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge

diff --cc test/web/mastodon_api/account_view_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge