From 937e50b23e3cc37d217eb32408884807351d24d9 Mon Sep 17 00:00:00 2001 From: Kichiyaki Date: Sun, 18 Jul 2021 07:28:48 +0200 Subject: [PATCH] remove unnecessary allocation in isValidLanguageTag, rename getEmojiForGroupsCommand -> boolToEmoji --- discord/embed.go | 1 + discord/helpers.go | 10 ++++------ discord/observations.go | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/discord/embed.go b/discord/embed.go index 2f328cb..9422011 100644 --- a/discord/embed.go +++ b/discord/embed.go @@ -255,6 +255,7 @@ func (b *MessageEmbedFieldBuilder) IsEmpty() bool { func (b *MessageEmbedFieldBuilder) Append(m string) { b.mutex.Lock() defer b.mutex.Unlock() + for len(b.chunks) < b.index+1 { b.chunks = append(b.chunks, "") } diff --git a/discord/helpers.go b/discord/helpers.go index e040a40..f15cd8c 100644 --- a/discord/helpers.go +++ b/discord/helpers.go @@ -7,7 +7,7 @@ import ( "github.com/tribalwarshelp/dcbot/message" ) -func getEmojiForGroupsCommand(val bool) string { +func boolToEmoji(val bool) string { if val { return ":white_check_mark:" } @@ -15,7 +15,7 @@ func getEmojiForGroupsCommand(val bool) string { } func getAvailableLanguages() string { - langTags := []string{} + var langTags []string for _, langTag := range message.LanguageTags() { langTags = append(langTags, langTag.String()) } @@ -23,14 +23,12 @@ func getAvailableLanguages() string { } func isValidLanguageTag(lang string) bool { - valid := false for _, langTag := range message.LanguageTags() { if langTag.String() == lang { - valid = true - break + return true } } - return valid + return false } func BuildLink(text string, url string) string { diff --git a/discord/observations.go b/discord/observations.go index 7d0466d..036bf3b 100644 --- a/discord/observations.go +++ b/discord/observations.go @@ -147,10 +147,10 @@ func (s *Session) handleGroupsCommand(ctx *commandCtx, m *discordgo.MessageCreat msg += fmt.Sprintf("**%d** | %d | %s | %s | %s | %s\n", i+1, groups.ID, - getEmojiForGroupsCommand(groups.ConqueredVillagesChannelID != ""), - getEmojiForGroupsCommand(groups.LostVillagesChannelID != ""), - getEmojiForGroupsCommand(groups.ShowEnnobledBarbarians), - getEmojiForGroupsCommand(groups.ShowInternals), + boolToEmoji(groups.ConqueredVillagesChannelID != ""), + boolToEmoji(groups.LostVillagesChannelID != ""), + boolToEmoji(groups.ShowEnnobledBarbarians), + boolToEmoji(groups.ShowInternals), ) }