[feature] Allow newly uploaded emojis to be placed in categories (#939)

* [feature] Add emoji categories GET
Serialize emojis in appropriate categories; make it possible to get categories via the admin API

* [feature] Create (or use existing) category for new emoji uploads

* fix lint issue

* update misleading line in swagger docs

2 files changed, 25 insertions, 1 deletions

diff --git a/testrig/db.go b/testrig/db.go
index 2e974f100..83f575a02 100644
--- a/testrig/db.go
+++ b/testrig/db.go
@@ -55,6 +55,7 @@ var testModels = []interface{}{
 	&gtsmodel.RouterSession{},
 	&gtsmodel.Token{},
 	&gtsmodel.Client{},
+	&gtsmodel.EmojiCategory{},
 	&gtsmodel.Tombstone{},
 }
 
@@ -199,6 +200,12 @@ func StandardDBSetup(db db.DB, accounts map[string]*gtsmodel.Account) {
 		}
 	}
 
+	for _, v := range NewTestEmojiCategories() {
+		if err := db.Put(ctx, v); err != nil {
+			log.Panic(err)
+		}
+	}
+
 	for _, v := range NewTestStatusToEmojis() {
 		if err := db.Put(ctx, v); err != nil {
 			log.Panic(err)
diff --git a/testrig/testmodels.go b/testrig/testmodels.go
index 9f987eeae..6d29736a1 100644
--- a/testrig/testmodels.go
+++ b/testrig/testmodels.go
@@ -964,7 +964,7 @@ func NewTestEmojis() map[string]*gtsmodel.Emoji {
 			Disabled:               FalseBool(),
 			URI:                    "http://localhost:8080/emoji/01F8MH9H8E4VG3KDYJR9EGPXCQ",
 			VisibleInPicker:        TrueBool(),
-			CategoryID:             "",
+			CategoryID:             "01GGQ8V4993XK67B2JB396YFB7",
 		},
 		"yell": {
 			ID:                     "01GD5KP5CQEE1R3X43Y1EHS2CW",
@@ -991,6 +991,23 @@ func NewTestEmojis() map[string]*gtsmodel.Emoji {
 	}
 }
 
+func NewTestEmojiCategories() map[string]*gtsmodel.EmojiCategory {
+	return map[string]*gtsmodel.EmojiCategory{
+		"reactions": {
+			ID:        "01GGQ8V4993XK67B2JB396YFB7",
+			Name:      "reactions",
+			CreatedAt: TimeMustParse("2020-03-18T11:40:55+02:00"),
+			UpdatedAt: TimeMustParse("2020-03-19T12:35:12+02:00"),
+		},
+		"cute stuff": {
+			ID:        "01GGQ989PTT9PMRN4FZ1WWK2B9",
+			Name:      "cute stuff",
+			CreatedAt: TimeMustParse("2020-03-20T11:40:55+02:00"),
+			UpdatedAt: TimeMustParse("2020-03-21T12:35:12+02:00"),
+		},
+	}
+}
+
 func NewTestStatusToEmojis() map[string]*gtsmodel.StatusToEmoji {
 	return map[string]*gtsmodel.StatusToEmoji{
 		"admin_account_status_1_rainbow": {