fixed webhook interactions blocking forever

topi314 · topi314 · commit 7dd331d1d04e · 2021-03-28T19:26:05.000+02:00
diff --git a/internal/webhook_server.go b/internal/webhook_server.go
@@ -90,13 +90,12 @@ func (h *webhookInteractionHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 		w.WriteHeader(http.StatusBadRequest)
 	}
 	c := make(chan interface{})
-	h.webhookServer.Disgo().EventManager().Handle(api.InteractionCreateWebhookEvent, rawBody, c)
+	go h.webhookServer.Disgo().EventManager().Handle(api.InteractionCreateWebhookEvent, rawBody, c)
 
-	response := <-c
 	w.WriteHeader(http.StatusOK)
 	w.Header().Set("Content-Type", "application/json")
 
-	err = json.NewEncoder(w).Encode(response)
+	err = json.NewEncoder(w).Encode(<-c)
 	if err != nil {
 		log.Errorf("error writing body: %s", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,12 @@ func (h webhookInteractionHandler) ServeHTTP(w http.ResponseWriter, r http.Req`
`90`	`90`	`w.WriteHeader(http.StatusBadRequest)`
`91`	`91`	`}`
`92`	`92`	`c := make(chan interface{})`
`93`		`- h.webhookServer.Disgo().EventManager().Handle(api.InteractionCreateWebhookEvent, rawBody, c)`
	`93`	`+ go h.webhookServer.Disgo().EventManager().Handle(api.InteractionCreateWebhookEvent, rawBody, c)`
`94`	`94`
`95`		`- response := <-c`
`96`	`95`	`w.WriteHeader(http.StatusOK)`
`97`	`96`	`w.Header().Set("Content-Type", "application/json")`
`98`	`97`
`99`		`- err = json.NewEncoder(w).Encode(response)`
	`98`	`+ err = json.NewEncoder(w).Encode(<-c)`
`100`	`99`	`if err != nil {`
`101`	`100`	`log.Errorf("error writing body: %s", err)`
`102`	`101`	`}`