summaryrefslogtreecommitdiff
path: root/internal/processing/admin/emoji.go
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-15 14:33:58 +0100
committerLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-01-15 14:33:58 +0100
commitc4a533db72505ca5303d8da637f54fae12b137a2 (patch)
tree24d67dd28411bd6e579fc9ce65a1527dadf2178a /internal/processing/admin/emoji.go
parentpin instanceAccountID to in-process emoji (diff)
downloadgotosocial-c4a533db72505ca5303d8da637f54fae12b137a2.tar.xz
start fixing up emoji processing code
Diffstat (limited to 'internal/processing/admin/emoji.go')
-rw-r--r--internal/processing/admin/emoji.go11
1 files changed, 10 insertions, 1 deletions
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index 8858dbd02..77fa5102b 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -27,6 +27,8 @@ import (
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
+ "github.com/superseriousbusiness/gotosocial/internal/id"
+ "github.com/superseriousbusiness/gotosocial/internal/uris"
)
func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, error) {
@@ -52,7 +54,14 @@ func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
return buf.Bytes(), f.Close()
}
- processingEmoji, err := p.mediaManager.ProcessEmoji(ctx, data, form.Shortcode, nil)
+ emojiID, err := id.NewRandomULID()
+ if err != nil {
+ return nil, fmt.Errorf("error creating id for new emoji: %s", err)
+ }
+
+ emojiURI := uris.GenerateURIForEmoji(emojiID)
+
+ processingEmoji, err := p.mediaManager.ProcessEmoji(ctx, data, form.Shortcode, emojiID, emojiURI, nil)
if err != nil {
return nil, err
}