💄

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

pkg/http/api_directmessaging.go

@@ -235,20 +235,22 @@ func (a *api) onDirectMessage(w http.ResponseWriter, r *http.Request) {
 		return nil, nil
 	})
 
+	// If there's no error, then everything is done already
+	if err == nil {
+		return
+	}
+
 	if resp != nil {
 		defer resp.Close()
 
-		// Set headers if they haven't been sent already (when success is true)
-		if !success.Load() {
-			headers := resp.Headers()
-			if len(headers) > 0 {
-				invokev1.InternalMetadataToHTTPHeader(r.Context(), headers, w.Header().Add)
-			}
+		// Set headers if present (if resp is not nil, they haven't been sent already)
+		headers := resp.Headers()
+		if len(headers) > 0 {
+			invokev1.InternalMetadataToHTTPHeader(r.Context(), headers, w.Header().Add)
 		}
 	}
 
-	// Handle errors
-	// Successful operations are already complete
+	// Handle errors; successful operations are already complete
 	var (
 		codeErr   codeError
 		invokeErr invokeError
@@ -267,7 +269,7 @@ func (a *api) onDirectMessage(w http.ResponseWriter, r *http.Request) {
 	case errors.As(err, &invokeErr):
 		respondWithData(w, invokeErr.statusCode, invokeErr.msg)
 		return
-	case err != nil:
+	default:
 		respondWithError(w, messages.ErrDirectInvoke.WithFormat(targetID, err))
 		return
 	}