From: kaniini <nenolod@gmail.com>
Date: Tue, 4 Jun 2019 05:43:43 +0000 (+0000)
Subject: Merge branch 'generic-fe-settings' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9d2563a3deb0904b8c7a480479179f10e7849c12;p=akkoma

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

Generic settings store for frontend user settings

See merge request pleroma/pleroma!1221
---

9d2563a3deb0904b8c7a480479179f10e7849c12
diff --cc lib/pleroma/user/info.ex
index 88bec76a7,37cdf2fa7..fb9ab92ab
--- a/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