From 4091b6f6b4fe01876f8720332675f9c69be39541 Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 30 May 2021 00:25:30 +0200 Subject: Update vendor (#1498) --- .../github.com/SevereCloud/vksdk/v2/.golangci.yml | 16 ++++++++++++--- vendor/github.com/SevereCloud/vksdk/v2/doc.go | 2 +- .../SevereCloud/vksdk/v2/longpoll-bot/longpoll.go | 3 +-- .../SevereCloud/vksdk/v2/object/photos.go | 4 ++-- .../SevereCloud/vksdk/v2/object/users.go | 24 ++++++++++++++++++++++ .../SevereCloud/vksdk/v2/object/video.go | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) (limited to 'vendor/github.com/SevereCloud') diff --git a/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml b/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml index 3887ceb7..95108696 100644 --- a/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml +++ b/vendor/github.com/SevereCloud/vksdk/v2/.golangci.yml @@ -10,14 +10,11 @@ linters: - gocritic - gofmt - goimports - - golint - goprintffuncname - gosec - gosimple - govet - ineffassign - - interfacer - - maligned - misspell - nakedret - prealloc @@ -46,10 +43,16 @@ linters: - ifshort - revive - durationcheck + - gomoddirectives + - importas + - nilerr + - revive + - wastedassign # - wrapcheck # TODO: v3 Fix # - testpackage # TODO: Fix testpackage # - nestif # TODO: Fix nestif +# - noctx # TODO: Fix noctx # don't enable: # - depguard @@ -70,6 +73,13 @@ linters: # - gci # - exhaustivestruct # - cyclop +# - promlinter +# - tagliatelle + +# depricated +# - maligned +# - interfacer +# - golint issues: exclude-rules: diff --git a/vendor/github.com/SevereCloud/vksdk/v2/doc.go b/vendor/github.com/SevereCloud/vksdk/v2/doc.go index 778f2ecf..dd947709 100644 --- a/vendor/github.com/SevereCloud/vksdk/v2/doc.go +++ b/vendor/github.com/SevereCloud/vksdk/v2/doc.go @@ -7,6 +7,6 @@ package vksdk // Module constants. const ( - Version = "2.9.1" + Version = "2.9.2" API = "5.126" ) diff --git a/vendor/github.com/SevereCloud/vksdk/v2/longpoll-bot/longpoll.go b/vendor/github.com/SevereCloud/vksdk/v2/longpoll-bot/longpoll.go index b230c4c1..c4a3efec 100644 --- a/vendor/github.com/SevereCloud/vksdk/v2/longpoll-bot/longpoll.go +++ b/vendor/github.com/SevereCloud/vksdk/v2/longpoll-bot/longpoll.go @@ -173,8 +173,7 @@ func (lp *LongPoll) RunWithContext(ctx context.Context) error { func (lp *LongPoll) run(ctx context.Context) error { ctx, lp.cancel = context.WithCancel(ctx) - err := lp.autoSetting(ctx) - if err != nil { + if err := lp.autoSetting(ctx); err != nil { return err } 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 -- cgit v1.2.3