diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 09:50:00 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 09:50:00 +0000 |
| commit | 23067908de957bb1e7ad2c87e64ae91e4328cb87 (patch) | |
| tree | 2c75327c2b35d5759eb971d5486a7f30bef8d386 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | b177e1e7f330ff1531be190949db7f75e378a449 (diff) | |
| parent | 7410aee886fbb38615bb595b8b7be0722761a0a4 (diff) | |
| download | pleroma-23067908de957bb1e7ad2c87e64ae91e4328cb87.tar.gz | |
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index fc8a2458c..5462ce8be 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -181,14 +181,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do defp mastodonized_emoji do Pleroma.Emoji.get_all() - |> Enum.map(fn {shortcode, relative_url} -> + |> Enum.map(fn {shortcode, relative_url, tags} -> url = to_string(URI.merge(Web.base_url(), relative_url)) %{ "shortcode" => shortcode, "static_url" => url, "visible_in_picker" => true, - "url" => url + "url" => url, + "tags" => String.split(tags, ",") } end) end |