diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2024-01-05 13:39:53 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-01-05 13:39:53 +0100 |
| commit | 72d0f46b0b0930e5d8bef617a82020d09c93aea1 (patch) | |
| tree | d2aaef161ded2d7b0d92c8f0faec1858152614ab /internal/media/processingemoji.go | |
| parent | [feature] Parse instance descriptors as markdown, show T&C on /about (#2481) (diff) | |
| download | gotosocial-72d0f46b0b0930e5d8bef617a82020d09c93aea1.tar.xz | |
[feature] Allow webp emoji uploads / derefs (#2484)
Diffstat (limited to 'internal/media/processingemoji.go')
| -rw-r--r-- | internal/media/processingemoji.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/internal/media/processingemoji.go b/internal/media/processingemoji.go index 56113b27b..9287f14ce 100644 --- a/internal/media/processingemoji.go +++ b/internal/media/processingemoji.go @@ -21,6 +21,7 @@ import ( "bytes" "context" "io" + "slices" "codeberg.org/gruf/go-bytesize" "codeberg.org/gruf/go-errors/v2" @@ -57,7 +58,6 @@ func (p *ProcessingEmoji) EmojiID() string { func (p *ProcessingEmoji) LoadEmoji(ctx context.Context) (*gtsmodel.Emoji, error) { // Attempt to load synchronously. emoji, done, err := p.load(ctx) - if err == nil { // No issue, return media. return emoji, nil @@ -209,12 +209,8 @@ func (p *ProcessingEmoji) store(ctx context.Context) error { return gtserror.Newf("error parsing file type: %w", err) } - switch info.Extension { - // only supported emoji types - case "gif", "png": - - // unhandled - default: + // Ensure supported emoji img type. + if !slices.Contains(SupportedEmojiMIMETypes, info.MIME.Value) { return gtserror.Newf("unsupported emoji filetype: %s", info.Extension) } |