twhelp
/
dcbot-old
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bump github.com/tribalwarshelp/shared and github.com/tribalwarshelp/golang-sdk

This commit is contained in:
Dawid Wysokiński 2020-11-06 20:37:49 +01:00
parent cf063441f3
commit c26040e802
8 changed files with 62 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cron/handler.go
View File

@ -88,29 +88,29 @@ func (h *handler) loadEnnoblements(servers []string) (map[string]ennoblements, e
return m, nil return m, nil
} }
func (h *handler) loadLangVersions(servers []string) ([]*shared_models.LangVersion, error) { func (h *handler) loadVersions(servers []string) ([]*shared_models.Version, error) {
languageTags := []shared_models.LanguageTag{} versionCodes := []shared_models.VersionCode{}
cache := make(map[shared_models.LanguageTag]bool) cache := make(map[shared_models.VersionCode]bool)
for _, server := range servers { for _, server := range servers {
languageTag := tw.LanguageTagFromServerKey(server) languageTag := tw.VersionCodeFromServerKey(server)
if languageTag.IsValid() && !cache[languageTag] { if languageTag.IsValid() && !cache[languageTag] {
cache[languageTag] = true cache[languageTag] = true
languageTags = append(languageTags, languageTag) versionCodes = append(versionCodes, languageTag)
} }
} }
if len(languageTags) == 0 { if len(versionCodes) == 0 {
return []*shared_models.LangVersion{}, nil return []*shared_models.Version{}, nil
} }
langVersionList, err := h.api.LangVersions.Browse(&shared_models.LangVersionFilter{ versionList, err := h.api.Version.Browse(&shared_models.VersionFilter{
Tag: languageTags, Code: versionCodes,
}) })
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Cannot load lang versions") return nil, errors.Wrap(err, "Cannot load lang versions")
} }
return langVersionList.Items, nil return versionList.Items, nil
} }
func (h *handler) checkEnnoblements() { func (h *handler) checkEnnoblements() {
@ -132,13 +132,13 @@ func (h *handler) checkEnnoblements() {
WithField("numberOfGroups", total). WithField("numberOfGroups", total).
Info("checkEnnoblements: Loaded groups") Info("checkEnnoblements: Loaded groups")
langVersions, err := h.loadLangVersions(servers) versions, err := h.loadVersions(servers)
if err != nil { if err != nil {
log.Errorln("checkEnnoblements:", err) log.Errorln("checkEnnoblements:", err)
return return
} }
log. log.
WithField("numberOfLangVersions", len(langVersions)). WithField("numberOfVersions", len(versions)).
Info("checkEnnoblements: Loaded lang versions") Info("checkEnnoblements: Loaded lang versions")
ennoblementsByServerKey, err := h.loadEnnoblements(servers) ennoblementsByServerKey, err := h.loadEnnoblements(servers)
@ -156,8 +156,8 @@ func (h *handler) checkEnnoblements() {
conqueredVillagesMsg := &discord.MessageEmbed{} conqueredVillagesMsg := &discord.MessageEmbed{}
for _, observation := range group.Observations { for _, observation := range group.Observations {
ennoblements, ok := ennoblementsByServerKey[observation.Server] ennoblements, ok := ennoblementsByServerKey[observation.Server]
langVersion := utils.FindLangVersionByTag(langVersions, tw.LanguageTagFromServerKey(observation.Server)) version := utils.FindVersionByCode(versions, tw.VersionCodeFromServerKey(observation.Server))
if ok && langVersion != nil && langVersion.Host != "" { if ok && version != nil && version.Host != "" {
if group.LostVillagesChannelID != "" { if group.LostVillagesChannelID != "" {
for _, ennoblement := range ennoblements.getLostVillagesByTribe(observation.TribeID) { for _, ennoblement := range ennoblements.getLostVillagesByTribe(observation.TribeID) {
if !utils.IsPlayerTribeNil(ennoblement.NewOwner) && if !utils.IsPlayerTribeNil(ennoblement.NewOwner) &&
@ -165,7 +165,7 @@ func (h *handler) checkEnnoblements() {
continue continue
} }
newMsgDataConfig := newMessageConfig{ newMsgDataConfig := newMessageConfig{
host: langVersion.Host, host: version.Host,
server: observation.Server, server: observation.Server,
ennoblement: ennoblement, ennoblement: ennoblement,
t: messageTypeLost, t: messageTypeLost,
@ -185,7 +185,7 @@ func (h *handler) checkEnnoblements() {
} }
newMsgDataConfig := newMessageConfig{ newMsgDataConfig := newMessageConfig{
host: langVersion.Host, host: version.Host,
server: observation.Server, server: observation.Server,
ennoblement: ennoblement, ennoblement: ennoblement,
t: messageTypeConquer, t: messageTypeConquer,
@ -272,7 +272,7 @@ func (h *handler) deleteClosedTribalWarsServers() {
WithField("servers", servers). WithField("servers", servers).
Info("deleteClosedTribalWarsServers: loaded servers") Info("deleteClosedTribalWarsServers: loaded servers")
list, err := h.api.Servers.Browse(&shared_models.ServerFilter{ list, err := h.api.Server.Browse(&shared_models.ServerFilter{
Key: servers, Key: servers,
Status: []shared_models.ServerStatus{shared_models.ServerStatusClosed}, Status: []shared_models.ServerStatus{shared_models.ServerStatusClosed},
}, nil) }, nil)

14
discord/coords_translation.go
View File

@ -37,7 +37,7 @@ func (s *Session) handleCoordsTranslationCommand(ctx *commandCtx, m *discordgo.M
} }
serverKey := args[0] serverKey := args[0]
server, err := s.cfg.API.Servers.Read(serverKey, nil) server, err := s.cfg.API.Server.Read(serverKey, nil)
if err != nil || server == nil { if err != nil || server == nil {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
@ -86,14 +86,14 @@ func (s *Session) translateCoords(ctx *commandCtx, m *discordgo.MessageCreate) {
coords := extractAllCoordsFromMessage(m.Content) coords := extractAllCoordsFromMessage(m.Content)
coordsLen := len(coords) coordsLen := len(coords)
if coordsLen > 0 { if coordsLen > 0 {
langVersion, err := s.cfg.API.LangVersions.Read(tw.LanguageTagFromServerKey(ctx.server.CoordsTranslation)) version, err := s.cfg.API.Version.Read(tw.VersionCodeFromServerKey(ctx.server.CoordsTranslation))
if err != nil || langVersion == nil { if err != nil || version == nil {
return return
} }
if coordsLen > coordsLimit { if coordsLen > coordsLimit {
coords = coords[0:coordsLimit] coords = coords[0:coordsLimit]
} }
list, err := s.cfg.API.Villages.Browse(ctx.server.CoordsTranslation, list, err := s.cfg.API.Village.Browse(ctx.server.CoordsTranslation,
&models.VillageFilter{ &models.VillageFilter{
XY: coords, XY: coords,
}, },
@ -109,18 +109,18 @@ func (s *Session) translateCoords(ctx *commandCtx, m *discordgo.MessageCreate) {
msg := &MessageEmbed{} msg := &MessageEmbed{}
for _, village := range list.Items { for _, village := range list.Items {
villageURL := tw.BuildVillageURL(ctx.server.CoordsTranslation, langVersion.Host, village.ID) villageURL := tw.BuildVillageURL(ctx.server.CoordsTranslation, version.Host, village.ID)
playerName := "-" playerName := "-"
playerURL := "" playerURL := ""
if !utils.IsPlayerNil(village.Player) { if !utils.IsPlayerNil(village.Player) {
playerName = village.Player.Name playerName = village.Player.Name
playerURL = tw.BuildPlayerURL(ctx.server.CoordsTranslation, langVersion.Host, village.Player.ID) playerURL = tw.BuildPlayerURL(ctx.server.CoordsTranslation, version.Host, village.Player.ID)
} }
tribeName := "-" tribeName := "-"
tribeURL := "" tribeURL := ""
if !utils.IsPlayerTribeNil(village.Player) { if !utils.IsPlayerTribeNil(village.Player) {
tribeName = village.Player.Tribe.Name tribeName = village.Player.Tribe.Name
tribeURL = tw.BuildTribeURL(ctx.server.CoordsTranslation, langVersion.Host, village.Player.Tribe.ID) tribeURL = tw.BuildTribeURL(ctx.server.CoordsTranslation, version.Host, village.Player.Tribe.ID)
} }
msg.Append(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ msg.Append(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{

22
discord/observations.go
View File

@ -461,7 +461,7 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea
return return
} }
server, err := s.cfg.API.Servers.Read(serverKey, nil) server, err := s.cfg.API.Server.Read(serverKey, nil)
if err != nil || server == nil { if err != nil || server == nil {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
@ -485,7 +485,7 @@ func (s *Session) handleObserveCommand(ctx *commandCtx, m *discordgo.MessageCrea
return return
} }
tribe, err := s.cfg.API.Tribes.Read(server.Key, tribeID) tribe, err := s.cfg.API.Tribe.Read(server.Key, tribeID)
if err != nil || tribe == nil { if err != nil || tribe == nil {
s.SendMessage(m.ChannelID, s.SendMessage(m.ChannelID,
ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
@ -685,23 +685,23 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag
} }
tribeIDsByServer := make(map[string][]int) tribeIDsByServer := make(map[string][]int)
langTags := []shared_models.LanguageTag{} versionCodes := []shared_models.VersionCode{}
for _, observation := range observations { for _, observation := range observations {
tribeIDsByServer[observation.Server] = append(tribeIDsByServer[observation.Server], observation.TribeID) tribeIDsByServer[observation.Server] = append(tribeIDsByServer[observation.Server], observation.TribeID)
currentLangTag := tw.LanguageTagFromServerKey(observation.Server) currentLangTag := tw.VersionCodeFromServerKey(observation.Server)
unique := true unique := true
for _, langTag := range langTags { for _, langTag := range versionCodes {
if langTag == currentLangTag { if langTag == currentLangTag {
unique = false unique = false
break break
} }
} }
if unique { if unique {
langTags = append(langTags, currentLangTag) versionCodes = append(versionCodes, currentLangTag)
} }
} }
for server, tribeIDs := range tribeIDsByServer { for server, tribeIDs := range tribeIDsByServer {
list, err := s.cfg.API.Tribes.Browse(server, &shared_models.TribeFilter{ list, err := s.cfg.API.Tribe.Browse(server, &shared_models.TribeFilter{
ID: tribeIDs, ID: tribeIDs,
}) })
if err != nil { if err != nil {
@ -725,12 +725,12 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag
} }
} }
} }
langVersionList, err := s.cfg.API.LangVersions.Browse(&shared_models.LangVersionFilter{ versionList, err := s.cfg.API.Version.Browse(&shared_models.VersionFilter{
Tag: langTags, Code: versionCodes,
}) })
msg := &MessageEmbed{} msg := &MessageEmbed{}
if len(observations) <= 0 || err != nil || langVersionList == nil || langVersionList.Items == nil { if len(observations) <= 0 || err != nil || versionList == nil || versionList.Items == nil {
msg.Append("-") msg.Append("-")
} else { } else {
for i, observation := range observations { for i, observation := range observations {
@ -738,7 +738,7 @@ func (s *Session) handleObservationsCommand(ctx *commandCtx, m *discordgo.Messag
if observation.Tribe != nil { if observation.Tribe != nil {
tag = observation.Tribe.Tag tag = observation.Tribe.Tag
} }
lv := utils.FindLangVersionByTag(langVersionList.Items, tw.LanguageTagFromServerKey(observation.Server)) lv := utils.FindVersionByCode(versionList.Items, tw.VersionCodeFromServerKey(observation.Server))
tribeURL := "" tribeURL := ""
if lv != nil { if lv != nil {
tribeURL = tw.BuildTribeURL(observation.Server, lv.Host, observation.TribeID) tribeURL = tw.BuildTribeURL(observation.Server, lv.Host, observation.TribeID)

14
discord/public_commands.go
View File

@ -277,7 +277,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate
} }
command := Command(args[0]) command := Command(args[0])
world := args[1] server := args[1]
page, err := strconv.Atoi(args[2]) page, err := strconv.Atoi(args[2])
if err != nil || page <= 0 { if err != nil || page <= 0 {
s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
@ -357,7 +357,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate
return return
} }
playerList, err := s.cfg.API.Players.Browse(world, filter, &sdk.PlayerInclude{ playerList, err := s.cfg.API.Player.Browse(server, filter, &sdk.PlayerInclude{
Tribe: true, Tribe: true,
}) })
if err != nil { if err != nil {
@ -397,9 +397,9 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate
return return
} }
langTag := tw.LanguageTagFromServerKey(world) code := tw.VersionCodeFromServerKey(server)
langVersion, err := s.cfg.API.LangVersions.Read(langTag) version, err := s.cfg.API.Version.Read(code)
if err != nil || langVersion == nil { if err != nil || version == nil {
s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.InternalServerError, MessageID: message.InternalServerError,
DefaultMessage: message.FallbackMsg(message.InternalServerError, DefaultMessage: message.FallbackMsg(message.InternalServerError,
@ -441,7 +441,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate
tribeURL := "-" tribeURL := "-"
if player.Tribe != nil { if player.Tribe != nil {
tribeTag = player.Tribe.Tag tribeTag = player.Tribe.Tag
tribeURL = tw.BuildTribeURL(world, langVersion.Host, player.Tribe.ID) tribeURL = tw.BuildTribeURL(server, version.Host, player.Tribe.ID)
} }
msg.Append(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ msg.Append(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
@ -451,7 +451,7 @@ func (s *Session) handleTribeCommand(ctx *commandCtx, m *discordgo.MessageCreate
TemplateData: map[string]interface{}{ TemplateData: map[string]interface{}{
"Index": offset + i + 1, "Index": offset + i + 1,
"PlayerName": player.Name, "PlayerName": player.Name,
"PlayerURL": tw.BuildPlayerURL(world, langVersion.Host, player.ID), "PlayerURL": tw.BuildPlayerURL(server, version.Host, player.ID),
"TribeTag": tribeTag, "TribeTag": tribeTag,
"TribeURL": tribeURL, "TribeURL": tribeURL,
"Rank": rank, "Rank": rank,

4
go.mod
View File

@ -11,8 +11,8 @@ require (
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/robfig/cron/v3 v3.0.1 github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.7.0 github.com/sirupsen/logrus v1.7.0
github.com/tribalwarshelp/golang-sdk v0.0.0-20200903125555-7b6975e64f6f github.com/tribalwarshelp/golang-sdk v0.0.0-20201106192253-84730508fce5
github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747 github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 // indirect
golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 // indirect golang.org/x/net v0.0.0-20201016165138-7b1cca2348c0 // indirect
golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd // indirect golang.org/x/sys v0.0.0-20201022201747-fb209a7c41cd // indirect

4
go.sum
View File

@ -128,12 +128,16 @@ github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYm
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs= github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200903125555-7b6975e64f6f h1:TZfJ3u56dXWyHsYk4lcp22s6nL8XnF4+0VhGQiw2Au0= github.com/tribalwarshelp/golang-sdk v0.0.0-20200903125555-7b6975e64f6f h1:TZfJ3u56dXWyHsYk4lcp22s6nL8XnF4+0VhGQiw2Au0=
github.com/tribalwarshelp/golang-sdk v0.0.0-20200903125555-7b6975e64f6f/go.mod h1:o1ViLff0Fwg4LH86VDaBtUQqIIMIqp+leUBx+fZLz/U= github.com/tribalwarshelp/golang-sdk v0.0.0-20200903125555-7b6975e64f6f/go.mod h1:o1ViLff0Fwg4LH86VDaBtUQqIIMIqp+leUBx+fZLz/U=
github.com/tribalwarshelp/golang-sdk v0.0.0-20201106192253-84730508fce5 h1:gn170nq4KQDNNTCfIT8M+8VT97b63t/d4aiTBoIPJ1k=
github.com/tribalwarshelp/golang-sdk v0.0.0-20201106192253-84730508fce5/go.mod h1:YkbbJjPfrrO+BgUS4hb8aXgVYfh46Nc+DqCnZi3LhJo=
github.com/tribalwarshelp/shared v0.0.0-20200809125423-2bc2e8dfde95 h1:mO3ZR+o5UlYN8uGX4L32H5HNpB0uHpLdZ3YiDA6ciW4= github.com/tribalwarshelp/shared v0.0.0-20200809125423-2bc2e8dfde95 h1:mO3ZR+o5UlYN8uGX4L32H5HNpB0uHpLdZ3YiDA6ciW4=
github.com/tribalwarshelp/shared v0.0.0-20200809125423-2bc2e8dfde95/go.mod h1:SSWchTkQdgeIDr0C68C7zopEIcBLCUa8Ic2CHenUaac= github.com/tribalwarshelp/shared v0.0.0-20200809125423-2bc2e8dfde95/go.mod h1:SSWchTkQdgeIDr0C68C7zopEIcBLCUa8Ic2CHenUaac=
github.com/tribalwarshelp/shared v0.0.0-20201024182030-eeb4645da4ca h1:YUm2O7+N75k3Oyu7GKqyxW6G1TmThh2N0LdbkZN67ZU= github.com/tribalwarshelp/shared v0.0.0-20201024182030-eeb4645da4ca h1:YUm2O7+N75k3Oyu7GKqyxW6G1TmThh2N0LdbkZN67ZU=
github.com/tribalwarshelp/shared v0.0.0-20201024182030-eeb4645da4ca/go.mod h1:EsUl4FRcNDPvJg7ig3t0pEHOPxZnw5SXKYbxaI0IQJU= github.com/tribalwarshelp/shared v0.0.0-20201024182030-eeb4645da4ca/go.mod h1:EsUl4FRcNDPvJg7ig3t0pEHOPxZnw5SXKYbxaI0IQJU=
github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747 h1:ef1VuyVNNxa6ALTPS5X8dPEsAI7KuA3/umNNkrI4fIk= github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747 h1:ef1VuyVNNxa6ALTPS5X8dPEsAI7KuA3/umNNkrI4fIk=
github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk= github.com/tribalwarshelp/shared v0.0.0-20201031105753-5d4d8b307747/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk=
github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013 h1:6KWK3MWsTfIIWeRfC6+Ba+GvlwbV9Mq+HefbE+QcU2s=
github.com/tribalwarshelp/shared v0.0.0-20201106181031-7c5891c02013/go.mod h1:Lxk6zaQhPTPrgz9ksMgg51m8XgflrCo/kRBx2cM3yfk=
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94= github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ= github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
github.com/vmihailenco/msgpack/v4 v4.3.11 h1:Q47CePddpNGNhk4GCnAx9DDtASi2rasatE0cd26cZoE= github.com/vmihailenco/msgpack/v4 v4.3.11 h1:Q47CePddpNGNhk4GCnAx9DDtASi2rasatE0cd26cZoE=

14
utils/find_lang_version_by_tag.go
View File

@ -1,14 +0,0 @@
package utils
import "github.com/tribalwarshelp/shared/models"
func FindLangVersionByTag(langVersions []*models.LangVersion, tag models.LanguageTag) *models.LangVersion {
lv := &models.LangVersion{}
for _, langVersion := range langVersions {
if langVersion.Tag == tag {
lv = langVersion
break
}
}
return lv
}

14
utils/find_version_by_code.go Normal file
View File

@ -0,0 +1,14 @@
package utils
import "github.com/tribalwarshelp/shared/models"
func FindVersionByCode(versions []*models.Version, code models.VersionCode) *models.Version {
v := &models.Version{}
for _, version := range versions {
if version.Code == code {
v = version
break
}
}
return v
}