Browse Source

Do not need a function to provide fallback value with default defined in config.exs

merge-requests/2720/head
Mark Felder 4 years ago
parent
commit
df5e048cbb
1 changed files with 1 additions and 6 deletions
  1. +1
    -6
      lib/pleroma/web/mastodon_api/views/instance_view.ex

+ 1
- 6
lib/pleroma/web/mastodon_api/views/instance_view.ex View File

@@ -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

Loading…
Cancel
Save