summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/SevereCloud/vksdk/v2/object
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/SevereCloud/vksdk/v2/object')
-rw-r--r--vendor/github.com/SevereCloud/vksdk/v2/object/photos.go4
-rw-r--r--vendor/github.com/SevereCloud/vksdk/v2/object/users.go24
-rw-r--r--vendor/github.com/SevereCloud/vksdk/v2/object/video.go2
3 files changed, 27 insertions, 3 deletions
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/photos.go b/vendor/github.com/SevereCloud/vksdk/v2/object/photos.go
index 5adfcae8..ecbe0dcb 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/photos.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/photos.go
@@ -134,7 +134,7 @@ type PhotosOwnerUploadResponse struct {
type PhotosPhotoAlbum struct {
Created int `json:"created"` // Date when the album has been created in Unixtime
Description string `json:"description"` // Photo album description
- ID string `json:"id"` // BUG(VK): Photo album ID
+ ID int `json:"id"` // Photo album ID
OwnerID int `json:"owner_id"` // Album owner's ID
Size int `json:"size"` // Photos number
Thumb PhotosPhoto `json:"thumb"`
@@ -144,7 +144,7 @@ type PhotosPhotoAlbum struct {
// ToAttachment return attachment format.
func (album PhotosPhotoAlbum) ToAttachment() string {
- return fmt.Sprintf("album%d_%s", album.OwnerID, album.ID)
+ return fmt.Sprintf("album%d_%d", album.OwnerID, album.ID)
}
// PhotosPhotoAlbumFull struct.
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/users.go b/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
index 07e1049f..c578c489 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/users.go
@@ -1,6 +1,8 @@
package object // import "github.com/SevereCloud/vksdk/v2/object"
import (
+ "bytes"
+ "encoding/json"
"fmt"
)
@@ -233,6 +235,28 @@ type UsersPersonal struct {
ReligionID int `json:"religion_id"`
}
+// UnmarshalJSON UsersPersonal.
+//
+// BUG(VK): UsersPersonal return [].
+func (personal *UsersPersonal) UnmarshalJSON(data []byte) error {
+ if bytes.Equal(data, []byte("[]")) {
+ return nil
+ }
+
+ type renamedUsersPersonal UsersPersonal
+
+ var r renamedUsersPersonal
+
+ err := json.Unmarshal(data, &r)
+ if err != nil {
+ return err
+ }
+
+ *personal = UsersPersonal(r)
+
+ return nil
+}
+
// UsersRelative struct.
type UsersRelative struct {
BirthDate string `json:"birth_date"` // Date of child birthday (format dd.mm.yyyy)
diff --git a/vendor/github.com/SevereCloud/vksdk/v2/object/video.go b/vendor/github.com/SevereCloud/vksdk/v2/object/video.go
index 62110243..993b0c90 100644
--- a/vendor/github.com/SevereCloud/vksdk/v2/object/video.go
+++ b/vendor/github.com/SevereCloud/vksdk/v2/object/video.go
@@ -35,7 +35,7 @@ type VideoVideo struct {
IsPrivate BaseBoolInt `json:"is_private"`
Added BaseBoolInt `json:"added"`
Repeat BaseBoolInt `json:"repeat"` // Information whether the video is repeated
- ContentRestricted BaseBoolInt `json:"content_restricted"`
+ ContentRestricted int `json:"content_restricted"`
Live BaseBoolInt `json:"live"` // Returns if the video is a live stream
Upcoming BaseBoolInt `json:"upcoming"`
Comments int `json:"comments"` // Number of comments