twhelp
/
golang-sdk
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump github.com/tribalwarshelp/shared

This commit is contained in:
Dawid Wysokiński 2020-06-21 13:59:16 +02:00
parent 6c5440833f
commit 3e436ae3f7
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -5,5 +5,5 @@ go 1.14
require (
github.com/Kichiyaki/gqlgen-client v0.0.0-20200604145848-274796c104f4
github.com/pkg/errors v0.9.1
github.com/tribalwarshelp/shared v0.0.0-20200619170430-9ae1e58e717a
github.com/tribalwarshelp/shared v0.0.0-20200621115742-5ae0d5ec33f2
)

4
go.sum
View File

@ -21,6 +21,10 @@ github.com/tribalwarshelp/shared v0.0.0-20200618150949-896cd6c98d06 h1:T87o4fice
github.com/tribalwarshelp/shared v0.0.0-20200618150949-896cd6c98d06/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200619170430-9ae1e58e717a h1:DvZaFa0q43ME/j9vBQMgI2v23Re/Dx11pxqpXw5NzC4=
github.com/tribalwarshelp/shared v0.0.0-20200619170430-9ae1e58e717a/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200621113135-f37b4069eaaf h1:FoZBGciPITYC26jh6CzEvRhKdm0c3TaCNs1WUCPS9pM=
github.com/tribalwarshelp/shared v0.0.0-20200621113135-f37b4069eaaf/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/tribalwarshelp/shared v0.0.0-20200621115742-5ae0d5ec33f2 h1:xHR69AkeSO34WkjYlTSzD6v2X37hY68e53o6GEoIyFs=
github.com/tribalwarshelp/shared v0.0.0-20200621115742-5ae0d5ec33f2/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

2
main.go
View File

@ -131,7 +131,7 @@ func main() {
}
}
ennoblements, err := api.Ennoblements.Browse("pl151", &sdk.EnnoblementInclude{
ennoblements, err := api.LiveEnnoblements.Browse("pl151", &sdk.LiveEnnoblementInclude{
NewOwner: true,
NewOwnerInclude: sdk.PlayerInclude{
Tribe: true,

22
sdk/ennoblements.go → sdk/live_ennoblements.go
View File

@ -8,11 +8,11 @@ import (
"github.com/tribalwarshelp/shared/models"
)
type Ennoblements struct {
type LiveEnnoblements struct {
sdk *SDK
}
type EnnoblementInclude struct {
type LiveEnnoblementInclude struct {
NewOwner bool
NewOwnerInclude PlayerInclude
OldOwner bool
@ -20,7 +20,7 @@ type EnnoblementInclude struct {
Village bool
}
func (incl EnnoblementInclude) String() string {
func (incl LiveEnnoblementInclude) String() string {
i := ""
if incl.NewOwner {
i += fmt.Sprintf(`
@ -48,21 +48,21 @@ func (incl EnnoblementInclude) String() string {
return i
}
type ennoblementsResponse struct {
Ennoblements []*models.Ennoblement `json:"ennoblements" gqlgen:"ennoblements"`
type liveEnnoblementsResponse struct {
LiveEnnoblements []*models.LiveEnnoblement `json:"liveEnnoblements" gqlgen:"liveEnnoblements"`
}
func (en *Ennoblements) Browse(server string, include *EnnoblementInclude) ([]*models.Ennoblement, error) {
func (en *LiveEnnoblements) Browse(server string, include *LiveEnnoblementInclude) ([]*models.LiveEnnoblement, error) {
if server == "" {
return nil, ErrServerNameIsEmpty
}
if include == nil {
include = &EnnoblementInclude{}
include = &LiveEnnoblementInclude{}
}
resp := &ennoblementsResponse{}
resp := &liveEnnoblementsResponse{}
query := fmt.Sprintf(`
query ennoblements($server: String!) {
ennoblements(server: $server) {
query liveEnnoblements($server: String!) {
liveEnnoblements(server: $server) {
ennobledAt
%s
}
@ -72,5 +72,5 @@ func (en *Ennoblements) Browse(server string, include *EnnoblementInclude) ([]*m
if err != nil {
return nil, errors.Wrap(err, "twhelp sdk")
}
return resp.Ennoblements, nil
return resp.LiveEnnoblements, nil
}

20
sdk/sdk.go
View File

@ -61,15 +61,15 @@ var (
)
type SDK struct {
url string
client *client.Client
httpClient *http.Client
LangVersions *LangVersions
Servers *Servers
Players *Players
Tribes *Tribes
Villages *Villages
Ennoblements *Ennoblements
url string
client *client.Client
httpClient *http.Client
LangVersions *LangVersions
Servers *Servers
Players *Players
Tribes *Tribes
Villages *Villages
LiveEnnoblements *LiveEnnoblements
}
func New(url string) *SDK {
@ -83,7 +83,7 @@ func New(url string) *SDK {
sdk.Players = &Players{sdk}
sdk.Tribes = &Tribes{sdk}
sdk.Villages = &Villages{sdk}
sdk.Ennoblements = &Ennoblements{sdk}
sdk.LiveEnnoblements = &LiveEnnoblements{sdk}
return sdk
}