👔 Sticker creation & edit will no longer check metadta

pkg/internal/server/api/sticker_packs_api.go

@@ -17,12 +17,24 @@ func listStickerManifest(c *fiber.Ctx) error {
 		take = 100
 	}
 
+	tx := database.C
+
+	if len(c.Query("author")) > 0 {
+		var author models.Account
+		if err := database.C.Where("name = ?", c.Query("author")).First(&author).Error; err != nil {
+			return fiber.NewError(fiber.StatusBadRequest, err.Error())
+		} else {
+			tx = tx.Where("account_id = ?", author.ID)
+		}
+	}
+
 	var count int64
-	if err := database.C.Model(&models.StickerPack{}).Count(&count).Error; err != nil {
+	countTx := tx
+	if err := countTx.Model(&models.StickerPack{}).Count(&count).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}
 
-	stickers, err := services.ListStickerPackWithStickers(take, offset)
+	stickers, err := services.ListStickerPackWithStickers(tx, take, offset)
 	if err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}

pkg/internal/server/api/stickers_api.go

@@ -86,12 +86,6 @@ func createSticker(c *fiber.Ctx) error {
 
 	if strings.SplitN(attachment.MimeType, "/", 2)[0] != "image" {
 		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must be an image")
-	} else if width, ok := attachment.Metadata["width"]; !ok {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must has width metadata")
-	} else if height, ok := attachment.Metadata["height"]; !ok {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must has height metadata")
-	} else if fmt.Sprint(width) != fmt.Sprint(28) || fmt.Sprint(height) != fmt.Sprint(28) {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must be a 28x28 image")
 	}
 
 	var pack models.StickerPack
@@ -146,12 +140,6 @@ func updateSticker(c *fiber.Ctx) error {
 
 	if strings.SplitN(attachment.MimeType, "/", 2)[0] != "image" {
 		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must be an image")
-	} else if width, ok := attachment.Metadata["width"]; !ok {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must has width metadata")
-	} else if height, ok := attachment.Metadata["height"]; !ok {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must has height metadata")
-	} else if fmt.Sprint(width) != fmt.Sprint(28) || fmt.Sprint(height) != fmt.Sprint(28) {
-		return fiber.NewError(fiber.StatusBadRequest, "sticker attachment must be a 28x28 image")
 	}
 
 	var pack models.StickerPack

pkg/internal/services/sticker_packs.go

@@ -3,6 +3,7 @@ package services
 import (
 	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/database"
 	"git.solsynth.dev/hydrogen/paperclip/pkg/internal/models"
+	"gorm.io/gorm"
 )
 
 func GetStickerPackWithUser(id, userId uint) (models.StickerPack, error) {
@@ -13,9 +14,9 @@ func GetStickerPackWithUser(id, userId uint) (models.StickerPack, error) {
 	return pack, nil
 }
 
-func ListStickerPackWithStickers(take, offset int) ([]models.StickerPack, error) {
+func ListStickerPackWithStickers(tx *gorm.DB, take, offset int) ([]models.StickerPack, error) {
 	var packs []models.StickerPack
-	if err := database.C.Limit(take).Offset(offset).Preload("Stickers").Preload("Stickers.Attachment").Find(&packs).Error; err != nil {
+	if err := tx.Limit(take).Offset(offset).Preload("Stickers").Preload("Stickers.Attachment").Find(&packs).Error; err != nil {
 		return packs, err
 	}
 	return packs, nil