From cc1d6f29aca9e5941900beb37ef7aab61d503fc9 Mon Sep 17 00:00:00 2001
From: Kichiyaki <dawidwysokinski000@gmail.com>
Date: Thu, 15 Oct 2020 05:58:03 +0200
Subject: [PATCH] move message ids to constants (command: deleteobservation)

---
 discord/observations.go | 24 ++++++++++++------------
 message/ids.go          |  5 +++++
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/discord/observations.go b/discord/observations.go
index 2352581..96b26b6 100644
--- a/discord/observations.go
+++ b/discord/observations.go
@@ -613,8 +613,8 @@ func (s *Session) handleDeleteObservationCommand(ctx commandCtx, m *discordgo.Me
 	} else if argsLength < 2 {
 		s.SendMessage(m.ChannelID,
 			m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "help.deleteobservation",
-				DefaultMessage: message.FallbackMsg("help.deleteobservation",
+				MessageID: message.HelpDeleteObservation,
+				DefaultMessage: message.FallbackMsg(message.HelpDeleteObservation,
 					"**{{.Command}}** [group id from {{.GroupsCommand}}] [id from {{.ObservationsCommand}}] - removes a tribe from the observation group."),
 				TemplateData: map[string]interface{}{
 					"Command":             DeleteObservationCommand.WithPrefix(s.cfg.CommandPrefix),
@@ -629,8 +629,8 @@ func (s *Session) handleDeleteObservationCommand(ctx commandCtx, m *discordgo.Me
 	if err != nil {
 		s.SendMessage(m.ChannelID,
 			ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "deleteObservation.invalidGroupID",
-				DefaultMessage: message.FallbackMsg("deleteObservation.invalidGroupID",
+				MessageID: message.DeleteObservationInvalidGroupID,
+				DefaultMessage: message.FallbackMsg(message.DeleteObservationInvalidGroupID,
 					"{{.Mention}} The group ID must be a number greater than 0."),
 				TemplateData: map[string]interface{}{
 					"Mention": m.Author.Mention(),
@@ -642,8 +642,8 @@ func (s *Session) handleDeleteObservationCommand(ctx commandCtx, m *discordgo.Me
 	if err != nil {
 		s.SendMessage(m.ChannelID,
 			ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "deleteObservation.invalidTribeID",
-				DefaultMessage: message.FallbackMsg("deleteObservation.invalidTribeID",
+				MessageID: message.DeleteObservationInvalidTribeID,
+				DefaultMessage: message.FallbackMsg(message.DeleteObservationInvalidTribeID,
 					"{{.Mention}} The tribe ID must be a number greater than 0."),
 				TemplateData: map[string]interface{}{
 					"Mention": m.Author.Mention(),
@@ -656,8 +656,8 @@ func (s *Session) handleDeleteObservationCommand(ctx commandCtx, m *discordgo.Me
 	if err != nil || group.ServerID != m.GuildID {
 		s.SendMessage(m.ChannelID,
 			ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID:      "deleteObservation.groupNotFound",
-				DefaultMessage: message.FallbackMsg("deleteObservation.groupNotFound", "{{.Mention}} Group not found."),
+				MessageID:      message.DeleteObservationGroupNotFound,
+				DefaultMessage: message.FallbackMsg(message.DeleteObservationGroupNotFound, "{{.Mention}} Group not found."),
 				TemplateData: map[string]interface{}{
 					"Mention": m.Author.Mention(),
 				},
@@ -671,8 +671,8 @@ func (s *Session) handleDeleteObservationCommand(ctx commandCtx, m *discordgo.Me
 	})
 
 	s.SendMessage(m.ChannelID, ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-		MessageID:      "unObserve.success",
-		DefaultMessage: message.FallbackMsg("unObserve.success", "{{.Mention}} Deleted."),
+		MessageID:      message.DeleteObservationSuccess,
+		DefaultMessage: message.FallbackMsg(message.DeleteObservationSuccess, "{{.Mention}} Deleted."),
 		TemplateData: map[string]interface{}{
 			"Mention": m.Author.Mention(),
 		},
@@ -691,8 +691,8 @@ func (s *Session) handleObservationsCommand(ctx commandCtx, m *discordgo.Message
 	} else if argsLength < 1 {
 		s.SendMessage(m.ChannelID,
 			m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "help.observations",
-				DefaultMessage: message.FallbackMsg("help.observations",
+				MessageID: message.HelpObservations,
+				DefaultMessage: message.FallbackMsg(message.HelpObservations,
 					"**{{.Command}}** [group id from {{.GroupsCommand}}] - shows a list of observed tribes by this group."),
 				TemplateData: map[string]interface{}{
 					"Command":       ObservationsCommand.WithPrefix(s.cfg.CommandPrefix),
diff --git a/message/ids.go b/message/ids.go
index d3b0464..5daa5bb 100644
--- a/message/ids.go
+++ b/message/ids.go
@@ -78,4 +78,9 @@ const (
 	ObserveGroupNotFound       = "observe.groupNotFound"
 	ObserveLimitHasBeenReached = "observe.observationLimitHasBeenReached"
 	ObserveSuccess             = "observe.success"
+
+	DeleteObservationInvalidGroupID = "deleteObservation.invalidGroupID"
+	DeleteObservationInvalidTribeID = "deleteObservation.invalidTribeID"
+	DeleteObservationGroupNotFound  = "deleteObservation.groupNotFound"
+	DeleteObservationSuccess        = "deleteObservation.success"
 )