diff --git a/commands/learnedDataList.go b/commands/learnedDataList.go index e5f4dde..bf0e022 100644 --- a/commands/learnedDataList.go +++ b/commands/learnedDataList.go @@ -43,10 +43,10 @@ var LearnedDataListCommand *Command = &Command{ }, Aliases: []string{"list", "목록", "지식목록"}, DetailedDescription: &DetailedDescription{ - Usage: fmt.Sprintf("%s리스트", configs.Config.Bot.Prefix), + Usage: fmt.Sprintf("%s리스트 [단어]", configs.Config.Bot.Prefix), Examples: []string{ fmt.Sprintf("%s리스트", configs.Config.Bot.Prefix), - fmt.Sprintf("%s리스트 단어:안녕", configs.Config.Bot.Prefix), + fmt.Sprintf("%s리스트 안녕", configs.Config.Bot.Prefix), fmt.Sprintf("%s리스트 개수:10", configs.Config.Bot.Prefix), }, }, @@ -60,10 +60,12 @@ var LearnedDataListCommand *Command = &Command{ filter := bson.D{{Key: "user_id", Value: ctx.Msg.Author.ID}} query := strings.Join(*ctx.Args, " ") - if match := utils.RegexpLearnQueryCommand.FindStringSubmatch(query); match != nil { + command := utils.RegexpLearnQueryLength.ReplaceAllString(query, "") + command = strings.Join(strings.Fields(command), " ") + if command != "" { filter = append(filter, bson.E{ Key: "command", - Value: match[1], + Value: command, }) } diff --git a/configs/version.go b/configs/version.go index cdebf58..ec582bf 100644 --- a/configs/version.go +++ b/configs/version.go @@ -7,7 +7,7 @@ import ( "git.wh64.net/muffin/goMuffin/utils" ) -const MUFFIN_VERSION = "6.0.0-madeleine_develop.250712a" +const MUFFIN_VERSION = "6.0.0-madeleine_preview.250713a" var updatedString string = utils.RegexpDecimals.FindAllStringSubmatch(MUFFIN_VERSION, -1)[3][0] diff --git a/scripts/export.go b/scripts/export.go index 2e7d007..627326b 100644 --- a/scripts/export.go +++ b/scripts/export.go @@ -195,7 +195,7 @@ func ExportData(n *commando.Node) error { if refined { for i, text := range data { - if utils.RegexpEmoji.Match([]byte(text.Text)) { + if utils.RegexpDiscordEmoji.Match([]byte(text.Text)) { data = append(data[:i], data[i+1:]...) return } diff --git a/utils/customIds.go b/utils/customIds.go index ccb718e..aa33adf 100644 --- a/utils/customIds.go +++ b/utils/customIds.go @@ -31,14 +31,14 @@ func MakeDeleteLearnedData(id string, number int, userId string) string { } func GetDeleteLearnedDataId(customId string) (id bson.ObjectID, itemId int) { - id, _ = bson.ObjectIDFromHex(strings.ReplaceAll(RegexpDLDId.FindAllString(customId, 1)[0], "id=", "")) - stringItemId := strings.ReplaceAll(RegexpDLDItemId.FindAllString(customId, 1)[0], "no=", "") + id, _ = bson.ObjectIDFromHex(strings.ReplaceAll(RegexpId.FindAllString(customId, 1)[0], "id=", "")) + stringItemId := strings.ReplaceAll(RegexpItemId.FindAllString(customId, 1)[0], "no=", "") itemId, _ = strconv.Atoi(stringItemId) return } func GetDeleteLearnedDataUserId(customId string) string { - return strings.ReplaceAll(RegexpDLDUserId.FindAllString(customId, 1)[0], "user_id=", "") + return strings.ReplaceAll(RegexpUserId.FindAllString(customId, 1)[0], "user_id=", "") } func MakePaginationEmbedPrev(id string) string { @@ -125,12 +125,12 @@ func MakeSelectChat(id string, number int, userId string) string { } func GetSelectChatId(customId string) (id bson.ObjectID, itemId int) { - id, _ = bson.ObjectIDFromHex(strings.ReplaceAll(RegexpDLDId.FindAllString(customId, 1)[0], "id=", "")) - stringItemId := strings.ReplaceAll(RegexpDLDItemId.FindAllString(customId, 1)[0], "no=", "") + id, _ = bson.ObjectIDFromHex(strings.ReplaceAll(RegexpId.FindAllString(customId, 1)[0], "id=", "")) + stringItemId := strings.ReplaceAll(RegexpItemId.FindAllString(customId, 1)[0], "no=", "") itemId, _ = strconv.Atoi(stringItemId) return } func GetSelectChatUserId(customId string) string { - return strings.ReplaceAll(RegexpDLDUserId.FindAllString(customId, 1)[0], "user_id=", "") + return strings.ReplaceAll(RegexpUserId.FindAllString(customId, 1)[0], "user_id=", "") } diff --git a/utils/regexp.go b/utils/regexp.go index cffff7e..1faf758 100644 --- a/utils/regexp.go +++ b/utils/regexp.go @@ -5,12 +5,10 @@ import "regexp" var ( RegexpFlexibleString = regexp.MustCompile(`[^\s"'「」«»]+|"([^"]*)"|'([^']*)'|「([^」]*)」|«([^»]*)»`) RegexpDecimals = regexp.MustCompile(`\d+`) - RegexpDLDItemId = regexp.MustCompile(`no=\d+`) - RegexpDLDUserId = regexp.MustCompile(`user_id=\d+`) - RegexpDLDId = regexp.MustCompile(`id=[^&]*`) - RegexpEmoji = regexp.MustCompile(``) - RegexpLearnQueryCommand = regexp.MustCompile(`단어:([^\n대답개수:]*)`) - RegexpLearnQueryResult = regexp.MustCompile(`대답:([^\n단어개수:]*)`) + RegexpItemId = regexp.MustCompile(`no=\d+`) + RegexpUserId = regexp.MustCompile(`user_id=\d+`) + RegexpId = regexp.MustCompile(`id=[^&]*`) + RegexpDiscordEmoji = regexp.MustCompile(``) RegexpLearnQueryLength = regexp.MustCompile(`개수:(\d+)`) RegexpPaginationEmbedId = regexp.MustCompile(`^(\d+)/(\d+)$`) )