From: Mark Felder <feld@feld.me>
Date: Fri, 9 Apr 2021 15:30:27 +0000 (-0500)
Subject: Use URI.merge to prevent concatenating two canonical URLs when a custom instance... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=0feafcc20cec168258f592b9d509c1e6ccc8efba;p=akkoma

Use URI.merge to prevent concatenating two canonical URLs when a custom instance thumbnail was uploaded via AdminFE
---

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),