diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 01:55:33 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-06-23 01:55:33 +0000 |
| commit | d21ef5e66bd0d7601b06dc7e59f3ee0fcd9e04bb (patch) | |
| tree | 0a033201adb78f00232e451436b464daef95f729 | |
| parent | 98f014d3be22bc74e22ed93677d4381e782f2a5a (diff) | |
| parent | df5e048cbb7d349b34203ccba49a8f646e4d93a3 (diff) | |
| download | pleroma-d21ef5e66bd0d7601b06dc7e59f3ee0fcd9e04bb.tar.gz | |
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
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 4bf31f3fc..e0888fa9a 100644 --- a/config/config.exs +++ b/config/config.exs @@ -186,6 +186,7 @@ config :pleroma, :instance, 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, diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index c498fe632..c6b54e570 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -23,7 +23,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView 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 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView 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 |