diff options
| author | lain <lain@soykaf.club> | 2020-11-17 11:12:20 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-17 11:12:20 +0000 |
| commit | 9d4797f61b3483c8b5963bcdc3e093c46b306326 (patch) | |
| tree | 1fd17a0cea3c51ebce70431f2fee63e22aefa889 /lib | |
| parent | 28da36975dc325bb577ee81fb791fbdc7ec3e7e2 (diff) | |
| parent | b1466661ebd7ec1714642cab4bb8f986e97b93ec (diff) | |
| download | pleroma-9d4797f61b3483c8b5963bcdc3e093c46b306326.tar.gz | |
Merge branch 'fix/api-v1-instance-absolute-urls' into 'develop'
Use absolute URLs to thumbnail and background in /api/v1/instance
See merge request pleroma/pleroma!3149
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/instance_view.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index ea2d3aa9c..c5aca5506 100644 --- 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: Keyword.get(instance, :instance_thumbnail), + thumbnail: Pleroma.Web.base_url() <> Keyword.get(instance, :instance_thumbnail), languages: ["en"], registrations: Keyword.get(instance, :registrations_open), approval_required: Keyword.get(instance, :account_approval_required), @@ -34,7 +34,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do avatar_upload_limit: Keyword.get(instance, :avatar_upload_limit), background_upload_limit: Keyword.get(instance, :background_upload_limit), banner_upload_limit: Keyword.get(instance, :banner_upload_limit), - background_image: Keyword.get(instance, :background_image), + background_image: Pleroma.Web.base_url() <> Keyword.get(instance, :background_image), chat_limit: Keyword.get(instance, :chat_limit), description_limit: Keyword.get(instance, :description_limit), pleroma: %{ |