mirror of
				https://github.com/superseriousbusiness/gotosocial
				synced 2025-06-05 21:59:39 +02:00 
			
		
		
		
	[feature] Add emoji DELETE handler at /api/v1/admin/custom_emojis (#913)
				
					
				
			* add emoji DELETE handler * no need to process error (thanks kim) * don't double check if user is admin * add missing security annotation
This commit is contained in:
		@@ -43,6 +43,7 @@ type Processor interface {
 | 
			
		||||
	EmojiCreate(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, form *apimodel.EmojiCreateRequest) (*apimodel.Emoji, gtserror.WithCode)
 | 
			
		||||
	EmojisGet(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, domain string, includeDisabled bool, includeEnabled bool, shortcode string, maxShortcodeDomain string, minShortcodeDomain string, limit int) (*apimodel.PageableResponse, gtserror.WithCode)
 | 
			
		||||
	EmojiGet(ctx context.Context, account *gtsmodel.Account, user *gtsmodel.User, id string) (*apimodel.AdminEmoji, gtserror.WithCode)
 | 
			
		||||
	EmojiDelete(ctx context.Context, id string) (*apimodel.AdminEmoji, gtserror.WithCode)
 | 
			
		||||
	MediaPrune(ctx context.Context, mediaRemoteCacheDays int) gtserror.WithCode
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										59
									
								
								internal/processing/admin/deleteemoji.go
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								internal/processing/admin/deleteemoji.go
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,59 @@
 | 
			
		||||
/*
 | 
			
		||||
   GoToSocial
 | 
			
		||||
   Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org
 | 
			
		||||
 | 
			
		||||
   This program is free software: you can redistribute it and/or modify
 | 
			
		||||
   it under the terms of the GNU Affero General Public License as published by
 | 
			
		||||
   the Free Software Foundation, either version 3 of the License, or
 | 
			
		||||
   (at your option) any later version.
 | 
			
		||||
 | 
			
		||||
   This program is distributed in the hope that it will be useful,
 | 
			
		||||
   but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
   GNU Affero General Public License for more details.
 | 
			
		||||
 | 
			
		||||
   You should have received a copy of the GNU Affero General Public License
 | 
			
		||||
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
package admin
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"errors"
 | 
			
		||||
	"fmt"
 | 
			
		||||
 | 
			
		||||
	apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
 | 
			
		||||
	"github.com/superseriousbusiness/gotosocial/internal/db"
 | 
			
		||||
	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func (p *processor) EmojiDelete(ctx context.Context, id string) (*apimodel.AdminEmoji, gtserror.WithCode) {
 | 
			
		||||
	emoji, err := p.db.GetEmojiByID(ctx, id)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		if errors.Is(err, db.ErrNoEntries) {
 | 
			
		||||
			err = fmt.Errorf("EmojiDelete: no emoji with id %s found in the db", id)
 | 
			
		||||
			return nil, gtserror.NewErrorNotFound(err)
 | 
			
		||||
		}
 | 
			
		||||
		err := fmt.Errorf("EmojiDelete: db error: %s", err)
 | 
			
		||||
		return nil, gtserror.NewErrorInternalError(err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if emoji.Domain != "" {
 | 
			
		||||
		err = fmt.Errorf("EmojiDelete: emoji with id %s was not a local emoji, will not delete", id)
 | 
			
		||||
		return nil, gtserror.NewErrorBadRequest(err, err.Error())
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		err = fmt.Errorf("EmojiDelete: error converting emoji to admin api emoji: %s", err)
 | 
			
		||||
		return nil, gtserror.NewErrorInternalError(err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if err := p.db.DeleteEmojiByID(ctx, id); err != nil {
 | 
			
		||||
		err := fmt.Errorf("EmojiDelete: db error: %s", err)
 | 
			
		||||
		return nil, gtserror.NewErrorInternalError(err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	return adminEmoji, nil
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user