From c969049f57277713bf0fbb9ba30568315e5639c9 Mon Sep 17 00:00:00 2001
From: Kichiyaki <dawidwysokinski000@gmail.com>
Date: Thu, 15 Oct 2020 05:22:34 +0200
Subject: [PATCH] move getEmojiForGroupsCommand function to helpers.go | move
 message ids to constants (command: deletegroup)

---
 discord/helpers.go      |  7 +++++++
 discord/observations.go | 19 ++++++-------------
 message/ids.go          |  3 +++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/discord/helpers.go b/discord/helpers.go
index 8cc4f76..d9f877f 100644
--- a/discord/helpers.go
+++ b/discord/helpers.go
@@ -7,6 +7,13 @@ import (
 	"github.com/tribalwarshelp/dcbot/message"
 )
 
+func getEmojiForGroupsCommand(val bool) string {
+	if val {
+		return ":white_check_mark:"
+	}
+	return ":x:"
+}
+
 func getAvailableLanguages() string {
 	langTags := []string{}
 	for _, langTag := range message.LanguageTags() {
diff --git a/discord/observations.go b/discord/observations.go
index a06036b..3cb1eb2 100644
--- a/discord/observations.go
+++ b/discord/observations.go
@@ -97,8 +97,8 @@ func (s *Session) handleDeleteGroupCommand(ctx commandCtx, m *discordgo.MessageC
 	} else if argsLength < 1 {
 		s.SendMessage(m.ChannelID,
 			m.Author.Mention()+" "+ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "help.deletegroup",
-				DefaultMessage: message.FallbackMsg("help.deletegroup",
+				MessageID: message.HelpDeleteGroup,
+				DefaultMessage: message.FallbackMsg(message.HelpDeleteGroup,
 					"**{{.Command}}** [group id from {{.GroupsCommand}}] - deletes an observation group."),
 				TemplateData: map[string]interface{}{
 					"Command":       DeleteGroupCommand.WithPrefix(s.cfg.CommandPrefix),
@@ -112,8 +112,8 @@ func (s *Session) handleDeleteGroupCommand(ctx commandCtx, m *discordgo.MessageC
 	if err != nil {
 		s.SendMessage(m.ChannelID,
 			ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-				MessageID: "deleteGroup.invalidID",
-				DefaultMessage: message.FallbackMsg("deleteGroup.invalidID",
+				MessageID: message.DeleteGroupInvalidID,
+				DefaultMessage: message.FallbackMsg(message.DeleteGroupInvalidID,
 					"{{.Mention}} The group ID must be a number greater than 0."),
 				TemplateData: map[string]interface{}{
 					"Mention": m.Author.Mention(),
@@ -129,8 +129,8 @@ func (s *Session) handleDeleteGroupCommand(ctx commandCtx, m *discordgo.MessageC
 
 	s.SendMessage(m.ChannelID,
 		ctx.localizer.MustLocalize(&i18n.LocalizeConfig{
-			MessageID: "deleteGroup.success",
-			DefaultMessage: message.FallbackMsg("deleteGroup.success",
+			MessageID: message.DeleteGroupSuccess,
+			DefaultMessage: message.FallbackMsg(message.DeleteGroupSuccess,
 				"{{.Mention}} The group has been deleted."),
 			TemplateData: map[string]interface{}{
 				"Mention": m.Author.Mention(),
@@ -138,13 +138,6 @@ func (s *Session) handleDeleteGroupCommand(ctx commandCtx, m *discordgo.MessageC
 		}))
 }
 
-func getEmojiForGroupsCommand(val bool) string {
-	if val {
-		return ":white_check_mark:"
-	}
-	return ":x:"
-}
-
 func (s *Session) handleGroupsCommand(ctx commandCtx, m *discordgo.MessageCreate) {
 	if has, err := s.memberHasPermission(m.GuildID, m.Author.ID, discordgo.PermissionAdministrator); err != nil || !has {
 		return
diff --git a/message/ids.go b/message/ids.go
index 8f6a2d3..e8b2e03 100644
--- a/message/ids.go
+++ b/message/ids.go
@@ -46,4 +46,7 @@ const (
 
 	AddGroupGroupLimitHasBeenReached = "addGroup.groupLimitHasBeenReached"
 	AddGroupSuccess                  = "addGroup.success"
+
+	DeleteGroupInvalidID = "deleteGroup.invalidID"
+	DeleteGroupSuccess   = "deleteGroup.success"
 )