fix: remove StoreSticker, use BaseSticker

SevereCloud · Jan 11, 2022 · 6c49ab4 · 6c49ab4
1 parent 4cc2e6c
commit 6c49ab4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/api/store.go b/api/store.go
@@ -60,8 +60,8 @@ func (vk *VK) StoreDeactivateProduct(params Params) (response int, err error) {
 
 // StoreGetFavoriteStickersResponse struct.
 type StoreGetFavoriteStickersResponse struct {
-	Count int                   `json:"count"`
-	Items []object.StoreSticker `json:"items"`
+	Count int                  `json:"count"`
+	Items []object.BaseSticker `json:"items"`
 }
 
 // StoreGetFavoriteStickers method.
@@ -109,7 +109,7 @@ func (vk *VK) StoreGetProductsExtended(params Params) (response StoreGetProducts
 }
 
 // StoreGetStickersResponse struct.
-type StoreGetStickersResponse []object.StoreSticker
+type StoreGetStickersResponse []object.BaseSticker
 
 // StoreGetStickers method.
 //

diff --git a/object/object.go b/object/object.go
@@ -260,10 +260,10 @@ type BaseRepostsInfo struct {
 type BaseSticker struct {
 	Images               []BaseImage `json:"images"`
 	ImagesWithBackground []BaseImage `json:"images_with_background"`
-	ProductID            int         `json:"product_id"`
+	ProductID            int         `json:"product_id,omitempty"`
 	StickerID            int         `json:"sticker_id"`
-	IsAllowed            bool        `json:"is_allowed"`
-	AnimationURL         string      `json:"animation_url"`
+	IsAllowed            BaseBoolInt `json:"is_allowed,omitempty"`
+	AnimationURL         string      `json:"animation_url,omitempty"`
 }
 
 // MaxSize return the largest BaseSticker.

diff --git a/object/store.go b/object/store.go
@@ -20,18 +20,9 @@ type StoreProduct struct {
 // StoreProductExtended struct.
 type StoreProductExtended struct {
 	StoreProduct
-	Title        string         `json:"title"`
-	Stickers     []StoreSticker `json:"stickers"`
-	Icon         []BaseImage    `json:"icon"`
-	Previews     []BaseImage    `json:"previews"`
-	HasAnimation BaseBoolInt    `json:"has_animation"`
-}
-
-// StoreSticker struct.
-type StoreSticker struct {
-	StickerID            int         `json:"sticker_id"`
-	IsAllowed            BaseBoolInt `json:"is_allowed"`
-	Images               []BaseImage `json:"images"`
-	ImagesWithBackground []BaseImage `json:"images_with_background"`
-	AnimationURL         string      `json:"animation_url"`
+	Title        string        `json:"title"`
+	Stickers     []BaseSticker `json:"stickers"`
+	Icon         []BaseImage   `json:"icon"`
+	Previews     []BaseImage   `json:"previews"`
+	HasAnimation BaseBoolInt   `json:"has_animation"`
 }