Merge pull request #355 from Dkamps18/apierrordataarray

Xemdo · web-flow · commit f52a6e2ecf05 · 2026-03-02T21:57:04.000-08:00
Don't make data object an empty array on error
diff --git a/internal/api/api.go b/internal/api/api.go
@@ -45,7 +45,6 @@ func NewRequest(method string, path string, queryParameters []string, body []byt
 
 	isExtensionsLiveEndpoint := false // https://github.com/twitchdev/twitch-cli/issues/157
 
-	data.Data = make([]interface{}, 0)
 	client, err := GetClientInformation()
 	if err != nil {
 		return fmt.Errorf("Error fetching client information: %v", err.Error())
@@ -186,7 +185,7 @@ func NewRequest(method string, path string, queryParameters []string, body []byt
 		runCounter++
 	}
 
-	if data.Data == nil {
+	if data.Data == nil && data.Error == "" {
 		data.Data = make([]interface{}, 0)
 	}
 	// handle json marshalling better; returns empty slice vs. null

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ func NewRequest(method string, path string, queryParameters []string, body []byt`
`45`	`45`
`46`	`46`	`isExtensionsLiveEndpoint := false // https://github.com/twitchdev/twitch-cli/issues/157`
`47`	`47`
`48`		`- data.Data = make([]interface{}, 0)`
`49`	`48`	`client, err := GetClientInformation()`
`50`	`49`	`if err != nil {`
`51`	`50`	`return fmt.Errorf("Error fetching client information: %v", err.Error())`
`@@ -186,7 +185,7 @@ func NewRequest(method string, path string, queryParameters []string, body []byt`
`186`	`185`	`runCounter++`
`187`	`186`	`}`
`188`	`187`
`189`		`- if data.Data == nil {`
	`188`	`+ if data.Data == nil && data.Error == "" {`
`190`	`189`	`data.Data = make([]interface{}, 0)`
`191`	`190`	`}`
`192`	`191`	`// handle json marshalling better; returns empty slice vs. null`