Merge branch 'legacy-fe-config' into 'develop'
remove deprecated PleromaFE configuration See merge request pleroma/pleroma!1152
This commit is contained in:
commit
153c15cdb2
@ -97,6 +97,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||||||
- Mastodon API: Exposing default scope of the user to anyone
|
- Mastodon API: Exposing default scope of the user to anyone
|
||||||
- Mastodon API: Make `irreversible` field default to `false` [`POST /api/v1/filters`]
|
- Mastodon API: Make `irreversible` field default to `false` [`POST /api/v1/filters`]
|
||||||
|
|
||||||
|
## Removed
|
||||||
|
- Configuration: `config :pleroma, :fe` in favor of the more flexible `config :pleroma, :frontend_configurations`
|
||||||
|
|
||||||
## [0.9.9999] - 2019-04-05
|
## [0.9.9999] - 2019-04-05
|
||||||
### Security
|
### Security
|
||||||
- Mastodon API: Fix content warnings skipping HTML sanitization
|
- Mastodon API: Fix content warnings skipping HTML sanitization
|
||||||
|
@ -253,25 +253,6 @@ config :pleroma, :markup,
|
|||||||
Pleroma.HTML.Scrubber.Default
|
Pleroma.HTML.Scrubber.Default
|
||||||
]
|
]
|
||||||
|
|
||||||
# Deprecated, will be gone in 1.0
|
|
||||||
config :pleroma, :fe,
|
|
||||||
theme: "pleroma-dark",
|
|
||||||
logo: "/static/logo.png",
|
|
||||||
logo_mask: true,
|
|
||||||
logo_margin: "0.1em",
|
|
||||||
background: "/static/aurora_borealis.jpg",
|
|
||||||
redirect_root_no_login: "/main/all",
|
|
||||||
redirect_root_login: "/main/friends",
|
|
||||||
show_instance_panel: true,
|
|
||||||
scope_options_enabled: false,
|
|
||||||
formatting_options_enabled: false,
|
|
||||||
collapse_message_with_subject: false,
|
|
||||||
hide_post_stats: false,
|
|
||||||
hide_user_stats: false,
|
|
||||||
scope_copy: true,
|
|
||||||
subject_line_behavior: "email",
|
|
||||||
always_show_subject_input: true
|
|
||||||
|
|
||||||
config :pleroma, :frontend_configurations,
|
config :pleroma, :frontend_configurations,
|
||||||
pleroma_fe: %{
|
pleroma_fe: %{
|
||||||
theme: "pleroma-dark",
|
theme: "pleroma-dark",
|
||||||
|
@ -5,15 +5,6 @@
|
|||||||
defmodule Pleroma.Config.DeprecationWarnings do
|
defmodule Pleroma.Config.DeprecationWarnings do
|
||||||
require Logger
|
require Logger
|
||||||
|
|
||||||
def check_frontend_config_mechanism do
|
|
||||||
if Pleroma.Config.get(:fe) do
|
|
||||||
Logger.warn("""
|
|
||||||
!!!DEPRECATION WARNING!!!
|
|
||||||
You are using the old configuration mechanism for the frontend. Please check config.md.
|
|
||||||
""")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def check_hellthread_threshold do
|
def check_hellthread_threshold do
|
||||||
if Pleroma.Config.get([:mrf_hellthread, :threshold]) do
|
if Pleroma.Config.get([:mrf_hellthread, :threshold]) do
|
||||||
Logger.warn("""
|
Logger.warn("""
|
||||||
@ -24,7 +15,6 @@ defmodule Pleroma.Config.DeprecationWarnings do
|
|||||||
end
|
end
|
||||||
|
|
||||||
def warn do
|
def warn do
|
||||||
check_frontend_config_mechanism()
|
|
||||||
check_hellthread_threshold()
|
check_hellthread_threshold()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -173,8 +173,6 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
|
|
||||||
def config(conn, _params) do
|
def config(conn, _params) do
|
||||||
instance = Pleroma.Config.get(:instance)
|
instance = Pleroma.Config.get(:instance)
|
||||||
instance_fe = Pleroma.Config.get(:fe)
|
|
||||||
instance_chat = Pleroma.Config.get(:chat)
|
|
||||||
|
|
||||||
case get_format(conn) do
|
case get_format(conn) do
|
||||||
"xml" ->
|
"xml" ->
|
||||||
@ -219,31 +217,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
|
|||||||
if(Pleroma.Config.get([:instance, :safe_dm_mentions]), do: "1", else: "0")
|
if(Pleroma.Config.get([:instance, :safe_dm_mentions]), do: "1", else: "0")
|
||||||
}
|
}
|
||||||
|
|
||||||
pleroma_fe =
|
pleroma_fe = Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
|
||||||
if instance_fe do
|
|
||||||
%{
|
|
||||||
theme: Keyword.get(instance_fe, :theme),
|
|
||||||
background: Keyword.get(instance_fe, :background),
|
|
||||||
logo: Keyword.get(instance_fe, :logo),
|
|
||||||
logoMask: Keyword.get(instance_fe, :logo_mask),
|
|
||||||
logoMargin: Keyword.get(instance_fe, :logo_margin),
|
|
||||||
redirectRootNoLogin: Keyword.get(instance_fe, :redirect_root_no_login),
|
|
||||||
redirectRootLogin: Keyword.get(instance_fe, :redirect_root_login),
|
|
||||||
chatDisabled: !Keyword.get(instance_chat, :enabled),
|
|
||||||
showInstanceSpecificPanel: Keyword.get(instance_fe, :show_instance_panel),
|
|
||||||
scopeOptionsEnabled: Keyword.get(instance_fe, :scope_options_enabled),
|
|
||||||
formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled),
|
|
||||||
collapseMessageWithSubject:
|
|
||||||
Keyword.get(instance_fe, :collapse_message_with_subject),
|
|
||||||
hidePostStats: Keyword.get(instance_fe, :hide_post_stats),
|
|
||||||
hideUserStats: Keyword.get(instance_fe, :hide_user_stats),
|
|
||||||
scopeCopy: Keyword.get(instance_fe, :scope_copy),
|
|
||||||
subjectLineBehavior: Keyword.get(instance_fe, :subject_line_behavior),
|
|
||||||
alwaysShowSubjectInput: Keyword.get(instance_fe, :always_show_subject_input)
|
|
||||||
}
|
|
||||||
else
|
|
||||||
Pleroma.Config.get([:frontend_configurations, :pleroma_fe])
|
|
||||||
end
|
|
||||||
|
|
||||||
managed_config = Keyword.get(instance, :managed_config)
|
managed_config = Keyword.get(instance, :managed_config)
|
||||||
|
|
||||||
|
@ -141,7 +141,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|
|
||||||
test "it returns the managed config", %{conn: conn} do
|
test "it returns the managed config", %{conn: conn} do
|
||||||
Pleroma.Config.put([:instance, :managed_config], false)
|
Pleroma.Config.put([:instance, :managed_config], false)
|
||||||
Pleroma.Config.put([:fe], theme: "rei-ayanami-towel")
|
Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})
|
||||||
|
|
||||||
response =
|
response =
|
||||||
conn
|
conn
|
||||||
@ -157,29 +157,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
|
|||||||
|> get("/api/statusnet/config.json")
|
|> get("/api/statusnet/config.json")
|
||||||
|> json_response(:ok)
|
|> json_response(:ok)
|
||||||
|
|
||||||
assert response["site"]["pleromafe"]
|
assert response["site"]["pleromafe"] == %{"theme" => "asuka-hospital"}
|
||||||
end
|
|
||||||
|
|
||||||
test "if :pleroma, :fe is false, it returns the new style config settings", %{conn: conn} do
|
|
||||||
Pleroma.Config.put([:instance, :managed_config], true)
|
|
||||||
Pleroma.Config.put([:fe, :theme], "rei-ayanami-towel")
|
|
||||||
Pleroma.Config.put([:frontend_configurations, :pleroma_fe], %{theme: "asuka-hospital"})
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> get("/api/statusnet/config.json")
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["site"]["pleromafe"]["theme"] == "rei-ayanami-towel"
|
|
||||||
|
|
||||||
Pleroma.Config.put([:fe], false)
|
|
||||||
|
|
||||||
response =
|
|
||||||
conn
|
|
||||||
|> get("/api/statusnet/config.json")
|
|
||||||
|> json_response(:ok)
|
|
||||||
|
|
||||||
assert response["site"]["pleromafe"]["theme"] == "asuka-hospital"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user