diff options
| author | eal <eal@waifu.club> | 2018-01-31 18:34:52 +0000 |
|---|---|---|
| committer | eal <eal@waifu.club> | 2018-01-31 18:34:52 +0000 |
| commit | 0f194dc56bc5dc58e42d8cc32f376c2635f2598c (patch) | |
| tree | 6255a6895fba1072ba60a66dc3372c9d58473cc1 /lib | |
| parent | 3fa6f3ae42636a2a5ca86e74d3d88826c2b96ed6 (diff) | |
| parent | 03c15a54f562dfcc26afeefbe00921e446ff5c31 (diff) | |
| download | pleroma-0f194dc56bc5dc58e42d8cc32f376c2635f2598c.tar.gz | |
Merge branch 'feature/instance-thumbnail-api' into 'develop'
Provide instance thumbnail in /api/v1/instance
See merge request pleroma/pleroma!55
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/endpoint.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index b57cf3917..725d2ee64 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do at: "/media", from: "uploads", gzip: false plug Plug.Static, at: "/", from: :pleroma, - only: ~w(index.html static finmoji emoji packs sounds sw.js) + only: ~w(index.html static finmoji emoji packs sounds instance sw.js) # Code reloading can be explicitly enabled under the # :code_reloader configuration of your endpoint. diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 0615ac11a..e16a2a092 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -103,6 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do streaming_api: String.replace(Web.base_url, ["http","https"], "wss") }, stats: Stats.get_stats, + thumbnail: Web.base_url <> "/instance/thumbnail.jpeg", max_toot_chars: Keyword.get(@instance, :limit) } |