diff options
| author | feld <feld@feld.me> | 2021-04-15 14:59:26 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-04-15 14:59:26 +0000 |
| commit | 0a7c2a32badc8520d90146d5a1aae7907a679614 (patch) | |
| tree | 13a41747e2452ec5d3bf6128b090c37257985f2c /lib | |
| parent | 765f0907dfa9371038188ee35fc3b241be796d26 (diff) | |
| parent | 0ba8efc9500d55a3e26a8f0a66a8f425b1436881 (diff) | |
| download | pleroma-0a7c2a32badc8520d90146d5a1aae7907a679614.tar.gz | |
Merge branch 'develop' into 'fix/notifsettings-breaking-login'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/config_db.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/config_db.ex b/lib/pleroma/config_db.ex index b874e0e37..cb57673e3 100644 --- a/lib/pleroma/config_db.ex +++ b/lib/pleroma/config_db.ex @@ -387,6 +387,6 @@ defmodule Pleroma.ConfigDB do @spec module_name?(String.t()) :: boolean() def module_name?(string) do Regex.match?(~r/^(Pleroma|Phoenix|Tesla|Quack|Ueberauth|Swoosh)\./, string) or - string in ["Oban", "Ueberauth", "ExSyslogger"] + string in ["Oban", "Ueberauth", "ExSyslogger", "ConcurrentLimiter"] end end 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), |