From 91042aeed3956a68dbcbc5ce2de73f17068aca8f Mon Sep 17 00:00:00 2001 From: Aaron Demolder Date: Tue, 8 Apr 2025 23:15:00 +0200 Subject: [PATCH 1/4] Update react.go to convert strings to lowercase before comparing for emoji reactions ReSoNaNcE --- internal/reactions/react.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/internal/reactions/react.go b/internal/reactions/react.go index 8774a21..d76b075 100644 --- a/internal/reactions/react.go +++ b/internal/reactions/react.go @@ -40,7 +40,10 @@ func getReaction(r map[string]config.Reaction) (string, config.Reaction) { } func wordIsInMessage(msg string, word string) bool { - return msg == word || strings.HasPrefix(msg, word+" ") || strings.HasSuffix(msg, " "+word) || strings.Contains(msg, " "+word+" ") + return strings.ToLower(msg) == strings.ToLower(word) || + strings.HasPrefix( strings.ToLower(msg), strings.ToLower(word) + " " ) || + strings.HasSuffix( strings.ToLower(msg), " " + strings.ToLower(word) ) || + strings.Contains( strings.ToLower(msg), " " + strings.ToLower(word) + " " ) } func (m *ReactorModule) React(msg *discordgo.MessageCreate) error { From 556d6f6bb19d3ec9df3b1c24c78392b616244837 Mon Sep 17 00:00:00 2001 From: Aaron Demolder Date: Tue, 8 Apr 2025 23:44:36 +0200 Subject: [PATCH 2/4] remove multiple use of ToLower --- internal/reactions/react.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/reactions/react.go b/internal/reactions/react.go index d76b075..d8e63a4 100644 --- a/internal/reactions/react.go +++ b/internal/reactions/react.go @@ -40,10 +40,13 @@ func getReaction(r map[string]config.Reaction) (string, config.Reaction) { } func wordIsInMessage(msg string, word string) bool { - return strings.ToLower(msg) == strings.ToLower(word) || - strings.HasPrefix( strings.ToLower(msg), strings.ToLower(word) + " " ) || - strings.HasSuffix( strings.ToLower(msg), " " + strings.ToLower(word) ) || - strings.Contains( strings.ToLower(msg), " " + strings.ToLower(word) + " " ) + var lowerMsg := strings.ToLower(msg) string + var lowerWord := strings.ToLower(word) string + + return lowerMsg == lowerWord || + strings.HasPrefix( lowerMsg, lowerWord + " " ) || + strings.HasSuffix( lowerMsg, " " + lowerWord ) || + strings.Contains( lowerMsg, " " + lowerWord + " " ) } func (m *ReactorModule) React(msg *discordgo.MessageCreate) error { From 58d316c03f7e9e9edc3fcf60a7eb3504cdfd9dd9 Mon Sep 17 00:00:00 2001 From: Aaron Demolder Date: Tue, 8 Apr 2025 23:49:13 +0200 Subject: [PATCH 3/4] remove silly mistake in var assignment --- internal/reactions/react.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/reactions/react.go b/internal/reactions/react.go index d8e63a4..ca516ee 100644 --- a/internal/reactions/react.go +++ b/internal/reactions/react.go @@ -40,8 +40,8 @@ func getReaction(r map[string]config.Reaction) (string, config.Reaction) { } func wordIsInMessage(msg string, word string) bool { - var lowerMsg := strings.ToLower(msg) string - var lowerWord := strings.ToLower(word) string + var lowerMsg := strings.ToLower(msg) + var lowerWord := strings.ToLower(word) return lowerMsg == lowerWord || strings.HasPrefix( lowerMsg, lowerWord + " " ) || From cee58da6f6859a834d4a7e406ca632955fa6b22a Mon Sep 17 00:00:00 2001 From: Aaron Demolder Date: Tue, 8 Apr 2025 23:52:57 +0200 Subject: [PATCH 4/4] rookie error #12 --- internal/reactions/react.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/reactions/react.go b/internal/reactions/react.go index ca516ee..b701e0e 100644 --- a/internal/reactions/react.go +++ b/internal/reactions/react.go @@ -40,8 +40,8 @@ func getReaction(r map[string]config.Reaction) (string, config.Reaction) { } func wordIsInMessage(msg string, word string) bool { - var lowerMsg := strings.ToLower(msg) - var lowerWord := strings.ToLower(word) + var lowerMsg = strings.ToLower(msg) + var lowerWord = strings.ToLower(word) return lowerMsg == lowerWord || strings.HasPrefix( lowerMsg, lowerWord + " " ) ||