From 1f58b37a5e86603b16e137031c36f37580e9d410 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Sun, 7 Oct 2018 18:42:43 -0700
Subject: Refactor HTTP response builder

---
 ui/feed_icon.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'ui/feed_icon.go')

diff --git a/ui/feed_icon.go b/ui/feed_icon.go
index 0aa7089..63aa050 100644
--- a/ui/feed_icon.go
+++ b/ui/feed_icon.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by the Apache 2.0
 // license that can be found in the LICENSE file.
 
-package ui  // import "miniflux.app/ui"
+package ui // import "miniflux.app/ui"
 
 import (
 	"net/http"
@@ -18,14 +18,19 @@ func (c *Controller) ShowIcon(w http.ResponseWriter, r *http.Request) {
 	iconID := request.RouteInt64Param(r, "iconID")
 	icon, err := c.store.IconByID(iconID)
 	if err != nil {
-		html.ServerError(w, err)
+		html.ServerError(w, r, err)
 		return
 	}
 
 	if icon == nil {
-		html.NotFound(w)
+		html.NotFound(w, r)
 		return
 	}
 
-	response.Cache(w, r, icon.MimeType, icon.Hash, icon.Content, 72*time.Hour)
+	response.New(w, r).WithCaching(icon.Hash, 72*time.Hour, func(b *response.Builder) {
+		b.WithHeader("Content-Type", icon.MimeType)
+		b.WithBody(icon.Content)
+		b.WithoutCompression()
+		b.Write()
+	})
 }
-- 
cgit v1.2.3