From fa2e62078caeae415fcff7a1cc0503defd05c2de Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Thu, 15 Apr 2021 23:51:04 -0600
Subject: [PATCH] Remove MastoFE configuration stuff
---
config/config.exs | 3 ---
config/description.exs | 21 +------------------
docs/configuration/cheatsheet.md | 7 ++-----
.../mastodon_api/update_credentials_test.exs | 12 +++++------
4 files changed, 9 insertions(+), 34 deletions(-)
diff --git a/config/config.exs b/config/config.exs
index 4381068ac..07565c557 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -322,9 +322,6 @@ config :pleroma, :frontend_configurations,
subjectLineBehavior: "email",
theme: "pleroma-dark",
webPushNotifications: false
- },
- masto_fe: %{
- showInstanceSpecificPanel: true
}
config :pleroma, :assets,
diff --git a/config/description.exs b/config/description.exs
index bb1f43305..bc3f11dde 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1169,7 +1169,7 @@ config :pleroma, :config_description, [
type: :group,
description:
"This form can be used to configure a keyword list that keeps the configuration data for any " <>
- "kind of frontend. By default, settings for pleroma_fe and masto_fe are configured. If you want to " <>
+ "kind of frontend. By default, settings for pleroma_fe are configured. If you want to " <>
"add your own configuration your settings all fields must be complete.",
children: [
%{
@@ -1376,25 +1376,6 @@ config :pleroma, :config_description, [
suggestions: ["pleroma-dark"]
}
]
- },
- %{
- key: :masto_fe,
- label: "Masto FE",
- type: :map,
- description: "Settings for Masto FE",
- suggestions: [
- %{
- showInstanceSpecificPanel: true
- }
- ],
- children: [
- %{
- key: :showInstanceSpecificPanel,
- label: "Show instance specific panel",
- type: :boolean,
- description: "Whenether to show the instance's specific panel"
- }
- ]
}
]
},
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md
index 069421722..5c3313a2c 100644
--- a/docs/configuration/cheatsheet.md
+++ b/docs/configuration/cheatsheet.md
@@ -246,7 +246,7 @@ Notes:
### :frontend_configurations
-This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` and `masto_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Pleroma-FE configuration and customization for instance administrators](/frontend/CONFIGURATION/#options).
+This can be used to configure a keyword list that keeps the configuration data for any kind of frontend. By default, settings for `pleroma_fe` are configured. You can find the documentation for `pleroma_fe` configuration into [Pleroma-FE configuration and customization for instance administrators](/frontend/CONFIGURATION/#options).
Frontends can access these settings at `/api/v1/pleroma/frontend_configurations`
@@ -257,10 +257,7 @@ config :pleroma, :frontend_configurations,
pleroma_fe: %{
theme: "pleroma-dark",
# ... see /priv/static/static/config.json for the available keys.
-},
- masto_fe: %{
- showInstanceSpecificPanel: true
- }
+}
```
These settings **need to be complete**, they will override the defaults.
diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs
index cfbe6cf0e..cf8ccf187 100644
--- a/test/pleroma/web/mastodon_api/update_credentials_test.exs
+++ b/test/pleroma/web/mastodon_api/update_credentials_test.exs
@@ -35,8 +35,8 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
|> assign(:user, user)
|> patch("/api/v1/accounts/update_credentials", %{
"pleroma_settings_store" => %{
- masto_fe: %{
- theme: "bla"
+ soapbox_fe: %{
+ themeMode: "bla"
}
}
})
@@ -46,7 +46,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
assert user_data["pleroma"]["settings_store"] ==
%{
"pleroma_fe" => %{"theme" => "bla"},
- "masto_fe" => %{"theme" => "bla"}
+ "soapbox_fe" => %{"themeMode" => "bla"}
}
user = Repo.get(User, user_data["id"])
@@ -60,8 +60,8 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
|> assign(:user, user)
|> patch("/api/v1/accounts/update_credentials", %{
"pleroma_settings_store" => %{
- masto_fe: %{
- theme: "blub"
+ soapbox_fe: %{
+ themeMode: "blub"
}
}
})
@@ -71,7 +71,7 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do
assert user_data["pleroma"]["settings_store"] ==
%{
"pleroma_fe" => %{"theme" => "bla"},
- "masto_fe" => %{"theme" => "blub"}
+ "soapbox_fe" => %{"themeMode" => "blub"}
}
assert_called(Pleroma.Web.Federator.publish(:_))