Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop

diff --combined config/config.exs
index 9fdb2546e45a5d926d5432d2b074cdb50d7b8874,5cd085fe5f5e2febaf553a2f8406fd279cf7bc10..5fced7029c336180e7811f3724dd16e7d659c1ce
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -224,7 -224,6 +224,7 @@@ config :pleroma, :instance
      "text/markdown",
      "text/bbcode"
    ],
 +  staff_transparency: [],
    autofollowed_nicknames: [],
    autofollowing_nicknames: [],
    max_pinned_statuses: 1,
@@@ -327,6 -326,9 +327,9 @@@ config :pleroma, :frontend_configuratio
      subjectLineBehavior: "email",
      theme: "pleroma-dark",
      webPushNotifications: false
+   },
+   masto_fe: %{
+     showInstanceSpecificPanel: true
    }
  
  config :pleroma, :assets,
@@@ -857,8 -859,6 +860,8 @@@ config :pleroma, ConcurrentLimiter, 
    {Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
  ]
  
 +config :pleroma, :search, provider: Pleroma.Search.Builtin
 +
  config :pleroma, :telemetry,
    slow_queries_logging: [
      enabled: false,

diff --combined lib/pleroma/user.ex
index 045b6fb84e1e2d1c63011d160a387e57f3489bfa,6a226244276ca6175eaa9732236f9eb66da6b34b..efe9ec5d6fe7f69d3856f7041ee6fc8ebb12027f
--- 1/lib/pleroma/user.ex
--- 2/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -124,6 -124,7 +124,7 @@@ defmodule Pleroma.User d
      field(:is_moderator, :boolean, default: false)
      field(:is_admin, :boolean, default: false)
      field(:show_role, :boolean, default: true)
+     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)
@@@ -1090,7 -1091,6 +1091,7 @@@
  
    def update_and_set_cache(changeset) do
      with {:ok, user} <- Repo.update(changeset, stale_error_field: :id) do
 +      Pleroma.Elasticsearch.maybe_put_into_elasticsearch(user)
        set_cache(user)
      end
    end
@@@ -1731,6 -1731,7 +1732,7 @@@
        ap_enabled: false,
        is_moderator: false,
        is_admin: false,
+       mastofe_settings: nil,
        mascot: nil,
        emoji: %{},
        pleroma_settings_store: %{},
@@@ -2348,6 -2349,13 +2350,13 @@@
      |> update_and_set_cache()
    end
  
+   def mastodon_settings_update(user, settings) do
+     user
+     |> cast(%{mastofe_settings: settings}, [:mastofe_settings])
+     |> validate_required([:mastofe_settings])
+     |> update_and_set_cache()
+   end
+ 
    @spec confirmation_changeset(User.t(), keyword()) :: Changeset.t()
    def confirmation_changeset(user, set_confirmation: confirmed?) do
      params =