From 4b777e24af8ad3d6eb973550c15cc18c7b3c7a29 Mon Sep 17 00:00:00 2001
From: Kichiyaki <xyztojajestem@gmail.com>
Date: Sun, 18 Jul 2021 10:07:49 +0200
Subject: [PATCH] use MessageEmbedFieldBuilder.SetName where it's possible

---
 cron/handler.go               | 22 ++++++++++------------
 cron/message.go               |  2 --
 discord/coords_translation.go |  8 +++++---
 discord/observations.go       |  8 +++++---
 discord/public_commands.go    |  1 +
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cron/handler.go b/cron/handler.go
index 96db3c7..73c5085 100644
--- a/cron/handler.go
+++ b/cron/handler.go
@@ -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))
 		}
 	}
diff --git a/cron/message.go b/cron/message.go
index f016c91..4dc1fc5 100644
--- a/cron/message.go
+++ b/cron/message.go
@@ -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),
diff --git a/discord/coords_translation.go b/discord/coords_translation.go
index 305cfab..0648b89 100644
--- a/discord/coords_translation.go
+++ b/discord/coords_translation.go
@@ -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()))
 	}
 }
diff --git a/discord/observations.go b/discord/observations.go
index 0906eec..605519d 100644
--- a/discord/observations.go
+++ b/discord/observations.go
@@ -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()))
 }
 
diff --git a/discord/public_commands.go b/discord/public_commands.go
index b6f1b25..4a61258 100644
--- a/discord/public_commands.go
+++ b/discord/public_commands.go
@@ -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