From 21c1552daafbcedbd2e19b0c155ff8db9cff2be0 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sat, 3 Jun 2023 13:58:57 +0200
Subject: [chore] Update versions, fix lint errors (#1860)

---
 internal/api/util/errorhandling.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'internal/api/util')

diff --git a/internal/api/util/errorhandling.go b/internal/api/util/errorhandling.go
index 8c0251e57..9128ce499 100644
--- a/internal/api/util/errorhandling.go
+++ b/internal/api/util/errorhandling.go
@@ -117,7 +117,8 @@ func ErrorHandler(c *gin.Context, errWithCode gtserror.WithCode, instanceGet fun
 	// or if we should just use a json. Normally we would want to
 	// check for a returned error, but if an error occurs here we
 	// can just fall back to default behavior (serve json error).
-	accept, _ := NegotiateAccept(c, JSONOrHTMLAcceptHeaders...)
+	// Prefer provided offers, fall back to JSON or HTML.
+	accept, _ := NegotiateAccept(c, append(offers, JSONOrHTMLAcceptHeaders...)...)
 
 	if errWithCode.Code() == http.StatusNotFound {
 		// Use our special not found handler with useful status text.
-- 
cgit v1.2.3