From 9fa6bdb64e66f0175d2c3aa74e51f52858e119b9 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Mon, 6 Sep 2021 23:05:44 +0200
Subject: [PATCH] Add Cache-Control to avatar redirects (#16973)

* Add Cache-Control to avatar redirects

This does seem to do the trick to make the Avatar redirects cachable
in Chrome.

In Firefox, it does not seem to work, thought and I found no way to
suppress the requests to the original URLs, I even tried setting an
Etag to no avail.

Related discussion in https://github.com/go-gitea/gitea/issues/16964.

Co-authored-by: zeripath <art27@cantab.net>
---
 routers/web/user/avatar.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/routers/web/user/avatar.go b/routers/web/user/avatar.go
index 8a5a36e070..2df5c148f7 100644
--- a/routers/web/user/avatar.go
+++ b/routers/web/user/avatar.go
@@ -13,10 +13,16 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/httpcache"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 )
 
+func cacheableRedirect(ctx *context.Context, location string) {
+	ctx.Resp.Header().Set("Cache-Control", httpcache.GetCacheControl())
+	ctx.Redirect(location)
+}
+
 // Avatar redirect browser to user avatar of requested size
 func Avatar(ctx *context.Context) {
 	userName := ctx.Params(":username")
@@ -43,7 +49,7 @@ func Avatar(ctx *context.Context) {
 		user = models.NewGhostUser()
 	}
 
-	ctx.Redirect(user.RealSizedAvatarLink(size))
+	cacheableRedirect(ctx, user.RealSizedAvatarLink(size))
 }
 
 // AvatarByEmailHash redirects the browser to the appropriate Avatar link
@@ -63,7 +69,7 @@ func AvatarByEmailHash(ctx *context.Context) {
 		return
 	}
 	if len(email) == 0 {
-		ctx.Redirect(models.DefaultAvatarLink())
+		cacheableRedirect(ctx, models.DefaultAvatarLink())
 		return
 	}
 	size := ctx.FormInt("size")
@@ -94,5 +100,5 @@ func AvatarByEmailHash(ctx *context.Context) {
 		}
 	}
 
-	ctx.Redirect(models.MakeFinalAvatarURL(avatarURL, size))
+	cacheableRedirect(ctx, models.MakeFinalAvatarURL(avatarURL, size))
 }