fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-24 10:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
Provide instance thumbnail in /api/v1/instance

See merge request pleroma/pleroma!55
This commit is contained in:
eal 2018-01-31 18:34:52 +00:00
parent 3fa6f3ae42 03c15a54f5
commit 0f194dc56b
3 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/endpoint.ex
View file

@ -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.

1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -103,6 +103,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController 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)
} }

BIN
priv/static/instance/thumbnail.jpeg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 47 KiB