diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-06-22 20:46:36 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-06-22 20:46:36 +0100 |
| commit | 9a22102fa8b1ce47571d5bba71e8f36895d21bf0 (patch) | |
| tree | 3c2af6db0a3905d31243cd840d1dd50bea59dbb0 /internal/processing/admin/emoji.go | |
| parent | [docs] Clarify email requirement for OIDC (#1918) (diff) | |
| download | gotosocial-9a22102fa8b1ce47571d5bba71e8f36895d21bf0.tar.xz | |
[bugfix/chore] oauth entropy fix + media cleanup tasks rewrite (#1853)
Diffstat (limited to 'internal/processing/admin/emoji.go')
| -rw-r--r-- | internal/processing/admin/emoji.go | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go index 3a7868eb1..96b0bef07 100644 --- a/internal/processing/admin/emoji.go +++ b/internal/processing/admin/emoji.go @@ -109,7 +109,7 @@ func (p *Processor) EmojisGet( return nil, gtserror.NewErrorUnauthorized(fmt.Errorf("user %s not an admin", user.ID), "user is not an admin") } - emojis, err := p.state.DB.GetEmojis(ctx, domain, includeDisabled, includeEnabled, shortcode, maxShortcodeDomain, minShortcodeDomain, limit) + emojis, err := p.state.DB.GetEmojisBy(ctx, domain, includeDisabled, includeEnabled, shortcode, maxShortcodeDomain, minShortcodeDomain, limit) if err != nil && !errors.Is(err, db.ErrNoEntries) { err := fmt.Errorf("EmojisGet: db error: %s", err) return nil, gtserror.NewErrorInternalError(err) @@ -385,13 +385,13 @@ func (p *Processor) emojiUpdateDisable(ctx context.Context, emoji *gtsmodel.Emoj emojiDisabled := true emoji.Disabled = &emojiDisabled - updatedEmoji, err := p.state.DB.UpdateEmoji(ctx, emoji, "disabled") + err := p.state.DB.UpdateEmoji(ctx, emoji, "disabled") if err != nil { err = fmt.Errorf("emojiUpdateDisable: error updating emoji %s: %s", emoji.ID, err) return nil, gtserror.NewErrorInternalError(err) } - adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, updatedEmoji) + adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji) if err != nil { err = fmt.Errorf("emojiUpdateDisable: error converting updated emoji %s to admin emoji: %s", emoji.ID, err) return nil, gtserror.NewErrorInternalError(err) @@ -407,8 +407,6 @@ func (p *Processor) emojiUpdateModify(ctx context.Context, emoji *gtsmodel.Emoji return nil, gtserror.NewErrorBadRequest(err, err.Error()) } - var updatedEmoji *gtsmodel.Emoji - // keep existing categoryID unless a new one is defined var ( updatedCategoryID = emoji.CategoryID @@ -442,7 +440,7 @@ func (p *Processor) emojiUpdateModify(ctx context.Context, emoji *gtsmodel.Emoji } var err error - updatedEmoji, err = p.state.DB.UpdateEmoji(ctx, emoji, columns...) + err = p.state.DB.UpdateEmoji(ctx, emoji, columns...) if err != nil { err = fmt.Errorf("emojiUpdateModify: error updating emoji %s: %s", emoji.ID, err) return nil, gtserror.NewErrorInternalError(err) @@ -467,14 +465,14 @@ func (p *Processor) emojiUpdateModify(ctx context.Context, emoji *gtsmodel.Emoji return nil, gtserror.NewErrorInternalError(err) } - updatedEmoji, err = processingEmoji.LoadEmoji(ctx) + emoji, err = processingEmoji.LoadEmoji(ctx) if err != nil { err = fmt.Errorf("emojiUpdateModify: error loading processed emoji %s: %s", emoji.ID, err) return nil, gtserror.NewErrorInternalError(err) } } - adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, updatedEmoji) + adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji) if err != nil { err = fmt.Errorf("emojiUpdateModify: error converting updated emoji %s to admin emoji: %s", emoji.ID, err) return nil, gtserror.NewErrorInternalError(err) |