Fix query

triax · Aug 28, 2023 · d25b94a · d25b94a
1 parent f5ae9bf
commit d25b94a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/server/slackbot/slashcommands.go b/server/slackbot/slashcommands.go
@@ -22,10 +22,9 @@ func (bot Bot) SlashCommands(w http.ResponseWriter, req *http.Request) {
 	req.ParseForm()
 	defer req.Body.Close()
 	text := req.Form.Get("text")
-	names := []string{}
+	names := []any{}
 	idx := mentionExp.SubexpIndex("name")
 	for _, m := range mentionExp.FindAllStringSubmatch(text, -1) {
-		fmt.Println(m[idx])
 		names = append(names, m[idx])
 	}
 	if len(names) == 0 {
@@ -52,7 +51,7 @@ func (bot Bot) SlashCommands(w http.ResponseWriter, req *http.Request) {
 	defer client.Close()
 
 	users := []models.Member{}
-	query := datastore.NewQuery(models.KindMember).FilterField("Slack.Name", "in", strings.Join(names, ","))
+	query := datastore.NewQuery(models.KindMember).FilterField("Slack.Name", "in", names)
 	if _, err := client.GetAll(ctx, query, &users); err != nil {
 		b, err := json.Marshal(map[string]string{
 			"text": fmt.Sprintf("データストアからのデータ取得に失敗しました。 @ten までご連絡ください。\n```%s```", err.Error()),
@@ -65,11 +64,12 @@ func (bot Bot) SlashCommands(w http.ResponseWriter, req *http.Request) {
 		http.Post(req.Form.Get("response_url"), "application/json", bytes.NewReader(b))
 		return
 	}
+	w.WriteHeader(http.StatusOK)
 
+	t := "ありがとう！を "
 	for _, u := range users {
-		fmt.Printf("%+v\n", u)
+		t += fmt.Sprintf("<@%s> さん ", u.Slack.ID)
 	}
-
-	fmt.Println(names)
-	w.WriteHeader(http.StatusOK)
+	t += "に伝えました。"
+	http.Post(req.Form.Get("response_url"), "application/json", strings.NewReader(`{"text":"`+t+`"}`))
 }