diff options
| author | href <href@random.sh> | 2018-11-05 13:24:00 +0100 |
|---|---|---|
| committer | href <href@random.sh> | 2018-11-05 13:24:00 +0100 |
| commit | 763fc7b44fb5931f1a2f869d4c67a5ca9a0b5206 (patch) | |
| tree | c5e3aa419de92a3e6dd835127c6b0dbc79bb6561 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | bd97b3614f2353619ab524844d100b6f25527592 (diff) | |
| download | pleroma-763fc7b44fb5931f1a2f869d4c67a5ca9a0b5206.tar.gz | |
Runtime configured emojis
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index f6cf081fd..e92114f57 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -158,7 +158,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end defp mastodonized_emoji do - Pleroma.Formatter.get_custom_emoji() + Pleroma.Emoji.get_all() |> Enum.map(fn {shortcode, relative_url} -> url = to_string(URI.merge(Web.base_url(), relative_url)) |