twhelp
/
dcbot-old
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 14:12:22 +02:00 committed by Kichiyaki
parent 873ecefb28
commit a507fe35bc
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cron/ennoblements.go
View File

@ -4,9 +4,9 @@ import (
shared_models "github.com/tribalwarshelp/shared/models"
)
type ennoblements []*shared_models.Ennoblement
type ennoblements []*shared_models.LiveEnnoblement
func (e ennoblements) getLastEnnoblement() *shared_models.Ennoblement {
func (e ennoblements) getLastEnnoblement() *shared_models.LiveEnnoblement {
length := len(e)
if length <= 0 {
return nil

2
cron/handler.go
View File

@ -27,7 +27,7 @@ func (h *handler) loadEnnoblements(worlds []string) map[string]ennoblements {
m := make(map[string]ennoblements)
for _, w := range worlds {
es, err := h.api.Ennoblements.Browse(w, &sdk.EnnoblementInclude{
es, err := h.api.LiveEnnoblements.Browse(w, &sdk.LiveEnnoblementInclude{
NewOwner: true,
Village: true,
NewOwnerInclude: sdk.PlayerInclude{

4
cron/helpers.go
View File

@ -6,8 +6,8 @@ import (
shared_models "github.com/tribalwarshelp/shared/models"
)
func filterEnnoblements(ennoblements []*shared_models.Ennoblement, t time.Time) []*shared_models.Ennoblement {
filtered := []*shared_models.Ennoblement{}
func filterEnnoblements(ennoblements []*shared_models.LiveEnnoblement, t time.Time) []*shared_models.LiveEnnoblement {
filtered := []*shared_models.LiveEnnoblement{}
for _, ennoblement := range ennoblements {
utc := ennoblement.EnnobledAt.In(time.UTC)
if utc.Before(t) || utc.Equal(t) {

2
cron/message.go
View File

@ -31,7 +31,7 @@ type messageData struct {
type newMessageDataConfig struct {
host string
world string
ennoblement *shared_models.Ennoblement
ennoblement *shared_models.LiveEnnoblement
}
func newMessageData(cfg newMessageDataConfig) messageData {

4
go.mod
View File

@ -10,8 +10,8 @@ require (
github.com/pkg/errors v0.9.1
github.com/robfig/cron/v3 v3.0.1
github.com/segmentio/encoding v0.1.14 // indirect
github.com/tribalwarshelp/golang-sdk v0.0.0-20200619174053-6c5440833f60
github.com/tribalwarshelp/shared v0.0.0-20200619170430-9ae1e58e717a
github.com/tribalwarshelp/golang-sdk v0.0.0-20200621115916-3e436ae3f7f1
github.com/tribalwarshelp/shared v0.0.0-20200621115742-5ae0d5ec33f2
golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1 // indirect
google.golang.org/protobuf v1.24.0 // indirect
)

4
go.sum
View File

@ -109,10 +109,14 @@ github.com/tribalwarshelp/golang-sdk v0.0.0-20200618154823-9b569d862c4b h1:llEvW
github.com/tribalwarshelp/golang-sdk v0.0.0-20200618154823-9b569d862c4b/go.mod h1:N7Oj+E8No6kf63IAxb5xHMfzXcV6vst8vrZ3ihYHvHc=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200619174053-6c5440833f60 h1:BqFbPYxnWgn8kBMACjMfQ0P8UoP6nC6/gDjqCLPlJ5k=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200619174053-6c5440833f60/go.mod h1:teklXGcpif3jOMvFcmt5VJmyQ+caPSYAQzNkpDTZ17I=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200621115916-3e436ae3f7f1 h1:fcVk0Kyye9Cv6MY32mgrVSyYCSn5F4Jqu5+jUKok14M=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200621115916-3e436ae3f7f1/go.mod h1:mdnzGrMzewwxHs7INgklBcyuO8dkhXAAItZESO5CuAs=
github.com/tribalwarshelp/shared v0.0.0-20200618150949-896cd6c98d06 h1:T87o4fice0XTUdAG/tctFCDiuyUGb10bY1hdWvwlrro=
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-20200621115742-5ae0d5ec33f2 h1:xHR69AkeSO34WkjYlTSzD6v2X37hY68e53o6GEoIyFs=
github.com/tribalwarshelp/shared v0.0.0-20200621115742-5ae0d5ec33f2/go.mod h1:tf+2yTHasV6jAF3V2deZ9slNoCyBzC0fMdTjI7clf6Y=
github.com/vmihailenco/bufpool v0.1.5/go.mod h1:fL9i/PRTuS7AELqAHwSU1Zf1c70xhkhGe/cD5ud9pJk=
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=