diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-04-13 19:05:07 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-04-13 19:05:07 +0000 |
| commit | d2a03d3c86be86f2a131f7da0c62c9f46ca521a7 (patch) | |
| tree | c4428de15f6e6143590997ceb2d273e356cc1e9c /lib | |
| parent | f8cef70416b5da5fabdac89ad95589e735fe85a9 (diff) | |
| parent | cdd271b0655799e65bb9a13016dc82441ec34f87 (diff) | |
| download | pleroma-d2a03d3c86be86f2a131f7da0c62c9f46ca521a7.tar.gz | |
Merge branch 'fix/instance-thumbnail-url' into 'develop'
Fix URL to custom instance thumbnail
Closes #2611
See merge request pleroma/pleroma!3388
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 73205fb6d..dac68d8e6 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -23,7 +23,8 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do streaming_api: Pleroma.Web.Endpoint.websocket_url() }, stats: Pleroma.Stats.get_stats(), - thumbnail: Pleroma.Web.base_url() <> Keyword.get(instance, :instance_thumbnail), + thumbnail: + URI.merge(Pleroma.Web.base_url(), Keyword.get(instance, :instance_thumbnail)) |> to_string, languages: ["en"], registrations: Keyword.get(instance, :registrations_open), approval_required: Keyword.get(instance, :account_approval_required), |