Commit 0f194dc5 authored by eal's avatar eal
Browse files

Merge branch 'feature/instance-thumbnail-api' into 'develop'

Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55
parents 3fa6f3ae 03c15a54
Pipeline #571 passed with stage
in 2 minutes and 16 seconds
...@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do ...@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Endpoint do
at: "/media", from: "uploads", gzip: false at: "/media", from: "uploads", gzip: false
plug Plug.Static, plug Plug.Static,
at: "/", from: :pleroma, 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 reloading can be explicitly enabled under the
# :code_reloader configuration of your endpoint. # :code_reloader configuration of your endpoint.
......
...@@ -103,6 +103,7 @@ def masto_instance(conn, _params) do ...@@ -103,6 +103,7 @@ def masto_instance(conn, _params) do
streaming_api: String.replace(Web.base_url, ["http","https"], "wss") streaming_api: String.replace(Web.base_url, ["http","https"], "wss")
}, },
stats: Stats.get_stats, stats: Stats.get_stats,
thumbnail: Web.base_url <> "/instance/thumbnail.jpeg",
max_toot_chars: Keyword.get(@instance, :limit) max_toot_chars: Keyword.get(@instance, :limit)
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment