aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-06-30 01:05:28 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-07-10 17:02:37 +0200
commit252e129b1e784147cf29868bcc191f88a9b7d5b9 (patch)
treedcba1470964c8407e40fb89fa1f9ac2f092f7a12 /lib
parentb972b972e00d1528f77fe726e066f35cf1323cb7 (diff)
downloadpleroma-252e129b1e784147cf29868bcc191f88a9b7d5b9.tar.gz
MastoAPI: Add categories to custom emojis
Note: This isn’t in a release yet, can be seen in mastofe on the rebase/glitch-soc branch.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex4
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