Fixing multiple args for max and pattern matching

STollenaar · May 5, 2023 · 467ec9f · 467ec9f
1 parent 1b6acb7
commit 467ec9f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 37 deletions.
diff --git a/lib/commands/commandHandler.go b/lib/commands/commandHandler.go
@@ -2,6 +2,7 @@ package commands
 
 import (
 	"context"
+	"fmt"
 	"sort"
 	"statsisticsbot/lib"
 	"statsisticsbot/util"
@@ -122,7 +123,7 @@ func CountFilterOccurences(guildID string, filter bson.D, wordFilter string) (me
 						primitive.E{
 							Key: "$regex",
 							Value: primitive.Regex{
-								Pattern: wordFilter,
+								Pattern: fmt.Sprintf("^%s$", wordFilter),
 								Options: "i",
 							},
 						},

diff --git a/lib/commands/countCommand.go b/lib/commands/countCommand.go
@@ -43,7 +43,7 @@ func FindSpecificWordOccurences(args *CommandParsed) int {
 		channelFilter = bson.D{
 			primitive.E{
 				Key:   "$eq",
-				Value: args.ChannelTarget,
+				Value: args.ChannelTarget.ID,
 			},
 		}
 	} else {
@@ -63,7 +63,7 @@ func FindSpecificWordOccurences(args *CommandParsed) int {
 					primitive.E{
 						Key: "$regex",
 						Value: primitive.Regex{
-							Pattern: args.Word,
+							Pattern: fmt.Sprintf("^%s$", args.Word),
 							Options: "i",
 						},
 					},

diff --git a/lib/commands/maxCommand.go b/lib/commands/maxCommand.go
@@ -59,57 +59,51 @@ func FindAllWordOccurences(arguments *CommandParsed) util.CountGrouped {
 }
 
 func getFilter(arguments *CommandParsed) (result bson.D, wordFilter string) {
+	var expressions bson.D
 	if arguments.isNotEmpty() {
-
 		if user := arguments.UserTarget; user != nil {
 			// Filtering based on author
-			result = append(result,
-				bson.E{
-					Key: "$match",
-					Value: bson.D{
-						primitive.E{
-							Key:   "Author",
-							Value: user.ID,
-						},
-					},
-				})
+			expressions = append(expressions,
+				primitive.E{
+					Key:   "Author",
+					Value: user.ID,
+				},
+			)
 		}
 		if channel := arguments.ChannelTarget; channel != nil {
 			// Filtering based on channelID
-			result = append(result,
-				bson.E{
-					Key: "$match",
-					Value: bson.D{
-						primitive.E{
-							Key:   "ChannelID",
-							Value: channel.ID,
-						},
-					},
-				})
+			expressions = append(expressions,
+				primitive.E{
+					Key:   "ChannelID",
+					Value: channel.ID,
+				},
+			)
 		}
 
 		if word := arguments.Word; word != "" {
 			wordFilter = word
-			result = append(result,
-				bson.E{
-					Key: "$match",
+			expressions = append(expressions,
+				primitive.E{
+					Key: "Content",
 					Value: bson.D{
 						primitive.E{
-							Key: "Content",
-							Value: bson.D{
-								primitive.E{
-									Key: "$regex",
-									Value: primitive.Regex{
-										Pattern: word,
-										Options: "i",
-									},
-								},
+							Key: "$regex",
+							Value: primitive.Regex{
+								Pattern: fmt.Sprintf("^%s$", word),
+								Options: "i",
 							},
 						},
 					},
-				})
+				},
+			)
 		}
 	}
+	result = bson.D{
+		primitive.E{
+			Key:   "$match",
+			Value: expressions,
+		},
+	}
 
 	return result, wordFilter
 }