Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail See merge request pleroma/pleroma!2672
This commit is contained in:
commit
d21ef5e66b
@ -186,6 +186,7 @@
|
||||
notify_email: "noreply@example.com",
|
||||
description: "Pleroma: An efficient and flexible fediverse server",
|
||||
background_image: "/images/city.jpg",
|
||||
instance_thumbnail: "/instance/thumbnail.jpeg",
|
||||
limit: 5_000,
|
||||
chat_limit: 5_000,
|
||||
remote_limit: 100_000,
|
||||
|
@ -23,7 +23,7 @@ def render("show.json", _) do
|
||||
streaming_api: Pleroma.Web.Endpoint.websocket_url()
|
||||
},
|
||||
stats: Pleroma.Stats.get_stats(),
|
||||
thumbnail: instance_thumbnail(),
|
||||
thumbnail: Keyword.get(instance, :instance_thumbnail),
|
||||
languages: ["en"],
|
||||
registrations: Keyword.get(instance, :registrations_open),
|
||||
# Extra (not present in Mastodon):
|
||||
@ -88,9 +88,4 @@ def federation do
|
||||
end
|
||||
|> Map.put(:enabled, Config.get([:instance, :federating]))
|
||||
end
|
||||
|
||||
defp instance_thumbnail do
|
||||
Pleroma.Config.get([:instance, :instance_thumbnail]) ||
|
||||
"#{Pleroma.Web.base_url()}/instance/thumbnail.jpeg"
|
||||
end
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user