use MessageEmbedFieldBuilder.SetName where it's possible

This commit is contained in:
Dawid Wysokiński 2021-07-18 10:07:49 +02:00
parent 62c84e58c4
commit 4b777e24af
5 changed files with 21 additions and 20 deletions

View File

@ -161,8 +161,8 @@ func (h *handler) checkEnnoblements() {
continue
}
localizer := message.NewLocalizer(g.Server.Lang)
lostVillagesMsg := &discord.MessageEmbedFieldBuilder{}
conqueredVillagesMsg := &discord.MessageEmbedFieldBuilder{}
lostVillagesBldr := &discord.MessageEmbedFieldBuilder{}
conqueredVillagesBldr := &discord.MessageEmbedFieldBuilder{}
for _, obs := range g.Observations {
enblmnts, ok := ennoblementsByServerKey[obs.Server]
version := twutil.FindVersionByCode(versions, twmodel.VersionCodeFromServerKey(obs.Server))
@ -180,7 +180,7 @@ func (h *handler) checkEnnoblements() {
t: messageTypeLost,
localizer: localizer,
}
lostVillagesMsg.Append(newMessage(newMsgDataConfig).String())
lostVillagesBldr.Append(newMessage(newMsgDataConfig).String())
}
}
@ -200,40 +200,38 @@ func (h *handler) checkEnnoblements() {
t: messageTypeConquer,
localizer: localizer,
}
conqueredVillagesMsg.Append(newMessage(newMsgDataConfig).String())
conqueredVillagesBldr.Append(newMessage(newMsgDataConfig).String())
}
}
}
}
timestamp := time.Now().Format(time.RFC3339)
if g.ConqueredVillagesChannelID != "" && !conqueredVillagesMsg.IsEmpty() {
if g.ConqueredVillagesChannelID != "" && !conqueredVillagesBldr.IsEmpty() {
title := localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.CronConqueredVillagesTitle,
DefaultMessage: message.FallbackMsg(message.CronConqueredVillagesTitle,
"Conquered villages"),
})
conqueredVillagesBldr.SetName(title)
go h.discord.SendEmbed(g.ConqueredVillagesChannelID,
discord.
NewEmbed().
SetTitle(title).
SetColor(colorConqueredVillages).
SetFields(conqueredVillagesMsg.ToMessageEmbedFields()).
SetFields(conqueredVillagesBldr.ToMessageEmbedFields()).
SetTimestamp(timestamp))
}
if g.LostVillagesChannelID != "" && !lostVillagesMsg.IsEmpty() {
if g.LostVillagesChannelID != "" && !lostVillagesBldr.IsEmpty() {
title := localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.CronLostVillagesTitle,
DefaultMessage: message.FallbackMsg(message.CronLostVillagesTitle,
"Lost villages"),
})
conqueredVillagesBldr.SetName(title)
go h.discord.SendEmbed(g.LostVillagesChannelID,
discord.
NewEmbed().
SetTitle(title).
SetColor(colorLostVillages).
SetFields(lostVillagesMsg.ToMessageEmbedFields()).
SetFields(lostVillagesBldr.ToMessageEmbedFields()).
SetTimestamp(timestamp))
}
}

View File

@ -81,8 +81,6 @@ func newMessage(cfg newMessageConfig) checkEnnoblementsMsg {
func (msg checkEnnoblementsMsg) String() string {
return msg.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.CronCheckEnnoblementsMsgLine,
DefaultMessage: message.FallbackMsg(message.CronCheckEnnoblementsMsgLine,
"{{.NewOwner}} ({{.NewOwnerTribe}}) has conquered {{.Village}} (Old owner: {{.OldOwner}} ({{.OldOwnerTribe}}))"),
TemplateData: map[string]interface{}{
"NewOwner": discord.BuildLink(msg.newOwnerName, msg.newOwnerURL),
"NewOwnerTribe": discord.BuildLink(msg.newOwnerTribeTag, msg.newOwnerTribeURL),

View File

@ -169,10 +169,12 @@ func (p *procTranslateCoords) process(ctx *commandCtx, m *discordgo.MessageCreat
}) + "\n")
}
title := ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.CoordsTranslationTitle,
})
bldr.SetName(title)
p.SendEmbed(m.ChannelID, NewEmbed().
SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.CoordsTranslationTitle,
})).
SetTitle(title).
SetFields(bldr.ToMessageEmbedFields()))
}
}

View File

@ -810,10 +810,12 @@ func (hndlr *hndlrObservations) execute(ctx *commandCtx, m *discordgo.MessageCre
BuildLink(tag, tribeURL)))
}
}
title := ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.ObservationsTitle,
})
bldr.SetName(title)
hndlr.SendEmbed(m.ChannelID, NewEmbed().
SetTitle(ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
MessageID: message.ObservationsTitle,
})).
SetTitle(title).
SetFields(bldr.ToMessageEmbedFields()))
}

View File

@ -410,6 +410,7 @@ func (hndlr *hndlrTribe) execute(ctx *commandCtx, m *discordgo.MessageCreate, ar
}
bldr := &MessageEmbedFieldBuilder{}
bldr.SetName(title)
for i, player := range playerList.Items {
if player == nil {
continue