Merge branch 'features/mastoapi-emoji-categories' into 'develop'

MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365

CHANGELOG.md

@@ -27,6 +27,7 @@ Configuration: `federation_incoming_replies_max_depth` option
 - Admin API: Allow querying user by ID
 - Added synchronization of following/followers counters for external users
 - Configuration: `enabled` option for `Pleroma.Emails.Mailer`, defaulting to `false`.
+- Mastodon API: Add support for categories for custom emojis by reusing the group feature. <https://github.com/tootsuite/mastodon/pull/11196>
 
 ## [1.0.0] - 2019-06-29
 ### Security

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

test/web/mastodon_api/mastodon_api_controller_test.exs

@@ -2958,6 +2958,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
       assert Map.has_key?(emoji, "static_url")
       assert Map.has_key?(emoji, "tags")
       assert is_list(emoji["tags"])
+      assert Map.has_key?(emoji, "category")
       assert Map.has_key?(emoji, "url")
       assert Map.has_key?(emoji, "visible_in_picker")
     end