sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add custom emoji to Mastodon UI initial state.

Browse source
This commit is contained in:
Roger Braun 2017-11-16 09:40:06 +01:00
parent 3d1360c4d6
commit 8de890a0d9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,8 +113,8 @@ def masto_instance(conn, _params) do
json(conn, response)
end
def custom_emojis(conn, _params) do
mastodon_emoji = Pleroma.Formatter.get_custom_emoji()
defp mastodonized_emoji do
Pleroma.Formatter.get_custom_emoji()
|> Enum.map(fn {shortcode, relative_url} ->
url = to_string URI.merge(Web.base_url(), relative_url)
%{
@ -123,6 +123,10 @@ def custom_emojis(conn, _params) do
"url" => url
}
end)
end
def custom_emojis(conn, _params) do
mastodon_emoji = mastodonized_emoji()
json conn, mastodon_emoji
end
@ -473,6 +477,7 @@ def index(%{assigns: %{user: user}} = conn, _params) do
|> get_session(:oauth_token)
if user && token do
mastodon_emoji = mastodonized_emoji()
accounts = Map.put(%{}, user.id, AccountView.render("account.json", %{user: user}))
initial_state = %{
meta: %{
@ -540,7 +545,7 @@ def index(%{assigns: %{user: user}} = conn, _params) do
},
push_subscription: nil,
accounts: accounts,
custom_emojis: %{}
custom_emojis: mastodon_emoji
} |> Poison.encode!
conn
|> put_layout(false)