From 4060fb5b60ff050d9291e4275e3a214ac8deb421 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Wed, 14 Oct 2020 06:06:15 +0200 Subject: [PATCH] move message IDs to constants (tribe command) --- discord/observations.go | 28 ++++++++--------- discord/public_commands.go | 61 +++++++++++++++++++------------------- message/ids.go | 17 +++++++++++ 3 files changed, 61 insertions(+), 45 deletions(-) diff --git a/discord/observations.go b/discord/observations.go index b721699..7b688be 100644 --- a/discord/observations.go +++ b/discord/observations.go @@ -63,8 +63,8 @@ func (s *Session) handleAddGroupCommand(ctx commandCtx, m *discordgo.MessageCrea if err := s.cfg.GroupRepository.Store(context.Background(), group); err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -588,8 +588,8 @@ func (s *Session) handleObserveCommand(ctx commandCtx, m *discordgo.MessageCreat if err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -740,8 +740,8 @@ func (s *Session) handleObservationsCommand(ctx commandCtx, m *discordgo.Message if err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -773,8 +773,8 @@ func (s *Session) handleObservationsCommand(ctx commandCtx, m *discordgo.Message if err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -879,8 +879,8 @@ func (s *Session) handleShowEnnobledBarbariansCommand(ctx commandCtx, m *discord if err := s.cfg.GroupRepository.Update(context.Background(), group); err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -960,8 +960,8 @@ func (s *Session) handleChangeLanguageCommand(ctx commandCtx, m *discordgo.Messa if err := s.cfg.ServerRepository.Update(context.Background(), ctx.server); err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -1035,8 +1035,8 @@ func (s *Session) handleShowInternalsCommand(ctx commandCtx, m *discordgo.Messag if err := s.cfg.GroupRepository.Update(context.Background(), group); err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), diff --git a/discord/public_commands.go b/discord/public_commands.go index 6fe5704..4cdae31 100644 --- a/discord/public_commands.go +++ b/discord/public_commands.go @@ -282,8 +282,8 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, page, err := strconv.Atoi(args[2]) if err != nil || page <= 0 { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.invalidPage", - DefaultMessage: message.FallbackMsg("tribe.invalidPage", "{{.Mention}} The page must be a number greater than 0."), + MessageID: message.TribeInvalidPage, + DefaultMessage: message.FallbackMsg(message.TribeInvalidPage, "{{.Mention}} The page must be a number greater than 0."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -300,8 +300,8 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, } if len(ids) == 0 { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.noTribeID", - DefaultMessage: message.FallbackMsg("tribe.noTribeID", "{{.Mention}} You haven't entered the tribe ID."), + MessageID: message.TribeNoTribeID, + DefaultMessage: message.FallbackMsg(message.TribeNoTribeID, "{{.Mention}} You haven't entered the tribe ID."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, @@ -324,48 +324,48 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, filter.RankAttGTE = 1 filter.Sort = "rankAtt ASC" title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.title.orderedByODA", - DefaultMessage: message.FallbackMsg("tribe.title.orderedByODA", "Ordered by ODA"), + MessageID: message.TribeTitleOrderedByODA, + DefaultMessage: message.FallbackMsg(message.TribeTitleOrderedByODA, "Ordered by ODA"), }) case TopODDCommand: filter.RankDefGTE = 1 filter.Sort = "rankDef ASC" title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.title.orderedByODD", - DefaultMessage: message.FallbackMsg("tribe.title.orderedByODD", "Ordered by ODD"), + MessageID: message.TribeTitleOrderedByODD, + DefaultMessage: message.FallbackMsg(message.TribeTitleOrderedByODD, "Ordered by ODD"), }) case TopODSCommand: filter.RankSupGTE = 1 filter.Sort = "rankSup ASC" title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.title.orderedByODS", - DefaultMessage: message.FallbackMsg("tribe.title.orderedByODS", "Ordered by ODS"), + MessageID: message.TribeTitleOrderedByODS, + DefaultMessage: message.FallbackMsg(message.TribeTitleOrderedByODS, "Ordered by ODS"), }) case TopODCommand: filter.RankTotalGTE = 1 filter.Sort = "rankTotal ASC" title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.title.orderedByOD", - DefaultMessage: message.FallbackMsg("tribe.title.orderedByOD", "Ordered by OD"), + MessageID: message.TribeTitleOrderedByOD, + DefaultMessage: message.FallbackMsg(message.TribeTitleOrderedByOD, "Ordered by OD"), }) case TopPointsCommand: filter.Sort = "rank ASC" title = ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.title.orderedByPoints", - DefaultMessage: message.FallbackMsg("tribe.title.orderedByPoints", "Ordered by points"), + MessageID: message.TribeTitleOrderedByPoints, + DefaultMessage: message.FallbackMsg(message.TribeTitleOrderedByPoints, "Ordered by points"), }) default: return } - playersList, err := s.cfg.API.Players.Browse(world, filter, &sdk.PlayerInclude{ + playerList, err := s.cfg.API.Players.Browse(world, filter, &sdk.PlayerInclude{ Tribe: true, }) if err != nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "api.defaultError", - DefaultMessage: message.FallbackMsg("api.defaultError", + MessageID: message.ApiDefaultError, + DefaultMessage: message.FallbackMsg(message.ApiDefaultError, "{{.Mention}} There was an error fetching data from the API, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -373,22 +373,21 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, })) return } - if playersList == nil || playersList.Total == 0 { + if playerList == nil || playerList.Total == 0 { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.tribesNotFound", - DefaultMessage: message.FallbackMsg("tribe.tribesNotFound", - "{{.Mention}} There was an error fetching data from the API, please try again later."), + MessageID: message.TribeTribesNotFound, + DefaultMessage: message.FallbackMsg(message.TribeTribesNotFound, "{{.Mention}} Tribes not found."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), }, })) return } - totalPages := int(math.Ceil(float64(playersList.Total) / float64(limit))) + totalPages := int(math.Ceil(float64(playerList.Total) / float64(limit))) if page > totalPages { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.exceededMaximumNumberOfPages", - DefaultMessage: message.FallbackMsg("tribe.exceededMaximumNumberOfPages", + MessageID: message.TribeExceededMaximumNumberOfPages, + DefaultMessage: message.FallbackMsg(message.TribeExceededMaximumNumberOfPages, "{{.Mention}} You have exceeded the maximum number of pages ({{.Page}}/{{.MaxPage}})."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -403,8 +402,8 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, langVersion, err := s.cfg.API.LangVersions.Read(langTag) if err != nil || langVersion == nil { s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "internalServerError", - DefaultMessage: message.FallbackMsg("internalServerError", + MessageID: message.InternalServerError, + DefaultMessage: message.FallbackMsg(message.InternalServerError, "{{.Mention}} Internal server error occurred, please try again later."), TemplateData: map[string]interface{}{ "Mention": m.Author.Mention(), @@ -414,7 +413,7 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, } msg := &EmbedMessage{} - for i, player := range playersList.Items { + for i, player := range playerList.Items { if player == nil { continue } @@ -447,8 +446,8 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, } msg.Append(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "tribe.messageLine", - DefaultMessage: message.FallbackMsg("tribe.messageLine", + MessageID: message.TribeMessageLine, + DefaultMessage: message.FallbackMsg(message.TribeMessageLine, "**{{.Index}}**. [``{{.PlayerName}}``]({{.PlayerURL}}) (Tribe: [``{{.TribeTag}}``]({{.TribeURL}}) | Rank: **{{.Rank}}** | Score: **{{.Score}}**)\n"), TemplateData: map[string]interface{}{ "Index": offset + i + 1, @@ -466,8 +465,8 @@ func (s *Session) handleTribeCommand(ctx commandCtx, m *discordgo.MessageCreate, SetTitle(title). SetFields(msg.ToMessageEmbedFields()). SetFooter(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{ - MessageID: "pagination.labelDisplayedPage", - DefaultMessage: message.FallbackMsg("pagination.labelDisplayedPage", "{{.Page}} of {{.MaxPage}}"), + MessageID: message.PaginationLabelDisplayedPage, + DefaultMessage: message.FallbackMsg(message.PaginationLabelDisplayedPage, "{{.Page}} of {{.MaxPage}}"), TemplateData: map[string]interface{}{ "Page": page, "MaxPage": totalPages, diff --git a/message/ids.go b/message/ids.go index af1e130..cbfd985 100644 --- a/message/ids.go +++ b/message/ids.go @@ -1,6 +1,12 @@ package message const ( + InternalServerError = "internalServerError" + + ApiDefaultError = "api.defaultError" + + PaginationLabelDisplayedPage = "pagination.labelDisplayedPage" + HelpForAdmins = "help.forAdmins" HelpTitle = "help.title" HelpDescription = "help.description" @@ -26,4 +32,15 @@ const ( HelpChangageLanguage = "help.changelanguage" HelpCoordsTranslation = "help.coordstranslation" HelpDisableCoordsTranslation = "help.disablecoordstranslation" + + TribeInvalidPage = "tribe.invalidPage" + TribeNoTribeID = "tribe.noTribeID" + TribeTitleOrderedByODA = "tribe.title.orderedByODA" + TribeTitleOrderedByODD = "tribe.title.orderedByODD" + TribeTitleOrderedByODS = "tribe.title.orderedByODS" + TribeTitleOrderedByOD = "tribe.title.orderedByOD" + TribeTitleOrderedByPoints = "tribe.title.orderedByPoints" + TribeTribesNotFound = "tribe.tribesNotFound" + TribeExceededMaximumNumberOfPages = "tribe.exceededMaximumNumberOfPages" + TribeMessageLine = "tribe.messageLine" )