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/typeutils/internaltofrontend.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'internal/typeutils/internaltofrontend.go') diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go index 09bd5fc7d..7b4c3e8cc 100644 --- a/internal/typeutils/internaltofrontend.go +++ b/internal/typeutils/internaltofrontend.go @@ -363,6 +363,24 @@ func (c *converter) EmojiToAPIEmoji(ctx context.Context, e *gtsmodel.Emoji) (mod }, nil } +func (c *converter) EmojiToAdminAPIEmoji(ctx context.Context, e *gtsmodel.Emoji) (*model.AdminEmoji, error) { + emoji, err := c.EmojiToAPIEmoji(ctx, e) + if err != nil { + return nil, err + } + + return &model.AdminEmoji{ + Emoji: emoji, + ID: e.ID, + Disabled: *e.Disabled, + Domain: e.Domain, + UpdatedAt: util.FormatISO8601(e.UpdatedAt), + TotalFileSize: e.ImageFileSize + e.ImageStaticFileSize, + ContentType: e.ImageContentType, + URI: e.URI, + }, nil +} + func (c *converter) TagToAPITag(ctx context.Context, t *gtsmodel.Tag) (model.Tag, error) { return model.Tag{ Name: t.Name, -- cgit v1.2.3