allow configuration of theme-color
This commit is contained in:
parent
a9c82b62f2
commit
e830e91283
9 changed files with 68 additions and 89 deletions
|
@ -477,6 +477,8 @@ config :pleroma, Pleroma.Web.Metadata,
|
||||||
],
|
],
|
||||||
unfurl_nsfw: false
|
unfurl_nsfw: false
|
||||||
|
|
||||||
|
config :pleroma, Pleroma.Web.Metadata.Providers.Theme, theme_color: "#593196"
|
||||||
|
|
||||||
config :pleroma, Pleroma.Web.Preload,
|
config :pleroma, Pleroma.Web.Preload,
|
||||||
providers: [
|
providers: [
|
||||||
Pleroma.Web.Preload.Providers.Instance
|
Pleroma.Web.Preload.Providers.Instance
|
||||||
|
|
|
@ -1979,6 +1979,21 @@ config :pleroma, :config_description, [
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
%{
|
||||||
|
group: :pleroma,
|
||||||
|
key: Pleroma.Web.Metadata.Providers.Theme,
|
||||||
|
type: :group,
|
||||||
|
description: "Specific provider to hand out themes to instances that scrape index.html",
|
||||||
|
children: [
|
||||||
|
%{
|
||||||
|
key: :theme_color,
|
||||||
|
type: :string,
|
||||||
|
description:
|
||||||
|
"The 'accent color' of the instance, used in places like misskey's instance ticker",
|
||||||
|
suggestions: ["#593196"]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
%{
|
%{
|
||||||
group: :pleroma,
|
group: :pleroma,
|
||||||
key: :rich_media,
|
key: :rich_media,
|
||||||
|
|
|
@ -47,7 +47,6 @@ defmodule Pleroma.Application do
|
||||||
# Disable warnings_as_errors at runtime, it breaks Phoenix live reload
|
# Disable warnings_as_errors at runtime, it breaks Phoenix live reload
|
||||||
# due to protocol consolidation warnings
|
# due to protocol consolidation warnings
|
||||||
Code.compiler_options(warnings_as_errors: false)
|
Code.compiler_options(warnings_as_errors: false)
|
||||||
Pleroma.Telemetry.Logger.attach()
|
|
||||||
Config.Holder.save_default()
|
Config.Holder.save_default()
|
||||||
Pleroma.HTML.compile_scrubbers()
|
Pleroma.HTML.compile_scrubbers()
|
||||||
Pleroma.Config.Oban.warn()
|
Pleroma.Config.Oban.warn()
|
||||||
|
|
|
@ -1,85 +0,0 @@
|
||||||
# Pleroma: A lightweight social networking server
|
|
||||||
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
|
|
||||||
defmodule Pleroma.Telemetry.Logger do
|
|
||||||
@moduledoc "Transforms Pleroma telemetry events to logs"
|
|
||||||
|
|
||||||
require Logger
|
|
||||||
|
|
||||||
@events [
|
|
||||||
[:pleroma, :repo, :query]
|
|
||||||
]
|
|
||||||
def attach do
|
|
||||||
:telemetry.attach_many(
|
|
||||||
"pleroma-logger",
|
|
||||||
@events,
|
|
||||||
&Pleroma.Telemetry.Logger.handle_event/4,
|
|
||||||
[]
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
# Passing anonymous functions instead of strings to logger is intentional,
|
|
||||||
# that way strings won't be concatenated if the message is going to be thrown
|
|
||||||
# out anyway due to higher log level configured
|
|
||||||
|
|
||||||
def handle_event(
|
|
||||||
[:pleroma, :repo, :query] = _name,
|
|
||||||
%{query_time: query_time} = measurements,
|
|
||||||
%{source: source} = metadata,
|
|
||||||
config
|
|
||||||
) do
|
|
||||||
logging_config = Pleroma.Config.get([:telemetry, :slow_queries_logging], [])
|
|
||||||
|
|
||||||
if logging_config[:enabled] &&
|
|
||||||
logging_config[:min_duration] &&
|
|
||||||
query_time > logging_config[:min_duration] and
|
|
||||||
(is_nil(logging_config[:exclude_sources]) or
|
|
||||||
source not in logging_config[:exclude_sources]) do
|
|
||||||
log_slow_query(measurements, metadata, config)
|
|
||||||
else
|
|
||||||
:ok
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
defp log_slow_query(
|
|
||||||
%{query_time: query_time} = _measurements,
|
|
||||||
%{source: _source, query: query, params: query_params, repo: repo} = _metadata,
|
|
||||||
_config
|
|
||||||
) do
|
|
||||||
sql_explain =
|
|
||||||
with {:ok, %{rows: explain_result_rows}} <-
|
|
||||||
repo.query("EXPLAIN " <> query, query_params, log: false) do
|
|
||||||
Enum.map_join(explain_result_rows, "\n", & &1)
|
|
||||||
end
|
|
||||||
|
|
||||||
{:current_stacktrace, stacktrace} = Process.info(self(), :current_stacktrace)
|
|
||||||
|
|
||||||
pleroma_stacktrace =
|
|
||||||
Enum.filter(stacktrace, fn
|
|
||||||
{__MODULE__, _, _, _} ->
|
|
||||||
false
|
|
||||||
|
|
||||||
{mod, _, _, _} ->
|
|
||||||
mod
|
|
||||||
|> to_string()
|
|
||||||
|> String.starts_with?("Elixir.Pleroma.")
|
|
||||||
end)
|
|
||||||
|
|
||||||
Logger.warn(fn ->
|
|
||||||
"""
|
|
||||||
Slow query!
|
|
||||||
|
|
||||||
Total time: #{round(query_time / 1_000)} ms
|
|
||||||
|
|
||||||
#{query}
|
|
||||||
|
|
||||||
#{inspect(query_params, limit: :infinity)}
|
|
||||||
|
|
||||||
#{sql_explain}
|
|
||||||
|
|
||||||
#{Exception.format_stacktrace(pleroma_stacktrace)}
|
|
||||||
"""
|
|
||||||
end)
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -12,8 +12,6 @@ defmodule Pleroma.Web.Endpoint do
|
||||||
socket("/socket", Pleroma.Web.UserSocket)
|
socket("/socket", Pleroma.Web.UserSocket)
|
||||||
socket("/live", Phoenix.LiveView.Socket)
|
socket("/live", Phoenix.LiveView.Socket)
|
||||||
|
|
||||||
plug(Plug.Telemetry, event_prefix: [:phoenix, :endpoint])
|
|
||||||
|
|
||||||
plug(Pleroma.Web.Plugs.SetLocalePlug)
|
plug(Pleroma.Web.Plugs.SetLocalePlug)
|
||||||
plug(CORSPlug)
|
plug(CORSPlug)
|
||||||
plug(Pleroma.Web.Plugs.HTTPSecurityPlug)
|
plug(Pleroma.Web.Plugs.HTTPSecurityPlug)
|
||||||
|
|
|
@ -55,11 +55,12 @@ defmodule Pleroma.Web.Fallback.RedirectController do
|
||||||
def redirector_with_preload(conn, params) do
|
def redirector_with_preload(conn, params) do
|
||||||
{:ok, index_content} = File.read(index_file_path())
|
{:ok, index_content} = File.read(index_file_path())
|
||||||
preloads = preload_data(conn, params)
|
preloads = preload_data(conn, params)
|
||||||
|
tags = Metadata.build_static_tags(params)
|
||||||
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
|
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
|
||||||
|
|
||||||
response =
|
response =
|
||||||
index_content
|
index_content
|
||||||
|> String.replace("<!--server-generated-meta-->", preloads <> title)
|
|> String.replace("<!--server-generated-meta-->", tags <> preloads <> title)
|
||||||
|
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("text/html")
|
|> put_resp_content_type("text/html")
|
||||||
|
|
|
@ -5,6 +5,23 @@
|
||||||
defmodule Pleroma.Web.Metadata do
|
defmodule Pleroma.Web.Metadata do
|
||||||
alias Phoenix.HTML
|
alias Phoenix.HTML
|
||||||
|
|
||||||
|
def build_static_tags(params) do
|
||||||
|
providers = [
|
||||||
|
Pleroma.Web.Metadata.Providers.Theme
|
||||||
|
]
|
||||||
|
|
||||||
|
Enum.reduce(providers, "", fn parser, acc ->
|
||||||
|
rendered_html =
|
||||||
|
params
|
||||||
|
|> parser.build_tags()
|
||||||
|
|> Enum.map(&to_tag/1)
|
||||||
|
|> Enum.map(&HTML.safe_to_string/1)
|
||||||
|
|> Enum.join()
|
||||||
|
|
||||||
|
acc <> rendered_html
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
def build_tags(params) do
|
def build_tags(params) do
|
||||||
providers = [
|
providers = [
|
||||||
Pleroma.Web.Metadata.Providers.RelMe,
|
Pleroma.Web.Metadata.Providers.RelMe,
|
||||||
|
|
16
lib/pleroma/web/metadata/providers/theme.ex
Normal file
16
lib/pleroma/web/metadata/providers/theme.ex
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
defmodule Pleroma.Web.Metadata.Providers.Theme do
|
||||||
|
alias Pleroma.Web.Metadata.Providers.Provider
|
||||||
|
|
||||||
|
@behaviour Provider
|
||||||
|
|
||||||
|
@impl Provider
|
||||||
|
def build_tags(_) do
|
||||||
|
[
|
||||||
|
{:meta,
|
||||||
|
[
|
||||||
|
name: "theme-color",
|
||||||
|
content: Pleroma.Config.get([__MODULE__, :theme_color])
|
||||||
|
], []}
|
||||||
|
]
|
||||||
|
end
|
||||||
|
end
|
16
test/pleroma/web/metadata/providers/theme_test.exs
Normal file
16
test/pleroma/web/metadata/providers/theme_test.exs
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Web.Metadata.Providers.OpenGraphTest do
|
||||||
|
use Pleroma.DataCase
|
||||||
|
alias Pleroma.Web.Metadata.Providers.Theme
|
||||||
|
|
||||||
|
setup do: clear_config([Pleroma.Web.Metadata.Providers.Theme, :theme_color], "configured")
|
||||||
|
|
||||||
|
test "it renders the theme-color meta tag" do
|
||||||
|
result = Theme.build_tags(%{})
|
||||||
|
|
||||||
|
assert {:meta, [name: "theme-color", content: "configured"], []} in result
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in a new issue