Fix dashboard ignored system setting cache

models/avatars/avatar.go

@@ -150,10 +150,17 @@ func generateEmailAvatarLink(email string, size int, final bool) string {
 		return DefaultAvatarLink()
 	}
 
-	enableFederatedAvatar, _ := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar)
+	enableFederatedAvatarStr, _ := cache.GetString(system_model.GenCacheKey(system_model.KeyPictureEnableFederatedAvatar), func() (string, error) {
+		res, err := system_model.GetSetting(system_model.KeyPictureEnableFederatedAvatar)
+		if err != nil {
+			return "", err
+		}
+		return res.SettingValue, nil
+	})
+	enableFederatedAvatar, _ := strconv.ParseBool(enableFederatedAvatarStr)
 
 	var err error
-	if enableFederatedAvatar != nil && enableFederatedAvatar.GetValueBool() && system_model.LibravatarService != nil {
+	if enableFederatedAvatarStr != "" && enableFederatedAvatar && system_model.LibravatarService != nil {
 		emailHash := saveEmailHash(email)
 		if final {
 			// for final link, we can spend more time on slow external query
@@ -171,8 +178,16 @@ func generateEmailAvatarLink(email string, size int, final bool) string {
 		return urlStr
 	}
 
-	disableGravatar, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar)
-	if disableGravatar != nil && !disableGravatar.GetValueBool() {
+	disableGravatarStr, _ := cache.GetString(system_model.GenCacheKey(system_model.KeyPictureDisableGravatar), func() (string, error) {
+		res, err := system_model.GetSetting(system_model.KeyPictureDisableGravatar)
+		if err != nil {
+			return "", err
+		}
+		return res.SettingValue, nil
+	})
+
+	disableGravatar, _ := strconv.ParseBool(disableGravatarStr)
+	if disableGravatarStr != "" && !disableGravatar {
 		// copy GravatarSourceURL, because we will modify its Path.
 		avatarURLCopy := *system_model.GravatarSourceURL
 		avatarURLCopy.Path = path.Join(avatarURLCopy.Path, HashEmail(email))

models/system/setting_key.go

@@ -9,3 +9,8 @@ const (
 	KeyPictureDisableGravatar       = "picture.disable_gravatar"
 	KeyPictureEnableFederatedAvatar = "picture.enable_federated_avatar"
 )
+
+// GenCacheKey returns the cache key for some configuration
+func GenCacheKey(key string) string {
+	return "system.setting." + key
+}

models/user/avatar.go

@@ -10,12 +10,14 @@ import (
 	"fmt"
 	"image/png"
 	"io"
+	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/models/avatars"
 	"code.gitea.io/gitea/models/db"
 	system_model "code.gitea.io/gitea/models/system"
 	"code.gitea.io/gitea/modules/avatar"
+	"code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/storage"
@@ -68,11 +70,15 @@ func (u *User) AvatarLinkWithSize(size int) string {
 	useLocalAvatar := false
 	autoGenerateAvatar := false
 
-	var disableGravatar bool
-	disableGravatarSetting, _ := system_model.GetSetting(system_model.KeyPictureDisableGravatar)
-	if disableGravatarSetting != nil {
-		disableGravatar = disableGravatarSetting.GetValueBool()
-	}
+	disableGravatarStr, _ := cache.GetString(system_model.GenCacheKey(system_model.KeyPictureDisableGravatar), func() (string, error) {
+		res, err := system_model.GetSetting(system_model.KeyPictureDisableGravatar)
+		if err != nil {
+			return "", err
+		}
+		return res.SettingValue, nil
+	})
+
+	disableGravatar, _ := strconv.ParseBool(disableGravatarStr)
 
 	switch {
 	case u.UseCustomAvatar:

modules/system/setting.go

@@ -11,13 +11,9 @@ import (
 	"code.gitea.io/gitea/modules/cache"
 )
 
-func genKey(key string) string {
-	return "system.setting." + key
-}
-
 // GetSetting returns the setting value via the key
 func GetSetting(key string) (string, error) {
-	return cache.GetString(genKey(key), func() (string, error) {
+	return cache.GetString(system.GenCacheKey(key), func() (string, error) {
 		res, err := system.GetSetting(key)
 		if err != nil {
 			return "", err
@@ -36,7 +32,7 @@ func GetSettingBool(key string) bool {
 
 // SetSetting sets the setting value
 func SetSetting(key, value string, version int) error {
-	cache.Remove(genKey(key))
+	cache.Remove(system.GenCacheKey(key))
 
 	return system.SetSetting(&system.Setting{
 		SettingKey:   key,