diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-10 15:07:37 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-10 15:07:37 +0000 |
| commit | 3ff4a06ebe3b8fc8acaa29da0c9170d006b58987 (patch) | |
| tree | dcba1470964c8407e40fb89fa1f9ac2f092f7a12 /lib | |
| parent | b972b972e00d1528f77fe726e066f35cf1323cb7 (diff) | |
| parent | 252e129b1e784147cf29868bcc191f88a9b7d5b9 (diff) | |
| download | pleroma-3ff4a06ebe3b8fc8acaa29da0c9170d006b58987.tar.gz | |
Merge branch 'features/mastoapi-emoji-categories' into 'develop'
MastoAPI: Add categories to custom emojis
See merge request pleroma/pleroma!1365
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 |
1 files changed, 3 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 82f180635..8c2033c3a 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -299,7 +299,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do "static_url" => url, "visible_in_picker" => true, "url" => url, - "tags" => tags + "tags" => tags, + # Assuming that a comma is authorized in the category name + "category" => (tags -- ["Custom"]) |> Enum.join(",") } end) end |