mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 17:12:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge fixup

Browse source
This commit is contained in:
tsmethurst 2022-02-08 12:17:53 +01:00
commit 3301148bb7
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
internal/processing/admin/emoji.go
View file

@ -20,6 +20,7 @@ package admin
import (
"context"
"errors"
"fmt"
"io"
@ -55,7 +56,8 @@ func (p *processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
emoji, err := processingEmoji.LoadEmoji(ctx)
if err != nil {
if err == db.ErrAlreadyExists {
var alreadyExistsError *db.ErrAlreadyExists
if errors.As(err, &alreadyExistsError) {
return nil, gtserror.NewErrorConflict(fmt.Errorf("emoji with shortcode %s already exists", form.Shortcode), fmt.Sprintf("emoji with shortcode %s already exists", form.Shortcode))
}
return nil, gtserror.NewErrorInternalError(fmt.Errorf("error loading emoji: %s", err), "error loading emoji")