Merge branch 'main' into feature/auth-and-raid-topics

Author: lleadbet

internal/api/api.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"log"
+	"net/http"
 	"net/url"
 	"runtime"
 	"sort"
@@ -58,6 +59,11 @@ func NewRequest(method string, path string, queryParameters []string, body []byt
 		return
 	}
 
+	if resp.StatusCode == http.StatusNoContent {
+		fmt.Println("Endpoint responded with status 204")
+		return
+	}
+
 	if prettyPrint == true {
 		var obj map[string]interface{}
 		if err := json.Unmarshal(resp.Body, &obj); err != nil {

internal/events/trigger/trigger_event.go

@@ -92,7 +92,7 @@ func Fire(p TriggerParameters) (string, error) {
 			JSON:           resp.JSON,
 			Secret:         p.Secret,
 			ForwardAddress: p.ForwardAddress,
-			Event:          p.Event,
+			Event:          e.GetTopic(p.Transport, p.Event),
 			Type:           EventSubMessageTypeNotification,
 		})
 		if err != nil {