From a4335e391f6818b9ea09520f60ca8c436d643f38 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Wed, 31 Jan 2018 22:51:25 +0900 Subject: provide instance thumbnail at /api/v1/instance --- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 1 + priv/static/instance-thumbnail.jpeg | Bin 0 -> 47702 bytes 2 files changed, 1 insertion(+) create mode 100644 priv/static/instance-thumbnail.jpeg diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 0615ac11a..ce30453cb 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 <> "/static/instance-thumbnail.jpeg", max_toot_chars: Keyword.get(@instance, :limit) } diff --git a/priv/static/instance-thumbnail.jpeg b/priv/static/instance-thumbnail.jpeg new file mode 100644 index 000000000..b7e012644 Binary files /dev/null and b/priv/static/instance-thumbnail.jpeg differ -- cgit v1.2.3 From 10753178ead922aa364738219b715dcaed979b20 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Wed, 31 Jan 2018 22:57:43 +0900 Subject: provide instance thumbnail at /api/v1/instance (debug) --- priv/static/instance-thumbnail.jpeg | Bin 47702 -> 0 bytes priv/static/static/instance-thumbnail.jpeg | Bin 0 -> 47702 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 priv/static/instance-thumbnail.jpeg create mode 100644 priv/static/static/instance-thumbnail.jpeg diff --git a/priv/static/instance-thumbnail.jpeg b/priv/static/instance-thumbnail.jpeg deleted file mode 100644 index b7e012644..000000000 Binary files a/priv/static/instance-thumbnail.jpeg and /dev/null differ diff --git a/priv/static/static/instance-thumbnail.jpeg b/priv/static/static/instance-thumbnail.jpeg new file mode 100644 index 000000000..b7e012644 Binary files /dev/null and b/priv/static/static/instance-thumbnail.jpeg differ -- cgit v1.2.3 From e47f60c05376b9e2af0c90a984014003aac22104 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Wed, 31 Jan 2018 23:04:34 +0900 Subject: provide instance thumbnail at /api/v1/instance (debug) --- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 +- priv/static/instance/thumbnail.jpeg | Bin 0 -> 47702 bytes priv/static/static/instance-thumbnail.jpeg | Bin 47702 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 priv/static/instance/thumbnail.jpeg delete mode 100644 priv/static/static/instance-thumbnail.jpeg diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index ce30453cb..e16a2a092 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -103,7 +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 <> "/static/instance-thumbnail.jpeg", + thumbnail: Web.base_url <> "/instance/thumbnail.jpeg", max_toot_chars: Keyword.get(@instance, :limit) } diff --git a/priv/static/instance/thumbnail.jpeg b/priv/static/instance/thumbnail.jpeg new file mode 100644 index 000000000..b7e012644 Binary files /dev/null and b/priv/static/instance/thumbnail.jpeg differ diff --git a/priv/static/static/instance-thumbnail.jpeg b/priv/static/static/instance-thumbnail.jpeg deleted file mode 100644 index b7e012644..000000000 Binary files a/priv/static/static/instance-thumbnail.jpeg and /dev/null differ -- cgit v1.2.3 From 03c15a54f562dfcc26afeefbe00921e446ff5c31 Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Wed, 31 Jan 2018 23:09:47 +0900 Subject: provide instance thumbnail at /api/v1/instance (debug) --- lib/pleroma/web/endpoint.ex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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. -- cgit v1.2.3