pleroma

commit: d21ef5e66bd0d7601b06dc7e59f3ee0fcd9e04bb
parent: 98f014d3be22bc74e22ed93677d4381e782f2a5a
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Tue, 23 Jun 2020 01:55:33 +0000

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
Diffstat:
M
config/config.exs
1
+
M
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
@@ -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
@@ -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