From 1751e906daa7aa30b4354f46bd913b7cc18683c9 Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Thu, 31 Oct 2024 17:49:20 -0400
Subject: [PATCH] feat(cmd/joj3): grab keywords from groups

---
 cmd/joj3/conf/conf.go | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cmd/joj3/conf/conf.go b/cmd/joj3/conf/conf.go
index 225588c..9aeb8dd 100644
--- a/cmd/joj3/conf/conf.go
+++ b/cmd/joj3/conf/conf.go
@@ -35,10 +35,9 @@ type ConfStage struct {
 }
 
 type Conf struct {
-	Name                string   `default:"unknown"`
-	LogPath             string   `default:""`
-	ExpireUnixTimestamp int64    `default:"-1"`
-	GroupKeywords       []string `default:"joj"`
+	Name                string `default:"unknown"`
+	LogPath             string `default:""`
+	ExpireUnixTimestamp int64  `default:"-1"`
 	Stage               struct {
 		SandboxExecServer string `default:"localhost:5051"`
 		SandboxToken      string `default:""`
@@ -313,13 +312,15 @@ func CheckExpire(conf *Conf) error {
 }
 
 func MatchGroups(conf *Conf, conventionalCommit *ConventionalCommit) []string {
-	keywords := conf.GroupKeywords
+	keywords := []string{}
+	for _, stage := range conf.Stage.Stages {
+		keywords = append(keywords, strings.ToLower(stage.Group))
+	}
 	groups := []string{}
 	loweredDescription := strings.ToLower(conventionalCommit.Description)
 	for _, keyword := range keywords {
-		loweredKeyword := strings.ToLower(keyword)
-		if strings.Contains(loweredDescription, loweredKeyword) {
-			groups = append(groups, loweredKeyword)
+		if strings.Contains(loweredDescription, keyword) {
+			groups = append(groups, keyword)
 		}
 	}
 	return groups