Merge remote-tracking branch 'upstream/main'

* upstream/main: Rewrite fuzzers to native Go harnesses (go-gitea#22313) Update Emoji dataset to Unicode 14 (go-gitea#22342) fix gravatar disable bug (go-gitea#22336)
zjjhot · Jan 5, 2023 · e1ec9b2 · e1ec9b2
2 parents d1c7b74 + 906d8cc
commit e1ec9b2
Show file tree

Hide file tree

Showing 6 changed files with 566 additions and 357 deletions.
diff --git a/assets/emoji.json b/assets/emoji.json
diff --git a/build/generate-emoji.go b/build/generate-emoji.go
@@ -25,7 +25,7 @@ import (
 
 const (
 	gemojiURL         = "https://raw.githubusercontent.com/github/gemoji/master/db/emoji.json"
-	maxUnicodeVersion = 12
+	maxUnicodeVersion = 14
 )
 
 var flagOut = flag.String("o", "modules/emoji/emoji_data.go", "out")

diff --git a/models/system/setting.go b/models/system/setting.go
@@ -275,7 +275,7 @@ func Init() error {
 		}
 	}
 
-	if enableFederatedAvatarSetting.GetValueBool() {
+	if GravatarSourceURL != nil && enableFederatedAvatarSetting.GetValueBool() {
 		LibravatarService = libravatar.New()
 		if GravatarSourceURL.Scheme == "https" {
 			LibravatarService.SetUseHTTPS(true)