From eb85ef7325300727bf69f3ce620d4362f983b2e7 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 12 Oct 2022 15:01:42 +0200 Subject: [feature] Add `/api/v1/admin/custom_emojis` endpoint (#902) * add admin emojis get path + model + docs * stub admin emojis get processor function * add id + disabled fields to admin emoji * add emoji -> api admin emoji converter * tidy up a bit * add GetEmojis function * finish up get emojis function * order by shortcodedomain * ASC * tidy up + explain * update to allow paging * make admin emojis pageable * fix mixed case paging * normalize emoji queries a bit better * test emoji get paging * make limit optional * fix incorrect path in media cleanup tests * i have bad coder syndrome * don't trimspace * rename -> GetUseableEmojis * wrap emoji query in subquery avoid selecting more than we need * fix a bit of sillyness teehee * fix subquery postgres woes --- internal/api/client/admin/admin.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'internal/api/client/admin/admin.go') diff --git a/internal/api/client/admin/admin.go b/internal/api/client/admin/admin.go index 2044c4ab0..e8aac0dee 100644 --- a/internal/api/client/admin/admin.go +++ b/internal/api/client/admin/admin.go @@ -31,6 +31,8 @@ const ( BasePath = "/api/v1/admin" // EmojiPath is used for posting/deleting custom emojis. EmojiPath = BasePath + "/custom_emojis" + // EmojiPathWithID is used for interacting with a single emoji. + EmojiPathWithID = EmojiPath + "/:" + IDKey // DomainBlocksPath is used for posting domain blocks. DomainBlocksPath = BasePath + "/domain_blocks" // DomainBlocksPathWithID is used for interacting with a single domain block. @@ -49,6 +51,16 @@ const ( ImportQueryKey = "import" // IDKey specifies the ID of a single item being interacted with. IDKey = "id" + // FilterKey is for applying filters to admin views of accounts, emojis, etc. + FilterQueryKey = "filter" + // MaxShortcodeDomainKey is the url query for returning emoji results lower (alphabetically) + // than the given `[shortcode]@[domain]` parameter. + MaxShortcodeDomainKey = "max_shortcode_domain" + // MaxShortcodeDomainKey is the url query for returning emoji results higher (alphabetically) + // than the given `[shortcode]@[domain]` parameter. + MinShortcodeDomainKey = "min_shortcode_domain" + // LimitKey is for specifying maximum number of results to return. + LimitKey = "limit" ) // Module implements the ClientAPIModule interface for admin-related actions (reports, emojis, etc) @@ -66,6 +78,7 @@ func New(processor processing.Processor) api.ClientModule { // Route attaches all routes from this module to the given router func (m *Module) Route(r router.Router) error { r.AttachHandler(http.MethodPost, EmojiPath, m.EmojiCreatePOSTHandler) + r.AttachHandler(http.MethodGet, EmojiPath, m.EmojisGETHandler) r.AttachHandler(http.MethodPost, DomainBlocksPath, m.DomainBlocksPOSTHandler) r.AttachHandler(http.MethodGet, DomainBlocksPath, m.DomainBlocksGETHandler) r.AttachHandler(http.MethodGet, DomainBlocksPathWithID, m.DomainBlockGETHandler) -- cgit v1.2.3