hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'exposed-background-image' into 'develop'

Browse source 
InstanceView: Expose background image link.

See merge request pleroma/pleroma!2545
This commit is contained in:
Haelwenn 2020-05-20 10:53:54 +00:00
commit 94ba5a7802
6 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/api_spec/operations/instance_operation.ex
View file

@ -130,6 +130,7 @@ defmodule Pleroma.Web.ApiSpec.InstanceOperation do
example: %{
"avatar_upload_limit" => 2_000_000,
"background_upload_limit" => 4_000_000,
"background_image" => "/static/image.png",
"banner_upload_limit" => 4_000_000,
"description" => "A Pleroma instance, an alternative fediverse server",
"email" => "lain@lain.com",

1
lib/pleroma/web/mastodon_api/views/instance_view.ex
View file

@ -33,6 +33,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),
pleroma: %{
metadata: %{
features: features(),