Update version to v3.1.1 (Fix concurrent writes crash)

CHANGELOG.md

@@ -1,3 +1,16 @@
+# v3.1.1
+
+## What's Changed
+
+* Fixed crash caused by concurrent writes under high load ([#684](https://github.com/selfhst/icons/issues/684))
+* Suppress favicon error log message when viewing icons directly from a browser
+
+# v3.1.0
+
+## What's Changed
+
+* Updated logic to also replace gradient fills with custom colors when applicable
+
 # v3.0.0
 
 ## Breaking Changes

build/VERSION

@@ -1 +1 @@
-3.0.0
+3.1.1

build/main.go

@@ -54,7 +54,6 @@ func (c *Cache) Get(key string) (string, bool) {
 	}
 
 	if time.Since(item.Timestamp) > c.ttl {
-		delete(c.items, key)
 		return "", false
 	}
 
@@ -170,6 +169,7 @@ func fetchRemoteFile(url string) (string, error) {
 func applySVGColor(svgContent, colorCode string) string {
 	color := "#" + colorCode
 
+	// Replace fill:#fff
 	re1 := regexp.MustCompile(`style="[^"]*fill:\s*#fff[^"]*"`)
 	svgContent = re1.ReplaceAllStringFunc(svgContent, func(match string) string {
 		re2 := regexp.MustCompile(`fill:\s*#fff`)
@@ -179,6 +179,16 @@ func applySVGColor(svgContent, colorCode string) string {
 	re3 := regexp.MustCompile(`fill="#fff"`)
 	svgContent = re3.ReplaceAllString(svgContent, `fill="`+color+`"`)
 
+	// Replace stop-color:#fff in gradients
+	re4 := regexp.MustCompile(`style="[^"]*stop-color:\s*#fff[^"]*"`)
+	svgContent = re4.ReplaceAllStringFunc(svgContent, func(match string) string {
+		re5 := regexp.MustCompile(`stop-color:\s*#fff`)
+		return re5.ReplaceAllString(match, "stop-color:"+color)
+	})
+
+	re6 := regexp.MustCompile(`stop-color="#fff"`)
+	svgContent = re6.ReplaceAllString(svgContent, `stop-color="`+color+`"`)
+
 	return svgContent
 }
 
@@ -419,6 +429,11 @@ func main() {
 
 	mux.HandleFunc("GET /custom/{filename}", handleCustomIcon)
 
+	// Suppress favicon load error message in logs when viewing via browser
+	mux.HandleFunc("GET /favicon.ico", func(w http.ResponseWriter, r *http.Request) {
+		w.WriteHeader(http.StatusNoContent)
+	})
+
 	mux.HandleFunc("GET /{iconname}/{colorcode}", handleIcon)
 	mux.HandleFunc("GET /{iconname}", handleIcon)
 

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}