add: コンポーネントとモーダルにも追加する

sabafly · May 12, 2023 · 573b1d0 · 573b1d0
1 parent 4a252e5
commit 573b1d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/handler/component.go b/handler/component.go
@@ -11,6 +11,7 @@ type ComponentHandler func(event *events.ComponentInteractionCreate) error
 type Component struct {
 	Name    string
 	Check   Check[*events.ComponentInteractionCreate]
+	Checks  map[string]Check[*events.ComponentInteractionCreate]
 	Handler map[string]ComponentHandler
 }
 
@@ -36,6 +37,10 @@ func (h *Handler) handleComponent(event *events.ComponentInteractionCreate) {
 		return
 	}
 
+	if check, ok := component.Checks[componentName]; ok && !check(event) {
+		return
+	}
+
 	handler, ok := component.Handler[subName]
 	if !ok {
 		h.Logger.Debugf("不明なハンダラ %s", subName)

diff --git a/handler/modal.go b/handler/modal.go
@@ -11,6 +11,7 @@ type ModalHandler func(event *events.ModalSubmitInteractionCreate) error
 type Modal struct {
 	Name    string
 	Check   Check[*events.ModalSubmitInteractionCreate]
+	Checks  map[string]Check[*events.ModalSubmitInteractionCreate]
 	Handler map[string]ModalHandler
 }
 
@@ -36,6 +37,10 @@ func (h *Handler) handleModal(event *events.ModalSubmitInteractionCreate) {
 		return
 	}
 
+	if check, ok := modal.Checks[modalName]; ok && !check(event) {
+		return
+	}
+
 	handler, ok := modal.Handler[subName]
 	if !ok {
 		h.Logger.Debugf("不明なハンダラ %s", subName)