From 1fde3e5a2ec79b6aa4b1b7334a45854bd35dd27b Mon Sep 17 00:00:00 2001 From: Siwoo Jeon Date: Thu, 1 May 2025 19:51:21 +0900 Subject: [PATCH] fix: Category names --- commands/dataLength.go | 10 +++++----- commands/deleteLearnedData.go | 15 +++++++-------- commands/discommand.go | 4 ++-- commands/help.go | 9 ++++----- commands/information.go | 2 +- commands/learn.go | 5 ++--- commands/learnedDataList.go | 17 +++++++++-------- 7 files changed, 30 insertions(+), 32 deletions(-) diff --git a/commands/dataLength.go b/commands/dataLength.go index 0c59a5b..e14ffaa 100644 --- a/commands/dataLength.go +++ b/commands/dataLength.go @@ -42,7 +42,7 @@ var DataLengthCommand *Command = &Command{ DetailedDescription: &DetailedDescription{ Usage: fmt.Sprintf("%s학습데이터량", configs.Config.Bot.Prefix), }, - Category: Generals, + Category: General, MessageRun: func(ctx *MsgContext) { dataLengthRun(ctx.Session, ctx.Msg) }, @@ -51,11 +51,11 @@ var DataLengthCommand *Command = &Command{ }, } -func getLength(data dataType, coll *mongo.Collection, filter bson.D) { +func getLength(dType dataType, coll *mongo.Collection, filter bson.D) { defer dataLengthWg.Done() var err error var cur *mongo.Cursor - var datas []bson.M + var data []bson.M cur, err = coll.Find(context.TODO(), filter) if err != nil { @@ -64,8 +64,8 @@ func getLength(data dataType, coll *mongo.Collection, filter bson.D) { defer cur.Close(context.TODO()) - cur.All(context.TODO(), &datas) - dataLengthCh <- chStruct{name: data, length: len(datas)} + cur.All(context.TODO(), &data) + dataLengthCh <- chStruct{name: dType, length: len(data)} } func dataLengthRun(s *discordgo.Session, m any) { diff --git a/commands/deleteLearnedData.go b/commands/deleteLearnedData.go index 8e6b4c6..105c928 100644 --- a/commands/deleteLearnedData.go +++ b/commands/deleteLearnedData.go @@ -29,19 +29,18 @@ var DeleteLearnedDataCommand *Command = &Command{ Usage: fmt.Sprintf("%s삭제 (삭제할 단어)", configs.Config.Bot.Prefix), Examples: []string{fmt.Sprintf("%s삭제 머핀", configs.Config.Bot.Prefix)}, }, - Category: Chattings, + Category: Chatting, MessageRun: func(ctx *MsgContext) { deleteLearnedDataRun(ctx.Command, ctx.Session, ctx.Msg, &ctx.Args) }, ChatInputRun: func(ctx *ChatInputContext) { - var args *[]string - deleteLearnedDataRun(ctx.Command, ctx.Session, ctx.Inter, args) + deleteLearnedDataRun(ctx.Command, ctx.Session, ctx.Inter, nil) }, } func deleteLearnedDataRun(c *Command, s *discordgo.Session, m any, args *[]string) { var command, userId, description string - var datas []databases.Learn + var data []databases.Learn var options []discordgo.SelectMenuOption switch m := m.(type) { @@ -94,9 +93,9 @@ func deleteLearnedDataRun(c *Command, s *discordgo.Session, m any, args *[]strin return } - cur.All(context.TODO(), &datas) + cur.All(context.TODO(), &data) - if len(datas) < 1 { + if len(data) < 1 { embed := &discordgo.MessageEmbed{ Title: "❌ 오류", Description: "해당 하는 지식ㅇ을 찾을 수 없어요.", @@ -114,8 +113,8 @@ func deleteLearnedDataRun(c *Command, s *discordgo.Session, m any, args *[]strin return } - for i := range len(datas) { - data := datas[i] + for i := range len(data) { + data := data[i] options = append(options, discordgo.SelectMenuOption{ Label: fmt.Sprintf("%d번 지식", i+1), diff --git a/commands/discommand.go b/commands/discommand.go index f69a5a7..3221306 100644 --- a/commands/discommand.go +++ b/commands/discommand.go @@ -59,8 +59,8 @@ type Component struct { } const ( - Chattings Category = "채팅" - Generals Category = "일반" + Chatting Category = "채팅" + General Category = "일반" ) var commandMutex sync.Mutex diff --git a/commands/help.go b/commands/help.go index b87aa8c..f022633 100644 --- a/commands/help.go +++ b/commands/help.go @@ -28,13 +28,12 @@ var HelpCommand *Command = &Command{ Usage: fmt.Sprintf("%s도움말 [명령어]", configs.Config.Bot.Prefix), Examples: []string{fmt.Sprintf("%s도움말", configs.Config.Bot.Prefix), fmt.Sprintf("%s도움말 배워", configs.Config.Bot.Prefix)}, }, - Category: Generals, + Category: General, MessageRun: func(ctx *MsgContext) { helpRun(ctx.Command, ctx.Session, ctx.Msg, &ctx.Args) }, ChatInputRun: func(ctx *ChatInputContext) { - var args *[]string - helpRun(ctx.Command, ctx.Session, ctx.Inter, args) + helpRun(ctx.Command, ctx.Session, ctx.Inter, nil) }, } @@ -76,8 +75,8 @@ func helpRun(c *Command, s *discordgo.Session, m any, args *[]string) { embed.Description = utils.CodeBlock( "md", fmt.Sprintf("# 일반\n%s\n\n# 채팅\n%s", - strings.Join(getCommandsByCategory(Discommand, Generals), "\n"), - strings.Join(getCommandsByCategory(Discommand, Chattings), "\n")), + strings.Join(getCommandsByCategory(Discommand, General), "\n"), + strings.Join(getCommandsByCategory(Discommand, Chatting), "\n")), ) switch m := m.(type) { diff --git a/commands/information.go b/commands/information.go index 9ea6d0e..479b4d7 100644 --- a/commands/information.go +++ b/commands/information.go @@ -17,7 +17,7 @@ var InformationCommand *Command = &Command{ DetailedDescription: &DetailedDescription{ Usage: fmt.Sprintf("%s정보", configs.Config.Bot.Prefix), }, - Category: Generals, + Category: General, MessageRun: func(ctx *MsgContext) { informationRun(ctx.Session, ctx.Msg) }, diff --git a/commands/learn.go b/commands/learn.go index 6003e25..483c7b6 100644 --- a/commands/learn.go +++ b/commands/learn.go @@ -55,13 +55,12 @@ var LearnCommand *Command = &Command{ fmt.Sprintf("%s배워 \"나의 아이디를 알려줘\" \"너의 아이디는 {user.id}야.\"", configs.Config.Bot.Prefix), }, }, - Category: Chattings, + Category: Chatting, MessageRun: func(ctx *MsgContext) { learnRun(ctx.Command, ctx.Session, ctx.Msg, &ctx.Args) }, ChatInputRun: func(ctx *ChatInputContext) { - var args *[]string - learnRun(ctx.Command, ctx.Session, ctx.Inter, args) + learnRun(ctx.Command, ctx.Session, ctx.Inter, nil) }, } diff --git a/commands/learnedDataList.go b/commands/learnedDataList.go index 6558203..9c3554c 100644 --- a/commands/learnedDataList.go +++ b/commands/learnedDataList.go @@ -17,13 +17,13 @@ var LearnedDataListCommand *Command = &Command{ ApplicationCommand: &discordgo.ApplicationCommand{ Type: discordgo.ChatApplicationCommand, Name: "리스트", - Description: "당신이 가ㄹ르쳐준 단어를 나열해요.", + Description: "당신이 가ㄹ르쳐준 지식을 나열해요.", }, Aliases: []string{"list", "목록", "지식목록"}, DetailedDescription: &DetailedDescription{ Usage: fmt.Sprintf("%s리스트", configs.Config.Bot.Prefix), }, - Category: Chattings, + Category: Chatting, MessageRun: func(ctx *MsgContext) { learnedDataListRun(ctx.Session, ctx.Msg) }, @@ -32,8 +32,8 @@ var LearnedDataListCommand *Command = &Command{ }, } -func getDescriptions(datas *[]databases.Learn) (descriptions []string) { - for _, data := range *datas { +func getDescriptions(data *[]databases.Learn) (descriptions []string) { + for _, data := range *data { descriptions = append(descriptions, fmt.Sprintf("- %s: %s", data.Command, data.Result)) } return @@ -41,7 +41,8 @@ func getDescriptions(datas *[]databases.Learn) (descriptions []string) { func learnedDataListRun(s *discordgo.Session, m any) { var userId, globalName, avatarUrl string - var datas []databases.Learn + var data []databases.Learn + switch m := m.(type) { case *discordgo.MessageCreate: userId = m.Author.ID @@ -52,7 +53,7 @@ func learnedDataListRun(s *discordgo.Session, m any) { userId = m.Member.User.ID globalName = m.Member.User.GlobalName - avatarUrl = m.User.AvatarURL("512") + avatarUrl = m.Member.User.AvatarURL("512") } cur, err := databases.Learns.Find(context.TODO(), bson.D{{Key: "user_id", Value: userId}}) @@ -95,11 +96,11 @@ func learnedDataListRun(s *discordgo.Session, m any) { defer cur.Close(context.TODO()) - cur.All(context.TODO(), &datas) + cur.All(context.TODO(), &data) embed := &discordgo.MessageEmbed{ Title: fmt.Sprintf("%s님이 알려주신 지식", globalName), - Description: utils.CodeBlock("md", fmt.Sprintf("# 총 %d개에요.\n%s", len(datas), strings.Join(getDescriptions(&datas), "\n"))), + Description: utils.CodeBlock("md", fmt.Sprintf("# 총 %d개에요.\n%s", len(data), strings.Join(getDescriptions(&data), "\n"))), Color: utils.EmbedDefault, Thumbnail: &discordgo.MessageEmbedThumbnail{ URL: avatarUrl,